From c9f821cc5b6768456192d12520acbc839ddb4b7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:02:53 +0530
Subject: [PATCH 001/177] chore(deps): bump puma from 5.6.2 to 5.6.4 (#4348)

Bumps [puma](https://github.com/puma/puma) from 5.6.2 to 5.6.4.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.6.2...v5.6.4)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index eb6022ac7..6c314817d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -403,7 +403,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.6)
-    puma (5.6.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     pundit (2.2.0)
       activesupport (>= 3.0.0)

From 0477123f92234c7e1e060ce5e190f90eac0af9a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:33:14 +0530
Subject: [PATCH 002/177] chore(deps): bump minimist from 1.2.5 to 1.2.6
 (#4351)

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  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 931d979a6..9acb20d6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10090,9 +10090,9 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
     brace-expansion "^1.1.7"
 
 minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass-collect@^1.0.2:
   version "1.0.2"

From eff3a5031641b4b655806109315b1ea52f342588 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 31 Mar 2022 17:35:39 +0530
Subject: [PATCH 003/177] fix: Disable showing read messages in unread view
 (#4324)

---
 app/javascript/widget/App.vue                 |  9 +++++-
 .../store/modules/conversation/actions.js     |  8 ++++--
 .../specs/conversation/actions.spec.js        | 28 +++++++++++--------
 .../v1/widget/messages/index.json.jbuilder    | 25 ++++++++++-------
 .../api/v1/widget/messages_controller_spec.rb |  3 +-
 5 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 8b34c51bf..9d6600264 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -138,7 +138,13 @@ export default {
       }
     },
     registerUnreadEvents() {
-      bus.$on(ON_AGENT_MESSAGE_RECEIVED, this.setUnreadView);
+      bus.$on(ON_AGENT_MESSAGE_RECEIVED, () => {
+        const { name: routeName } = this.$route;
+        if (this.isWidgetOpen && routeName === 'messages') {
+          this.$store.dispatch('conversation/setUserLastSeen');
+        }
+        this.setUnreadView();
+      });
       bus.$on(ON_UNREAD_MESSAGE_CLICK, () => {
         this.replaceRoute('messages').then(() => this.unsetUnreadView());
       });
@@ -175,6 +181,7 @@ export default {
     },
     setUnreadView() {
       const { unreadMessageCount } = this;
+
       if (this.isIFrame && unreadMessageCount > 0 && !this.isWidgetOpen) {
         this.replaceRoute('unread-messages').then(() => {
           this.setIframeHeight(true);
diff --git a/app/javascript/widget/store/modules/conversation/actions.js b/app/javascript/widget/store/modules/conversation/actions.js
index c915ea6e7..ae06afa9c 100644
--- a/app/javascript/widget/store/modules/conversation/actions.js
+++ b/app/javascript/widget/store/modules/conversation/actions.js
@@ -84,8 +84,12 @@ export const actions = {
   fetchOldConversations: async ({ commit }, { before } = {}) => {
     try {
       commit('setConversationListLoading', true);
-      const { data } = await getMessagesAPI({ before });
-      const formattedMessages = getNonDeletedMessages({ messages: data });
+      const {
+        data: { payload, meta },
+      } = await getMessagesAPI({ before });
+      const { contact_last_seen_at: lastSeen } = meta;
+      const formattedMessages = getNonDeletedMessages({ messages: payload });
+      commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
       commit('setMessagesInConversation', formattedMessages);
       commit('setConversationListLoading', false);
     } catch (error) {
diff --git a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
index cfbb0ec66..82e03d38a 100644
--- a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
@@ -181,22 +181,28 @@ describe('#actions', () => {
   describe('#fetchOldConversations', () => {
     it('sends correct actions', async () => {
       API.get.mockResolvedValue({
-        data: [
-          {
-            id: 1,
-            text: 'hey',
-            content_attributes: {},
+        data: {
+          payload: [
+            {
+              id: 1,
+              text: 'hey',
+              content_attributes: {},
+            },
+            {
+              id: 2,
+              text: 'welcome',
+              content_attributes: { deleted: true },
+            },
+          ],
+          meta: {
+            contact_last_seen_at: 1466424490,
           },
-          {
-            id: 2,
-            text: 'welcome',
-            content_attributes: { deleted: true },
-          },
-        ],
+        },
       });
       await actions.fetchOldConversations({ commit }, {});
       expect(commit.mock.calls).toEqual([
         ['setConversationListLoading', true],
+        ['conversation/setMetaUserLastSeenAt', 1466424490, { root: true }],
         [
           'setMessagesInConversation',
           [
diff --git a/app/views/api/v1/widget/messages/index.json.jbuilder b/app/views/api/v1/widget/messages/index.json.jbuilder
index a0462b545..d7a441b84 100644
--- a/app/views/api/v1/widget/messages/index.json.jbuilder
+++ b/app/views/api/v1/widget/messages/index.json.jbuilder
@@ -1,11 +1,16 @@
-json.array! @messages do |message|
-  json.id message.id
-  json.content message.content
-  json.message_type message.message_type_before_type_cast
-  json.content_type message.content_type
-  json.content_attributes message.content_attributes
-  json.created_at message.created_at.to_i
-  json.conversation_id message.conversation.display_id
-  json.attachments message.attachments.map(&:push_event_data) if message.attachments.present?
-  json.sender message.sender.push_event_data if message.sender
+json.payload do
+  json.array! @messages do |message|
+    json.id message.id
+    json.content message.content
+    json.message_type message.message_type_before_type_cast
+    json.content_type message.content_type
+    json.content_attributes message.content_attributes
+    json.created_at message.created_at.to_i
+    json.conversation_id message.conversation.display_id
+    json.attachments message.attachments.map(&:push_event_data) if message.attachments.present?
+    json.sender message.sender.push_event_data if message.sender
+  end
+end
+json.meta do
+  json.contact_last_seen_at @conversation.contact_last_seen_at.to_i
 end
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index 983f6f132..f203f11c8 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -23,9 +23,8 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
 
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
-
         # 2 messages created + 2 messages by the email hook
-        expect(json_response.length).to eq(4)
+        expect(json_response['payload'].length).to eq(4)
       end
     end
   end

From 3cd1616df624f25205c338398466e978fcee0db9 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 31 Mar 2022 20:22:52 +0530
Subject: [PATCH 004/177] fix: Fix agent name in Twitter channel private note
 acting as a link (#4326)

---
 .../widgets/conversation/Message.vue          |  6 +++-
 .../shared/helpers/MessageFormatter.js        |  5 ++--
 .../helpers/specs/MessageFormatter.spec.js    | 30 +++++++++++++++++--
 .../shared/mixins/messageFormatterMixin.js    |  8 +++--
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 51d82ff8c..4035a62d0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -207,7 +207,11 @@ export default {
         }
       }
       return (
-        this.formatMessage(this.data.content, this.isATweet) + botMessageContent
+        this.formatMessage(
+          this.data.content,
+          this.isATweet,
+          this.data.private
+        ) + botMessageContent
       );
     },
     contentAttributes() {
diff --git a/app/javascript/shared/helpers/MessageFormatter.js b/app/javascript/shared/helpers/MessageFormatter.js
index 3bc89ec2f..260436da4 100644
--- a/app/javascript/shared/helpers/MessageFormatter.js
+++ b/app/javascript/shared/helpers/MessageFormatter.js
@@ -13,8 +13,9 @@ const TWITTER_HASH_REPLACEMENT =
 const USER_MENTIONS_REGEX = /mention:\/\/(user|team)\/(\d+)\/(.+)/gm;
 
 class MessageFormatter {
-  constructor(message, isATweet = false) {
+  constructor(message, isATweet = false, isAPrivateNote = false) {
     this.message = DOMPurify.sanitize(escapeHtml(message || ''));
+    this.isAPrivateNote = isAPrivateNote;
     this.isATweet = isATweet;
     this.marked = marked;
 
@@ -35,7 +36,7 @@ class MessageFormatter {
   }
 
   formatMessage() {
-    if (this.isATweet) {
+    if (this.isATweet && !this.isAPrivateNote) {
       const withUserName = this.message.replace(
         TWITTER_USERNAME_REGEX,
         TWITTER_USERNAME_REPLACEMENT
diff --git a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
index 4e13fe832..1f2209b71 100644
--- a/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
+++ b/app/javascript/shared/helpers/specs/MessageFormatter.spec.js
@@ -36,19 +36,45 @@ describe('#MessageFormatter', () => {
     it('should add links to @mentions', () => {
       const message =
         '@chatwootapp is an opensource tool thanks @longnonexistenttwitterusername';
-      expect(new MessageFormatter(message, true).formattedMessage).toMatch(
+      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>'
       );
     });
 
     it('should add links to #tags', () => {
       const message = '#chatwootapp is an opensource tool';
-      expect(new MessageFormatter(message, true).formattedMessage).toMatch(
+      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>'
       );
     });
   });
 
+  describe('private notes', () => {
+    it('should return the same string if not tags or @mentions', () => {
+      const message = 'Chatwoot is an opensource tool';
+      expect(new MessageFormatter(message).formattedMessage).toMatch(message);
+    });
+
+    it('should add links to @mentions', () => {
+      const message =
+        '@chatwootapp is an opensource tool thanks @longnonexistenttwitterusername';
+      expect(
+        new MessageFormatter(message, false, true).formattedMessage
+      ).toMatch(message);
+    });
+
+    it('should add links to #tags', () => {
+      const message = '#chatwootapp is an opensource tool';
+      expect(
+        new MessageFormatter(message, false, true).formattedMessage
+      ).toMatch(message);
+    });
+  });
+
   describe('plain text content', () => {
     it('returns the plain text without HTML', () => {
       const message =
diff --git a/app/javascript/shared/mixins/messageFormatterMixin.js b/app/javascript/shared/mixins/messageFormatterMixin.js
index 21096409d..7767e7c76 100644
--- a/app/javascript/shared/mixins/messageFormatterMixin.js
+++ b/app/javascript/shared/mixins/messageFormatterMixin.js
@@ -3,8 +3,12 @@ import DOMPurify from 'dompurify';
 
 export default {
   methods: {
-    formatMessage(message, isATweet) {
-      const messageFormatter = new MessageFormatter(message, isATweet);
+    formatMessage(message, isATweet, isAPrivateNote) {
+      const messageFormatter = new MessageFormatter(
+        message,
+        isATweet,
+        isAPrivateNote
+      );
       return messageFormatter.formattedMessage;
     },
     getPlainText(message, isATweet) {

From cb23ff53bf7f1b190223b13aedbfefcb7c4ec85f Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 31 Mar 2022 21:20:37 +0530
Subject: [PATCH 005/177] fix: Reset Captcha if account signup is an error
 (#4279)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../conversation/AvailabilityStatusBadge.vue  |  2 +-
 .../i18n/locale/en/setNewPassword.json        |  3 ++
 .../dashboard/routes/auth/Signup.vue          | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue b/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
index 588bbef82..766166fd3 100644
--- a/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
@@ -23,7 +23,7 @@ export default {
     background: var(--s-500);
   }
   &__busy {
-    background: var(--y-700);
+    background: var(--y-400);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
index 94a3fd2e1..ec2d94744 100644
--- a/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/en/setNewPassword.json
@@ -15,6 +15,9 @@
       "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/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index 36b63662d..4f5aab8bd 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -77,9 +77,17 @@
           />
           <div v-if="globalConfig.hCaptchaSiteKey" class="h-captcha--box">
             <vue-hcaptcha
+              ref="hCaptcha"
+              :class="{ error: !hasAValidCaptcha && didCaptchaReset }"
               :sitekey="globalConfig.hCaptchaSiteKey"
               @verify="onRecaptchaVerified"
             />
+            <span
+              v-if="!hasAValidCaptcha && didCaptchaReset"
+              class="captcha-error"
+            >
+              {{ $t('SET_NEW_PASSWORD.CAPTCHA.ERROR') }}
+            </span>
           </div>
           <woot-submit-button
             :disabled="isSignupInProgress || !hasAValidCaptcha"
@@ -129,6 +137,7 @@ export default {
         confirmPassword: '',
         hCaptchaClientResponse: '',
       },
+      didCaptchaReset: false,
       isSignupInProgress: false,
       error: '',
     };
@@ -183,6 +192,7 @@ export default {
     async submit() {
       this.$v.$touch();
       if (this.$v.$invalid) {
+        this.resetCaptcha();
         return;
       }
       this.isSignupInProgress = true;
@@ -194,6 +204,7 @@ export default {
       } catch (error) {
         let errorMessage = this.$t('REGISTER.API.ERROR_MESSAGE');
         if (error.response && error.response.data.message) {
+          this.resetCaptcha();
           errorMessage = error.response.data.message;
         }
         this.showAlert(errorMessage);
@@ -203,6 +214,15 @@ export default {
     },
     onRecaptchaVerified(token) {
       this.credentials.hCaptchaClientResponse = token;
+      this.didCaptchaReset = false;
+    },
+    resetCaptcha() {
+      if (!this.globalConfig.hCaptchaSiteKey) {
+        return;
+      }
+      this.$refs.hCaptcha.reset();
+      this.credentials.hCaptchaClientResponse = '';
+      this.didCaptchaReset = true;
     },
   },
 };
@@ -254,6 +274,18 @@ export default {
 
   .h-captcha--box {
     margin-bottom: var(--space-one);
+
+    .captcha-error {
+      color: var(--r-400);
+      font-size: var(--font-size-small);
+    }
+
+    &::v-deep .error {
+      iframe {
+        border: 1px solid var(--r-500);
+        border-radius: var(--border-radius-normal);
+      }
+    }
   }
 }
 </style>

From c397fe1964a2e139d29dc1273f7673f2a7fd8980 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 31 Mar 2022 21:21:25 +0530
Subject: [PATCH 006/177] fix: Update the URL for POST inbox_members (#4354)

---
 swagger/paths/index.yml |  10 ++-
 swagger/swagger.json    | 133 +++++++++++++++++++++-------------------
 2 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index eeb2539f1..279ebb7bc 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -253,13 +253,17 @@
     - $ref: '#/parameters/inbox_id'
   get:
     $ref: ./application/inboxes/inbox_members/show.yml
-  post:
-    $ref: ./application/inboxes/inbox_members/create.yml
   patch:
     $ref: ./application/inboxes/inbox_members/update.yml
   delete:
     $ref: ./application/inboxes/inbox_members/delete.yml
 
+/api/v1/accounts/{account_id}/inbox_members:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  post:
+    $ref: ./application/inboxes/inbox_members/create.yml
+
 
 
 # Messages
@@ -422,4 +426,4 @@
       type: string
       description: The numeric ID of the user
   get:
-    $ref: './application/reports/conversation/agent.yml'
\ No newline at end of file
+    $ref: './application/reports/conversation/agent.yml'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index b17f9c586..4de4db49d 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2803,69 +2803,6 @@
           }
         }
       },
-      "post": {
-        "tags": [
-          "Inbox"
-        ],
-        "operationId": "add-new-agent-to-inbox",
-        "summary": "Add a New Agent",
-        "description": "Add a new Agent to Inbox",
-        "security": [
-          {
-            "userApiKey": [
-
-            ]
-          }
-        ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be added to the inbox"
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
-              }
-            }
-          },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
-          },
-          "422": {
-            "description": "User must exist"
-          }
-        }
-      },
       "patch": {
         "tags": [
           "Inbox"
@@ -2986,6 +2923,76 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/inbox_members": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "post": {
+        "tags": [
+          "Inbox"
+        ],
+        "operationId": "add-new-agent-to-inbox",
+        "summary": "Add a New Agent",
+        "description": "Add a new Agent to Inbox",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "inbox_id",
+                "user_ids"
+              ],
+              "properties": {
+                "inbox_id": {
+                  "type": "string",
+                  "description": "The ID of the inbox"
+                },
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be added to the inbox"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all active agents",
+              "items": {
+                "$ref": "#/definitions/agent"
+              }
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages": {
       "parameters": [
         {

From 3813b3b372d5dfd9e6a5b6c5ad403295ed322ad7 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Fri, 1 Apr 2022 00:34:50 +0530
Subject: [PATCH 007/177] feat: make linux script installation non-interactive
 (#4355)

This PR changes the LetsEncrypt behaviour to be non-interactive. Earlier, the installation flow was waiting for user input at the SSL cert generation stage. With this change, once the user confirms completes the initial selection, the installation can be completed unattended.
---
 deployment/setup_20.04.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index ca8b0a06a..14a0b74f6 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -2,7 +2,7 @@
 
 # Description: Chatwoot installation script
 # OS: Ubuntu 20.04 LTS / Ubuntu 20.10
-# Script Version: 0.7
+# Script Version: 0.8
 # Run this script as root
 
 read -p 'Would you like to configure a domain and SSL for Chatwoot?(yes or no): ' configure_webserver
@@ -12,6 +12,7 @@ then
 read -p 'Enter your sub-domain to be used for Chatwoot (chatwoot.domain.com for example) : ' domain_name
 echo -e "\nThis script will try to generate SSL certificates via LetsEncrypt and serve chatwoot at
 "https://$domain_name". Proceed further once you have pointed your DNS to the IP of the instance.\n"
+read -p 'Enter the email LetsEncrypt can use to send reminders when your SSL certificate is up for renewal: ' le_email
 read -p 'Do you wish to proceed? (yes or no): ' exit_true
 if [ $exit_true == "no" ]
 then
@@ -138,7 +139,7 @@ else
 curl https://ssl-config.mozilla.org/ffdhe4096.txt >> /etc/ssl/dhparam
 wget https://raw.githubusercontent.com/chatwoot/chatwoot/develop/deployment/nginx_chatwoot.conf
 cp nginx_chatwoot.conf /etc/nginx/sites-available/nginx_chatwoot.conf
-certbot certonly --nginx -d $domain_name
+certbot certonly --non-interactive --agree-tos --nginx -m $le_email -d $domain_name
 sed -i "s/chatwoot.domain.com/$domain_name/g" /etc/nginx/sites-available/nginx_chatwoot.conf
 ln -s /etc/nginx/sites-available/nginx_chatwoot.conf /etc/nginx/sites-enabled/nginx_chatwoot.conf
 systemctl restart nginx

From caee9535f1f99168a19a88187c170e0b695179b6 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 1 Apr 2022 20:59:03 +0530
Subject: [PATCH 008/177] feat: Support Dark mode for the widget (#4137)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/controllers/widget_tests_controller.rb    |  5 ++
 .../dashboard/settings/agents/Index.vue       |  4 +-
 app/javascript/packs/sdk.js                   |  9 +++-
 app/javascript/sdk/IFrameHelper.js            |  1 +
 app/javascript/sdk/constants.js               |  1 +
 app/javascript/sdk/settingsHelper.js          |  5 +-
 app/javascript/shared/components/ChatCard.vue | 17 +++---
 app/javascript/shared/components/ChatForm.vue | 21 ++++++--
 .../shared/components/ChatOption.vue          |  2 +-
 .../shared/components/ChatOptions.vue         | 10 ++--
 .../components/CustomerSatisfaction.vue       | 28 +++++++---
 .../shared/components/DateSeparator.vue       |  9 +++-
 .../shared/components/ResizableTextArea.vue   |  1 -
 .../components/specs/DateSeparator.spec.js    | 53 +++++++++++++++----
 .../__snapshots__/DateSeparator.spec.js.snap  |  4 +-
 .../assets/scss/views/_conversation.scss      |  3 --
 .../widget/components/AgentMessage.vue        | 12 +++--
 .../widget/components/AgentMessageBubble.vue  | 10 +++-
 .../widget/components/AgentTypingBubble.vue   |  7 ++-
 .../widget/components/ChatHeader.vue          | 28 +++++++---
 .../widget/components/ChatHeaderExpanded.vue  | 17 ++++--
 .../widget/components/ChatInputWrap.vue       | 25 ++++++---
 .../widget/components/Form/Input.vue          | 39 +++++++++-----
 .../widget/components/Form/TextArea.vue       | 37 ++++++++-----
 .../widget/components/HeaderActions.vue       | 20 +++++--
 .../widget/components/PreChat/Form.vue        |  6 ++-
 .../widget/components/TeamAvailability.vue    | 12 +++--
 .../widget/components/UnreadMessage.vue       |  9 +++-
 .../components/layouts/ViewWithHeader.vue     | 13 +++--
 .../widget/components/template/Article.vue    | 24 +++++++--
 .../widget/components/template/EmailInput.vue | 17 +++++-
 app/javascript/widget/mixins/darkModeMixin.js | 15 ++++++
 .../widget/mixins/specs/darkModeMixin.spec.js | 41 ++++++++++++++
 .../widget/store/modules/appConfig.js         | 12 ++++-
 app/views/widget_tests/index.html.erb         |  1 +
 tailwind.config.js                            |  6 ++-
 36 files changed, 411 insertions(+), 113 deletions(-)
 create mode 100644 app/javascript/widget/mixins/darkModeMixin.js
 create mode 100644 app/javascript/widget/mixins/specs/darkModeMixin.spec.js

diff --git a/app/controllers/widget_tests_controller.rb b/app/controllers/widget_tests_controller.rb
index fff47d907..6d6742cf4 100644
--- a/app/controllers/widget_tests_controller.rb
+++ b/app/controllers/widget_tests_controller.rb
@@ -3,6 +3,7 @@ class WidgetTestsController < ActionController::Base
   before_action :ensure_widget_position
   before_action :ensure_widget_type
   before_action :ensure_widget_style
+  before_action :ensure_dark_mode
 
   def index
     render
@@ -14,6 +15,10 @@ class WidgetTestsController < ActionController::Base
     @widget_style = params[:widget_style] || 'standard'
   end
 
+  def ensure_dark_mode
+    @dark_mode = params[:dark_mode] || 'light'
+  end
+
   def ensure_widget_position
     @widget_position = params[:position] || 'left'
   end
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index c3a75b0f6..5714582d5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -35,7 +35,9 @@
                 </td>
                 <!-- Agent Name + Email -->
                 <td>
-                  <span class="agent-name">{{ agent.name }}</span>
+                  <span class="agent-name">
+                    {{ agent.name }}
+                  </span>
                   <span>{{ agent.email }}</span>
                 </td>
                 <!-- Agent Role + Verification Status -->
diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index 76e1a2cd8..b77b682dd 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -1,6 +1,10 @@
 import Cookies from 'js-cookie';
 import { IFrameHelper } from '../sdk/IFrameHelper';
-import { getBubbleView } from '../sdk/settingsHelper';
+import {
+  getBubbleView,
+  getDarkMode,
+  getWidgetStyle,
+} from '../sdk/settingsHelper';
 import {
   computeHashForUserData,
   getUserCookieName,
@@ -24,8 +28,9 @@ const runSDK = ({ baseUrl, websiteToken }) => {
     type: getBubbleView(chatwootSettings.type),
     launcherTitle: chatwootSettings.launcherTitle || '',
     showPopoutButton: chatwootSettings.showPopoutButton || false,
-    widgetStyle: chatwootSettings.widgetStyle || 'standard',
+    widgetStyle: getWidgetStyle(chatwootSettings.widgetStyle) || 'standard',
     resetTriggered: false,
+    darkMode: getDarkMode(chatwootSettings.darkMode),
 
     toggle(state) {
       IFrameHelper.events.toggleBubble(state);
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index df36d8e0d..3bc0973fe 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -145,6 +145,7 @@ export const IFrameHelper = {
         hideMessageBubble: window.$chatwoot.hideMessageBubble,
         showPopoutButton: window.$chatwoot.showPopoutButton,
         widgetStyle: window.$chatwoot.widgetStyle,
+        darkMode: window.$chatwoot.darkMode,
       });
       IFrameHelper.onLoad({
         widgetColor: message.config.channelConfig.widgetColor,
diff --git a/app/javascript/sdk/constants.js b/app/javascript/sdk/constants.js
index 52faf1540..7bf84d430 100644
--- a/app/javascript/sdk/constants.js
+++ b/app/javascript/sdk/constants.js
@@ -1,2 +1,3 @@
 export const BUBBLE_DESIGN = ['standard', 'expanded_bubble'];
 export const WIDGET_DESIGN = ['standard', 'flat'];
+export const DARK_MODE = ['light', 'auto'];
diff --git a/app/javascript/sdk/settingsHelper.js b/app/javascript/sdk/settingsHelper.js
index 4e256b53a..657db1fe0 100644
--- a/app/javascript/sdk/settingsHelper.js
+++ b/app/javascript/sdk/settingsHelper.js
@@ -1,4 +1,4 @@
-import { BUBBLE_DESIGN, WIDGET_DESIGN } from './constants';
+import { BUBBLE_DESIGN, DARK_MODE, WIDGET_DESIGN } from './constants';
 
 export const getBubbleView = type =>
   BUBBLE_DESIGN.includes(type) ? type : BUBBLE_DESIGN[0];
@@ -9,3 +9,6 @@ export const getWidgetStyle = style =>
   WIDGET_DESIGN.includes(style) ? style : WIDGET_DESIGN[0];
 
 export const isFlatWidgetStyle = style => style === 'flat';
+
+export const getDarkMode = darkMode =>
+  DARK_MODE.includes(darkMode) ? darkMode : DARK_MODE[0];
diff --git a/app/javascript/shared/components/ChatCard.vue b/app/javascript/shared/components/ChatCard.vue
index 4e856bb6b..eb6e13364 100644
--- a/app/javascript/shared/components/ChatCard.vue
+++ b/app/javascript/shared/components/ChatCard.vue
@@ -1,11 +1,14 @@
 <template>
-  <div class="card-message chat-bubble agent">
+  <div
+    class="card-message chat-bubble agent"
+    :class="$dm('bg-white', 'dark:bg-slate-700')"
+  >
     <img class="media" :src="mediaUrl" />
     <div class="card-body">
-      <h4 class="title">
+      <h4 class="title" :class="$dm('text-black-900', 'dark:text-slate-50')">
         {{ title }}
       </h4>
-      <p class="body">
+      <p class="body" :class="$dm('text-black-700', 'dark:text-slate-100')">
         {{ description }}
       </p>
       <card-button
@@ -19,11 +22,13 @@
 
 <script>
 import CardButton from 'shared/components/CardButton';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   components: {
     CardButton,
   },
+  mixins: [darkModeMixin],
   props: {
     title: {
       type: String,
@@ -52,7 +57,6 @@ export default {
 @import '~dashboard/assets/scss/mixins.scss';
 
 .card-message {
-  background: white;
   max-width: 220px;
   padding: $space-small;
   border-radius: $space-small;
@@ -63,12 +67,10 @@ export default {
     font-weight: $font-weight-medium;
     margin-top: $space-smaller;
     margin-bottom: $space-smaller;
-    color: $color-heading;
     line-height: 1.5;
   }
 
   .body {
-    color: $color-body;
     margin-bottom: $space-smaller;
   }
 
@@ -77,10 +79,11 @@ export default {
     width: 100%;
     object-fit: contain;
     max-height: 150px;
+    border-radius: 5px;
   }
 
   .action-button + .action-button {
-    background: white;
+    background: $color-white;
     @include thin-border($color-woot);
     color: $color-woot;
   }
diff --git a/app/javascript/shared/components/ChatForm.vue b/app/javascript/shared/components/ChatForm.vue
index f943f23c1..3cb6b956c 100644
--- a/app/javascript/shared/components/ChatForm.vue
+++ b/app/javascript/shared/components/ChatForm.vue
@@ -1,5 +1,8 @@
 <template>
-  <div class="form chat-bubble agent">
+  <div
+    class="form chat-bubble agent"
+    :class="$dm('bg-white', 'dark:bg-slate-700')"
+  >
     <form @submit.prevent="onSubmit">
       <div
         v-for="item in items"
@@ -9,10 +12,13 @@
           'has-submitted': hasSubmitted,
         }"
       >
-        <label>{{ item.label }}</label>
+        <label :class="$dm('text-black-900', 'dark:text-slate-50')">{{
+          item.label
+        }}</label>
         <input
           v-if="item.type === 'email'"
           v-model="formValues[item.name]"
+          :class="inputColor"
           :type="item.type"
           :pattern="item.regex"
           :title="item.title"
@@ -24,6 +30,7 @@
         <input
           v-else-if="item.type === 'text'"
           v-model="formValues[item.name]"
+          :class="inputColor"
           :required="item.required && 'required'"
           :pattern="item.pattern"
           :title="item.title"
@@ -35,6 +42,7 @@
         <textarea
           v-else-if="item.type === 'text_area'"
           v-model="formValues[item.name]"
+          :class="inputColor"
           :required="item.required && 'required'"
           :title="item.title"
           :name="item.name"
@@ -44,6 +52,7 @@
         <select
           v-else-if="item.type === 'select'"
           v-model="formValues[item.name]"
+          :class="inputColor"
           :required="item.required && 'required'"
         >
           <option
@@ -73,7 +82,10 @@
 
 <script>
 import { mapGetters } from 'vuex';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+
 export default {
+  mixins: [darkModeMixin],
   props: {
     buttonLabel: {
       type: String,
@@ -98,6 +110,10 @@ export default {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
     }),
+    inputColor() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')}
+        ${this.$dm('text-black-900', 'dark:text-slate-50')}`;
+    },
     isFormValid() {
       return this.items.reduce((acc, { name }) => {
         return !!this.formValues[name] && acc;
@@ -186,7 +202,6 @@ export default {
     appearance: none;
     border: 1px solid $color-border;
     border-radius: $space-smaller;
-    background-color: $color-white;
     font-family: inherit;
     font-size: $space-normal;
     font-weight: normal;
diff --git a/app/javascript/shared/components/ChatOption.vue b/app/javascript/shared/components/ChatOption.vue
index 672939356..7532e14d3 100644
--- a/app/javascript/shared/components/ChatOption.vue
+++ b/app/javascript/shared/components/ChatOption.vue
@@ -12,6 +12,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
+
 export default {
   components: {},
   props: {
@@ -51,7 +52,6 @@ export default {
     background: transparent;
     border-radius: $space-large;
     border: 0;
-    color: $color-woot;
     cursor: pointer;
     height: auto;
     line-height: 1.5;
diff --git a/app/javascript/shared/components/ChatOptions.vue b/app/javascript/shared/components/ChatOptions.vue
index 8de14bf94..3a994a583 100644
--- a/app/javascript/shared/components/ChatOptions.vue
+++ b/app/javascript/shared/components/ChatOptions.vue
@@ -1,7 +1,10 @@
 <template>
-  <div class="options-message chat-bubble agent">
+  <div
+    class="options-message chat-bubble agent"
+    :class="$dm('bg-white', 'dark:bg-slate-700')"
+  >
     <div class="card-body">
-      <h4 class="title">
+      <h4 class="title" :class="$dm('text-black-900', 'dark:text-slate-50')">
         {{ title }}
       </h4>
       <ul
@@ -23,11 +26,13 @@
 
 <script>
 import ChatOption from 'shared/components/ChatOption';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   components: {
     ChatOption,
   },
+  mixins: [darkModeMixin],
   props: {
     title: {
       type: String,
@@ -80,7 +85,6 @@ export default {
     font-weight: $font-weight-normal;
     margin-top: $space-smaller;
     margin-bottom: $space-smaller;
-    color: $color-heading;
     line-height: 1.5;
   }
 
diff --git a/app/javascript/shared/components/CustomerSatisfaction.vue b/app/javascript/shared/components/CustomerSatisfaction.vue
index 06c7c8369..661bace55 100644
--- a/app/javascript/shared/components/CustomerSatisfaction.vue
+++ b/app/javascript/shared/components/CustomerSatisfaction.vue
@@ -1,6 +1,10 @@
 <template>
-  <div class="customer-satisfcation" :style="{ borderColor: widgetColor }">
-    <h6 class="title">
+  <div
+    class="customer-satisfaction"
+    :class="$dm('bg-white', 'dark:bg-slate-700')"
+    :style="{ borderColor: widgetColor }"
+  >
+    <h6 class="title" :class="$dm('text-slate-900', 'dark:text-slate-50')">
       {{ title }}
     </h6>
     <div class="ratings">
@@ -21,8 +25,9 @@
       <input
         v-model="feedback"
         class="form-input"
+        :class="inputColor"
         :placeholder="$t('CSAT.PLACEHOLDER')"
-        @keyup.enter="onSubmit"
+        @keydown.enter="onSubmit"
       />
       <button
         class="button small"
@@ -41,12 +46,14 @@ import { mapGetters } from 'vuex';
 import Spinner from 'shared/components/Spinner';
 import { CSAT_RATINGS } from 'shared/constants/messages';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 
 export default {
   components: {
     Spinner,
     FluentIcon,
   },
+  mixins: [darkModeMixin],
   props: {
     messageContentAttributes: {
       type: Object,
@@ -67,9 +74,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      widgetColor: 'appConfig/getWidgetColor',
-    }),
+    ...mapGetters({ widgetColor: 'appConfig/getWidgetColor' }),
     isRatingSubmitted() {
       return this.messageContentAttributes?.csat_survey_response?.rating;
     },
@@ -80,6 +85,10 @@ export default {
     isButtonDisabled() {
       return !(this.selectedRating && this.feedback);
     },
+    inputColor() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')}
+        ${this.$dm('text-black-900', 'dark:text-slate-50')}`;
+    },
     title() {
       return this.isRatingSubmitted
         ? this.$t('CSAT.SUBMITTED_TITLE')
@@ -136,10 +145,9 @@ export default {
 @import '~widget/assets/scss/variables.scss';
 @import '~widget/assets/scss/mixins.scss';
 
-.customer-satisfcation {
+.customer-satisfaction {
   @include light-shadow;
 
-  background: $color-white;
   border-bottom-left-radius: $space-smaller;
   border-radius: $space-small;
   border-top: $space-micro solid $color-woot;
@@ -193,6 +201,10 @@ export default {
       border-top: 1px solid $color-border;
       padding: $space-one;
       width: 100%;
+
+      &::placeholder {
+        color: $color-light-gray;
+      }
     }
 
     .button {
diff --git a/app/javascript/shared/components/DateSeparator.vue b/app/javascript/shared/components/DateSeparator.vue
index 487da2f76..32ae6e10c 100644
--- a/app/javascript/shared/components/DateSeparator.vue
+++ b/app/javascript/shared/components/DateSeparator.vue
@@ -1,12 +1,18 @@
 <template>
-  <div class="date--separator">
+  <div
+    class="date--separator"
+    :class="$dm('text-slate-700', 'dark:text-slate-200')"
+  >
     {{ formattedDate }}
   </div>
 </template>
 
 <script>
 import { formatDate } from 'shared/helpers/DateHelper';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+
 export default {
+  mixins: [darkModeMixin],
   props: {
     date: {
       type: String,
@@ -30,7 +36,6 @@ export default {
 
 .date--separator {
   font-size: $font-size-default;
-  color: $color-body;
   height: 50px;
   line-height: 50px;
   position: relative;
diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
index 402ec0298..6c7f8a78a 100644
--- a/app/javascript/shared/components/ResizableTextArea.vue
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -12,7 +12,6 @@
 
 <script>
 const TYPING_INDICATOR_IDLE_TIME = 4000;
-
 export default {
   props: {
     placeholder: {
diff --git a/app/javascript/shared/components/specs/DateSeparator.spec.js b/app/javascript/shared/components/specs/DateSeparator.spec.js
index 6379fbf77..95b34f4f0 100644
--- a/app/javascript/shared/components/specs/DateSeparator.spec.js
+++ b/app/javascript/shared/components/specs/DateSeparator.spec.js
@@ -1,17 +1,52 @@
-import { mount } from '@vue/test-utils';
 import DateSeparator from '../DateSeparator';
+import { createLocalVue, shallowMount } from '@vue/test-utils';
+import Vuex from 'vuex';
+import VueI18n from 'vue-i18n';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+const localVue = createLocalVue();
+import i18n from 'dashboard/i18n';
+localVue.use(Vuex);
+localVue.use(VueI18n);
 
-describe('DateSeparator', () => {
-  test('matches snapshot', () => {
-    const wrapper = mount(DateSeparator, {
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+describe('dateSeparator', () => {
+  let store = null;
+  let actions = null;
+  let modules = null;
+  let dateSeparator = null;
+
+  beforeEach(() => {
+    actions = {};
+
+    modules = {
+      auth: {
+        getters: {
+          'appConfig/darkMode': () => 'light',
+        },
+      },
+    };
+    store = new Vuex.Store({
+      actions,
+      modules,
+    });
+
+    dateSeparator = shallowMount(DateSeparator, {
+      store,
+      localVue,
       propsData: {
         date: 'Nov 18, 2019',
       },
-      mocks: {
-        $t: () => {},
-      },
+      i18n: i18nConfig,
+      mixins: [darkModeMixin],
     });
-    expect(wrapper.vm).toBeTruthy();
-    expect(wrapper.element).toMatchSnapshot();
+  });
+
+  it('date separator snapshot', () => {
+    expect(dateSeparator.vm).toBeTruthy();
+    expect(dateSeparator.element).toMatchSnapshot();
   });
 });
diff --git a/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap b/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
index 4ddc499f9..3b9f2f34e 100644
--- a/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
+++ b/app/javascript/shared/components/specs/__snapshots__/DateSeparator.spec.js.snap
@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`DateSeparator matches snapshot 1`] = `
+exports[`dateSeparator date separator snapshot 1`] = `
 <div
-  class="date--separator"
+  class="date--separator text-slate-700"
 >
   
   Nov 18, 2019
diff --git a/app/javascript/widget/assets/scss/views/_conversation.scss b/app/javascript/widget/assets/scss/views/_conversation.scss
index 7de312eac..7124c52fb 100644
--- a/app/javascript/widget/assets/scss/views/_conversation.scss
+++ b/app/javascript/widget/assets/scss/views/_conversation.scss
@@ -42,7 +42,6 @@
   }
 
   .agent-name {
-    color: $color-body;
     font-size: $font-size-small;
     font-weight: $font-weight-medium;
     margin: $space-small 0;
@@ -210,7 +209,6 @@
 
 .chat-bubble {
   @include light-shadow;
-  background: $color-woot;
   border-radius: $space-two;
   color: $color-white;
   display: inline-block;
@@ -242,7 +240,6 @@
   }
 
   &.agent {
-    background: $color-white;
     border-bottom-left-radius: $space-smaller;
     color: $color-body;
 
diff --git a/app/javascript/widget/components/AgentMessage.vue b/app/javascript/widget/components/AgentMessage.vue
index f3d499126..186b47bd3 100755
--- a/app/javascript/widget/components/AgentMessage.vue
+++ b/app/javascript/widget/components/AgentMessage.vue
@@ -24,7 +24,7 @@
         <div
           v-if="hasAttachments"
           class="chat-bubble has-attachment agent"
-          :class="wrapClass"
+          :class="(wrapClass, $dm('bg-white', 'dark:bg-slate-50'))"
         >
           <div v-for="attachment in message.attachments" :key="attachment.id">
             <image-bubble
@@ -40,7 +40,11 @@
             <file-bubble v-else :url="attachment.data_url" />
           </div>
         </div>
-        <p v-if="message.showAvatar || hasRecordedResponse" class="agent-name">
+        <p
+          v-if="message.showAvatar || hasRecordedResponse"
+          class="agent-name"
+          :class="$dm('text-slate-700', 'dark:text-slate-200')"
+        >
           {{ agentName }}
         </p>
       </div>
@@ -68,6 +72,8 @@ import { MESSAGE_TYPE } from 'widget/helpers/constants';
 import configMixin from '../mixins/configMixin';
 import messageMixin from '../mixins/messageMixin';
 import { isASubmittedFormMessage } from 'shared/helpers/MessageTypeHelper';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+
 export default {
   name: 'AgentMessage',
   components: {
@@ -77,7 +83,7 @@ export default {
     UserMessage,
     FileBubble,
   },
-  mixins: [timeMixin, configMixin, messageMixin],
+  mixins: [timeMixin, configMixin, messageMixin, darkModeMixin],
   props: {
     message: {
       type: Object,
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index 467b99b47..b4a304914 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -5,8 +5,13 @@
         !isCards && !isOptions && !isForm && !isArticle && !isCards && !isCSAT
       "
       class="chat-bubble agent"
+      :class="$dm('bg-white', 'dark:bg-slate-700')"
     >
-      <div class="message-content" v-html="formatMessage(message, false)"></div>
+      <div
+        class="message-content"
+        :class="$dm('text-black-900', 'dark:text-slate-50')"
+        v-html="formatMessage(message, false)"
+      ></div>
       <email-input
         v-if="isTemplateEmail"
         :message-id="messageId"
@@ -60,6 +65,7 @@ import ChatOptions from 'shared/components/ChatOptions';
 import ChatArticle from './template/Article';
 import EmailInput from './template/EmailInput';
 import CustomerSatisfaction from 'shared/components/CustomerSatisfaction';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   name: 'AgentMessageBubble',
@@ -71,7 +77,7 @@ export default {
     EmailInput,
     CustomerSatisfaction,
   },
-  mixins: [messageFormatterMixin],
+  mixins: [messageFormatterMixin, darkModeMixin],
   props: {
     message: { type: String, default: null },
     contentType: { type: String, default: null },
diff --git a/app/javascript/widget/components/AgentTypingBubble.vue b/app/javascript/widget/components/AgentTypingBubble.vue
index 9e019613a..8e93be85c 100644
--- a/app/javascript/widget/components/AgentTypingBubble.vue
+++ b/app/javascript/widget/components/AgentTypingBubble.vue
@@ -3,7 +3,10 @@
     <div class="agent-message">
       <div class="avatar-wrap"></div>
       <div class="message-wrap">
-        <div class="typing-bubble chat-bubble agent">
+        <div
+          class="typing-bubble chat-bubble agent"
+          :class="$dm('bg-white', 'dark:bg-slate-50')"
+        >
           <img
             src="~widget/assets/images/typing.gif"
             alt="Agent is typing a message"
@@ -15,8 +18,10 @@
 </template>
 
 <script>
+import darkModeMixing from 'widget/mixins/darkModeMixin.js';
 export default {
   name: 'AgentTypingBubble',
+  mixins: [darkModeMixing],
 };
 </script>
 
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index 23e101f11..15ffda422 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -1,8 +1,15 @@
 <template>
-  <header class="flex justify-between p-5 w-full">
+  <header
+    class="flex justify-between p-5 w-full"
+    :class="$dm('bg-white', 'dark:bg-slate-900')"
+  >
     <div class="flex items-center">
       <button v-if="showBackButton" @click="onBackButtonClick">
-        <fluent-icon icon="chevron-left" size="24" />
+        <fluent-icon
+          icon="chevron-left"
+          size="24"
+          :class="$dm('text-black-900', 'dark:text-slate-50')"
+        />
       </button>
       <img
         v-if="avatarUrl"
@@ -11,7 +18,10 @@
         alt="avatar"
       />
       <div>
-        <div class="text-black-900 font-medium text-base flex items-center">
+        <div
+          class="font-medium text-base flex items-center"
+          :class="$dm('text-black-900', 'dark:text-slate-50')"
+        >
           <span class="mr-1" v-html="title" />
           <div
             :class="
@@ -20,7 +30,10 @@
             "
           />
         </div>
-        <div class="text-xs mt-1 text-black-700">
+        <div
+          class="text-xs mt-1"
+          :class="$dm('text-black-700', 'dark:text-slate-400')"
+        >
           {{ replyWaitMessage }}
         </div>
       </div>
@@ -36,6 +49,7 @@ import availabilityMixin from 'widget/mixins/availability';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import HeaderActions from './HeaderActions';
 import routerMixin from 'widget/mixins/routerMixin';
+import darkMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   name: 'ChatHeader',
@@ -43,7 +57,7 @@ export default {
     FluentIcon,
     HeaderActions,
   },
-  mixins: [availabilityMixin, routerMixin],
+  mixins: [availabilityMixin, routerMixin, darkMixin],
   props: {
     avatarUrl: {
       type: String,
@@ -67,7 +81,9 @@ export default {
     },
   },
   computed: {
-    ...mapGetters({ widgetColor: 'appConfig/getWidgetColor' }),
+    ...mapGetters({
+      widgetColor: 'appConfig/getWidgetColor',
+    }),
     isOnline() {
       const { workingHoursEnabled } = this.channelConfig;
       const anyAgentOnline = this.availableAgents.length > 0;
diff --git a/app/javascript/widget/components/ChatHeaderExpanded.vue b/app/javascript/widget/components/ChatHeaderExpanded.vue
index fc4aab125..fd316c3e0 100755
--- a/app/javascript/widget/components/ChatHeaderExpanded.vue
+++ b/app/javascript/widget/components/ChatHeaderExpanded.vue
@@ -1,5 +1,8 @@
 <template>
-  <header class="header-expanded bg-white py-6 px-5 relative box-border w-full">
+  <header
+    class="header-expanded py-6 px-5 relative box-border w-full"
+    :class="$dm('bg-white', 'dark:bg-slate-900')"
+  >
     <div
       class="flex items-start"
       :class="[avatarUrl ? 'justify-between' : 'justify-end']"
@@ -8,21 +11,29 @@
       <header-actions :show-popout-button="showPopoutButton" />
     </div>
     <h2
-      class="text-slate-900 mt-5 text-3xl mb-3 font-normal"
+      class=" mt-5 text-3xl mb-3 font-normal"
+      :class="$dm('text-slate-900', 'dark:text-slate-50')"
       v-html="introHeading"
     />
-    <p class="text-lg text-black-700 leading-normal" v-html="introBody" />
+    <p
+      class="text-lg leading-normal"
+      :class="$dm('text-slate-700', 'dark:text-slate-200')"
+      v-html="introBody"
+    />
   </header>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
 import HeaderActions from './HeaderActions';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+
 export default {
   name: 'ChatHeaderExpanded',
   components: {
     HeaderActions,
   },
+  mixins: [darkModeMixin],
   props: {
     avatarUrl: {
       type: String,
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index 741eb67b2..4cb3fe043 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -1,7 +1,7 @@
 <template>
   <div
-    class="chat-message--input"
-    :class="{ 'is-focused': isFocused }"
+    class="chat-message--input is-focused"
+    :class="$dm('bg-white ', 'dark:bg-slate-600')"
     @keydown.esc="hideEmojiPicker"
   >
     <resizable-text-area
@@ -10,7 +10,8 @@
       v-model="userInput"
       :aria-label="$t('CHAT_PLACEHOLDER')"
       :placeholder="$t('CHAT_PLACEHOLDER')"
-      class="form-input user-message-input"
+      class="form-input user-message-input is-focused"
+      :class="inputColor"
       @typing-off="onTypingOff"
       @typing-on="onTypingOn"
       @focus="onFocus"
@@ -19,6 +20,7 @@
     <div class="button-wrap">
       <chat-attachment-button
         v-if="showAttachment"
+        :class="$dm('text-black-900', 'dark:text-slate-100')"
         :on-attach="onSendAttachment"
       />
       <button
@@ -27,10 +29,7 @@
         aria-label="Emoji picker"
         @click="toggleEmojiPicker"
       >
-        <fluent-icon
-          icon="emoji"
-          :class="{ 'text-woot-500': showEmojiPicker }"
-        />
+        <fluent-icon icon="emoji" :class="emojiIconColor" />
       </button>
       <emoji-input
         v-if="showEmojiPicker"
@@ -57,6 +56,7 @@ import configMixin from '../mixins/configMixin';
 import EmojiInput from 'shared/components/emoji/EmojiInput';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import ResizableTextArea from 'shared/components/ResizableTextArea';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   name: 'ChatInputWrap',
@@ -67,7 +67,7 @@ export default {
     FluentIcon,
     ResizableTextArea,
   },
-  mixins: [clickaway, configMixin],
+  mixins: [clickaway, configMixin, darkModeMixin],
   props: {
     onSendMessage: {
       type: Function,
@@ -98,6 +98,15 @@ export default {
     showSendButton() {
       return this.userInput.length > 0;
     },
+    inputColor() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')}
+        ${this.$dm('text-black-900', 'dark:text-slate-50')}`;
+    },
+    emojiIconColor() {
+      return this.showEmojiPicker
+        ? `text-woot-500 ${this.$dm('text-black-900', 'dark:text-slate-100')}`
+        : `${this.$dm('text-black-900', 'dark:text-slate-100')}`;
+    },
   },
   watch: {
     isWidgetOpen(isWidgetOpen) {
diff --git a/app/javascript/widget/components/Form/Input.vue b/app/javascript/widget/components/Form/Input.vue
index a8f1abe9e..4dddef74f 100644
--- a/app/javascript/widget/components/Form/Input.vue
+++ b/app/javascript/widget/components/Form/Input.vue
@@ -1,22 +1,12 @@
 <template>
   <label class="block">
-    <div
-      v-if="label"
-      class="mb-2 text-xs font-medium"
-      :class="{
-        'text-black-800': !error,
-        'text-red-400': error,
-      }"
-    >
+    <div v-if="label" class="mb-2 text-xs font-medium" :class="labelClass">
       {{ label }}
     </div>
     <input
       :type="type"
-      class="border rounded w-full py-2 px-3 text-slate-700 leading-tight outline-none"
-      :class="{
-        'border-black-200 hover:border-black-300 focus:border-black-300': !error,
-        'border-red-200 hover:border-red-300 focus:border-red-300': error,
-      }"
+      class="border rounded w-full py-2 px-3 leading-tight outline-none"
+      :class="inputHasError"
       :placeholder="placeholder"
       :value="value"
       @change="onChange"
@@ -27,7 +17,9 @@
   </label>
 </template>
 <script>
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 export default {
+  mixins: [darkModeMixin],
   props: {
     label: {
       type: String,
@@ -50,6 +42,27 @@ export default {
       default: '',
     },
   },
+  computed: {
+    labelClass() {
+      return this.error
+        ? `text-red-400 ${this.$dm('text-black-800', 'dark:text-slate-50')}`
+        : `text-black-800 ${this.$dm('text-black-800', 'dark:text-slate-50')}`;
+    },
+    isInputDarkOrLightMode() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')} ${this.$dm(
+        'text-slate-700',
+        'dark:text-slate-50'
+      )}`;
+    },
+    inputBorderColor() {
+      return `${this.$dm('border-black-200', 'dark:border-black-500')}`;
+    },
+    inputHasError() {
+      return this.error
+        ? `border-red-200 hover:border-red-300 focus:border-red-300 ${this.isInputDarkOrLightMode}`
+        : `hover:border-black-300 focus:border-black-300 ${this.isInputDarkOrLightMode} ${this.inputBorderColor}`;
+    },
+  },
   methods: {
     onChange(event) {
       this.$emit('input', event.target.value);
diff --git a/app/javascript/widget/components/Form/TextArea.vue b/app/javascript/widget/components/Form/TextArea.vue
index 4de6b4323..024e104f0 100644
--- a/app/javascript/widget/components/Form/TextArea.vue
+++ b/app/javascript/widget/components/Form/TextArea.vue
@@ -1,21 +1,11 @@
 <template>
   <label class="block">
-    <div
-      v-if="label"
-      class="mb-2 text-xs font-medium"
-      :class="{
-        'text-black-800': !error,
-        'text-red-400': error,
-      }"
-    >
+    <div v-if="label" class="mb-2 text-xs font-medium" :class="labelClass">
       {{ label }}
     </div>
     <textarea
       class="resize-none border rounded w-full py-2 px-3 text-slate-700 leading-tight outline-none"
-      :class="{
-        'border-black-200 hover:border-black-300 focus:border-black-300': !error,
-        'border-red-200 hover:border-red-300 focus:border-red-300': error,
-      }"
+      :class="isTextAreaHasError"
       :placeholder="placeholder"
       :value="value"
       @change="onChange"
@@ -26,7 +16,9 @@
   </label>
 </template>
 <script>
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 export default {
+  mixins: [darkModeMixin],
   props: {
     label: {
       type: String,
@@ -49,6 +41,27 @@ export default {
       default: '',
     },
   },
+  computed: {
+    labelClass() {
+      return this.error
+        ? `text-red-400 ${this.$dm('text-black-800', 'dark:text-slate-50')}`
+        : `text-black-800 ${this.$dm('text-black-800', 'dark:text-slate-50')}`;
+    },
+    isTextAreaDarkOrLightMode() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')} ${this.$dm(
+        'text-slate-700',
+        'dark:text-slate-50'
+      )}`;
+    },
+    textAreaBorderColor() {
+      return `${this.$dm('border-black-200', 'dark:border-black-500')}`;
+    },
+    isTextAreaHasError() {
+      return this.error
+        ? `border-red-200 hover:border-red-300 focus:border-red-300 ${this.isTextAreaDarkOrLightMode}`
+        : `hover:border-black-300 focus:border-black-300 ${this.isTextAreaDarkOrLightMode} ${this.textAreaBorderColor}`;
+    },
+  },
   methods: {
     onChange(event) {
       this.$emit('input', event.target.value);
diff --git a/app/javascript/widget/components/HeaderActions.vue b/app/javascript/widget/components/HeaderActions.vue
index 1090d54b0..16f10ed12 100644
--- a/app/javascript/widget/components/HeaderActions.vue
+++ b/app/javascript/widget/components/HeaderActions.vue
@@ -6,14 +6,22 @@
       :title="$t('END_CONVERSATION')"
       @click="resolveConversation"
     >
-      <fluent-icon icon="sign-out" size="22" class="text-black-900" />
+      <fluent-icon
+        icon="sign-out"
+        size="22"
+        :class="$dm('text-black-900', 'dark:text-slate-50')"
+      />
     </button>
     <button
       v-if="showPopoutButton"
       class="button transparent compact new-window--button "
       @click="popoutWindow"
     >
-      <fluent-icon icon="open" size="22" class="text-black-900" />
+      <fluent-icon
+        icon="open"
+        size="22"
+        :class="$dm('text-black-900', 'dark:text-slate-50')"
+      />
     </button>
     <button
       class="button transparent compact close-button"
@@ -22,7 +30,11 @@
       }"
       @click="closeWindow"
     >
-      <fluent-icon icon="dismiss" size="24" class="text-black-900" />
+      <fluent-icon
+        icon="dismiss"
+        size="24"
+        :class="$dm('text-black-900', 'dark:text-slate-50')"
+      />
     </button>
   </div>
 </template>
@@ -31,10 +43,12 @@ import { mapGetters } from 'vuex';
 import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import { popoutChatWindow } from '../helpers/popoutHelper';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   name: 'HeaderActions',
   components: { FluentIcon },
+  mixins: [darkModeMixin],
   props: {
     showPopoutButton: {
       type: Boolean,
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 7fdf33375..793c59ecb 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -5,7 +5,8 @@
   >
     <div
       v-if="shouldShowHeaderMessage"
-      class="text-black-800 text-sm leading-5"
+      class="text-sm leading-5"
+      :class="$dm('text-black-800', 'dark:text-slate-50')"
     >
       {{ headerMessage }}
     </div>
@@ -64,6 +65,7 @@ import { getContrastingTextColor } from '@chatwoot/utils';
 import { required, minLength, email } from 'vuelidate/lib/validators';
 import { isEmptyObject } from 'widget/helpers/utils';
 import routerMixin from 'widget/mixins/routerMixin';
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 export default {
   components: {
     FormInput,
@@ -71,7 +73,7 @@ export default {
     CustomButton,
     Spinner,
   },
-  mixins: [routerMixin],
+  mixins: [routerMixin, darkModeMixin],
   props: {
     options: {
       type: Object,
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index c4e19742d..35cb7eebc 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -1,7 +1,10 @@
 <template>
   <div class="px-5">
     <div class="flex items-center justify-between mb-4">
-      <div class="text-black-700 max-w-xs">
+      <div
+        class="max-w-xs"
+        :class="$dm('text-black-700', 'dark:text-slate-50')"
+      >
         <div class="text-base leading-5 font-medium mb-1">
           {{
             isOnline
@@ -36,6 +39,7 @@ import AvailableAgents from 'widget/components/AvailableAgents.vue';
 import CustomButton from 'shared/components/Button';
 import configMixin from 'widget/mixins/configMixin';
 import availabilityMixin from 'widget/mixins/availability';
+import darkMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   name: 'TeamAvailability',
@@ -43,7 +47,7 @@ export default {
     AvailableAgents,
     CustomButton,
   },
-  mixins: [configMixin, availabilityMixin],
+  mixins: [configMixin, availabilityMixin, darkMixin],
   props: {
     availableAgents: {
       type: Array,
@@ -55,7 +59,9 @@ export default {
     },
   },
   computed: {
-    ...mapGetters({ widgetColor: 'appConfig/getWidgetColor' }),
+    ...mapGetters({
+      widgetColor: 'appConfig/getWidgetColor',
+    }),
     textColor() {
       return getContrastingTextColor(this.widgetColor);
     },
diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index 13e8fc250..a3d8ee363 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="chat-bubble-wrap">
-    <button class="chat-bubble agent" @click="onClickMessage">
+    <button
+      class="chat-bubble agent"
+      :class="$dm('bg-white', 'dark:bg-slate-50')"
+      @click="onClickMessage"
+    >
       <div v-if="showSender" class="row--agent-block">
         <thumbnail
           :src="avatarUrl"
@@ -25,10 +29,11 @@ import {
   ON_CAMPAIGN_MESSAGE_CLICK,
   ON_UNREAD_MESSAGE_CLICK,
 } from '../constants/widgetBusEvents';
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 export default {
   name: 'UnreadMessage',
   components: { Thumbnail },
-  mixins: [messageFormatterMixin, configMixin],
+  mixins: [messageFormatterMixin, configMixin, darkModeMixin],
   props: {
     message: {
       type: String,
diff --git a/app/javascript/widget/components/layouts/ViewWithHeader.vue b/app/javascript/widget/components/layouts/ViewWithHeader.vue
index 9c200eb43..10c56121f 100644
--- a/app/javascript/widget/components/layouts/ViewWithHeader.vue
+++ b/app/javascript/widget/components/layouts/ViewWithHeader.vue
@@ -1,11 +1,15 @@
 <template>
   <div
-    class="w-full h-full bg-slate-50 flex flex-col"
+    class="w-full h-full flex flex-col"
+    :class="$dm('bg-slate-50', 'dark:bg-slate-800')"
     @keydown.esc="closeWindow"
   >
     <div
-      class="header-wrap bg-white"
-      :class="{ expanded: !isHeaderCollapsed, collapsed: isHeaderCollapsed }"
+      class="header-wrap"
+      :class="{
+        expanded: !isHeaderCollapsed,
+        collapsed: isHeaderCollapsed,
+      }"
     >
       <transition
         enter-active-class="transition-all delay-200 duration-300 ease-in"
@@ -51,6 +55,7 @@ import Branding from 'shared/components/Branding.vue';
 import ChatHeader from '../ChatHeader.vue';
 import ChatHeaderExpanded from '../ChatHeaderExpanded.vue';
 import configMixin from '../../mixins/configMixin';
+import darkModeMixin from 'widget/mixins/darkModeMixin';
 import { mapGetters } from 'vuex';
 import { IFrameHelper } from 'widget/helpers/utils';
 
@@ -61,7 +66,7 @@ export default {
     ChatHeader,
     ChatHeaderExpanded,
   },
-  mixins: [configMixin],
+  mixins: [configMixin, darkModeMixin],
   data() {
     return {
       showPopoutButton: false,
diff --git a/app/javascript/widget/components/template/Article.vue b/app/javascript/widget/components/template/Article.vue
index 6d5308c48..f022215bd 100644
--- a/app/javascript/widget/components/template/Article.vue
+++ b/app/javascript/widget/components/template/Article.vue
@@ -1,12 +1,25 @@
 <template>
-  <div v-if="!!items.length" class="chat-bubble agent">
+  <div
+    v-if="!!items.length"
+    class="chat-bubble agent"
+    :class="$dm('bg-white', 'dark:bg-slate-700')"
+  >
     <div v-for="item in items" :key="item.link" class="article-item">
       <a :href="item.link" target="_blank" rel="noopener noreferrer nofollow">
         <span class="title flex items-center text-black-900 font-medium">
-          <fluent-icon icon="link" class="mr-1" />
-          <span>{{ item.title }}</span>
+          <fluent-icon
+            icon="link"
+            class="mr-1"
+            :class="$dm('text-black-900', 'dark:text-slate-50')"
+          />
+          <span :class="$dm('text-slate-900', 'dark:text-slate-50')">{{
+            item.title
+          }}</span>
         </span>
-        <span class="description">
+        <span
+          class="description"
+          :class="$dm('text-slate-700', 'dark:text-slate-200')"
+        >
           {{ truncateMessage(item.description) }}
         </span>
       </a>
@@ -17,12 +30,13 @@
 <script>
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   components: {
     FluentIcon,
   },
-  mixins: [messageFormatterMixin],
+  mixins: [messageFormatterMixin, darkModeMixin],
   props: {
     items: {
       type: Array,
diff --git a/app/javascript/widget/components/template/EmailInput.vue b/app/javascript/widget/components/template/EmailInput.vue
index 096870b73..054508313 100644
--- a/app/javascript/widget/components/template/EmailInput.vue
+++ b/app/javascript/widget/components/template/EmailInput.vue
@@ -9,7 +9,7 @@
         v-model.trim="email"
         class="form-input"
         :placeholder="$t('EMAIL_PLACEHOLDER')"
-        :class="{ error: $v.email.$error }"
+        :class="inputHasError"
         @input="$v.email.$touch"
         @keydown.enter="onSubmit"
       />
@@ -31,12 +31,14 @@ import { required, email } from 'vuelidate/lib/validators';
 
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
 import Spinner from 'shared/components/Spinner';
+import darkModeMixin from 'widget/mixins/darkModeMixin.js';
 
 export default {
   components: {
     FluentIcon,
     Spinner,
   },
+  mixins: [darkModeMixin],
   props: {
     messageId: {
       type: Number,
@@ -63,6 +65,15 @@ export default {
         this.messageContentAttributes.submitted_email
       );
     },
+    inputColor() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')}
+        ${this.$dm('text-black-900', 'dark:text-slate-50')}`;
+    },
+    inputHasError() {
+      return this.$v.email.$error
+        ? `${this.inputColor} error`
+        : `${this.inputColor}`;
+    },
   },
   validations: {
     email: {
@@ -105,6 +116,10 @@ export default {
     padding: $space-one;
     width: 100%;
 
+    &::placeholder {
+      color: $color-light-gray;
+    }
+
     &.error {
       border-color: $color-error;
     }
diff --git a/app/javascript/widget/mixins/darkModeMixin.js b/app/javascript/widget/mixins/darkModeMixin.js
new file mode 100644
index 000000000..dd8f19cfc
--- /dev/null
+++ b/app/javascript/widget/mixins/darkModeMixin.js
@@ -0,0 +1,15 @@
+import { mapGetters } from 'vuex';
+
+export default {
+  computed: {
+    ...mapGetters({ darkMode: 'appConfig/darkMode' }),
+  },
+  methods: {
+    $dm(light, dark) {
+      if (this.darkMode === 'light') {
+        return light;
+      }
+      return light + ' ' + dark;
+    },
+  },
+};
diff --git a/app/javascript/widget/mixins/specs/darkModeMixin.spec.js b/app/javascript/widget/mixins/specs/darkModeMixin.spec.js
new file mode 100644
index 000000000..852bcc6e6
--- /dev/null
+++ b/app/javascript/widget/mixins/specs/darkModeMixin.spec.js
@@ -0,0 +1,41 @@
+import { shallowMount, createLocalVue } from '@vue/test-utils';
+import darkModeMixin from '../darkModeMixin';
+import Vuex from 'vuex';
+const localVue = createLocalVue();
+localVue.use(Vuex);
+
+const darkModeValues = ['light', 'auto'];
+
+describe('darkModeMixin', () => {
+  let getters;
+  let store;
+  beforeEach(() => {
+    getters = {
+      'appConfig/darkMode': () => darkModeValues[0],
+    };
+    store = new Vuex.Store({ getters });
+  });
+
+  it('if light theme', () => {
+    const Component = {
+      render() {},
+      mixins: [darkModeMixin],
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(wrapper.vm.$dm('bg-100', 'bg-600')).toBe('bg-100');
+  });
+
+  it('if auto theme', () => {
+    getters = {
+      'appConfig/darkMode': () => darkModeValues[2],
+    };
+    store = new Vuex.Store({ getters });
+
+    const Component = {
+      render() {},
+      mixins: [darkModeMixin],
+    };
+    const wrapper = shallowMount(Component, { store, localVue });
+    expect(wrapper.vm.$dm('bg-100', 'bg-600')).toBe('bg-100 bg-600');
+  });
+});
diff --git a/app/javascript/widget/store/modules/appConfig.js b/app/javascript/widget/store/modules/appConfig.js
index bb65f2dfa..319f86be4 100644
--- a/app/javascript/widget/store/modules/appConfig.js
+++ b/app/javascript/widget/store/modules/appConfig.js
@@ -15,6 +15,7 @@ const state = {
   showPopoutButton: false,
   widgetColor: '',
   widgetStyle: 'standard',
+  darkMode: 'light',
 };
 
 export const getters = {
@@ -25,18 +26,26 @@ export const getters = {
   getWidgetColor: $state => $state.widgetColor,
   getReferrerHost: $state => $state.referrerHost,
   isWidgetStyleFlat: $state => $state.widgetStyle === 'flat',
+  darkMode: $state => $state.darkMode,
 };
 
 export const actions = {
   setAppConfig(
     { commit },
-    { showPopoutButton, position, hideMessageBubble, widgetStyle = 'rounded' }
+    {
+      showPopoutButton,
+      position,
+      hideMessageBubble,
+      widgetStyle = 'rounded',
+      darkMode = 'light',
+    }
   ) {
     commit(SET_WIDGET_APP_CONFIG, {
       hideMessageBubble: !!hideMessageBubble,
       position: position || 'right',
       showPopoutButton: !!showPopoutButton,
       widgetStyle,
+      darkMode,
     });
   },
   toggleWidgetOpen({ commit }, isWidgetOpen) {
@@ -56,6 +65,7 @@ export const mutations = {
     $state.position = data.position;
     $state.hideMessageBubble = data.hideMessageBubble;
     $state.widgetStyle = data.widgetStyle;
+    $state.darkMode = data.darkMode;
   },
   [TOGGLE_WIDGET_OPEN]($state, isWidgetOpen) {
     $state.isWidgetOpen = isWidgetOpen;
diff --git a/app/views/widget_tests/index.html.erb b/app/views/widget_tests/index.html.erb
index 8e20c06a9..3352f5a3a 100644
--- a/app/views/widget_tests/index.html.erb
+++ b/app/views/widget_tests/index.html.erb
@@ -19,6 +19,7 @@ window.chatwootSettings = {
   type: '<%= @widget_type %>',
   showPopoutButton: true,
   widgetStyle: '<%= @widget_style %>',
+  darkMode: '<%= @dark_mode %>',
 };
 
 (function(d,t) {
diff --git a/tailwind.config.js b/tailwind.config.js
index c4e5aa8c1..48e24bc31 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -85,7 +85,11 @@ module.exports = {
         900: '#C30011',
       },
     },
-    extend: {},
+    extend: {
+      screens: {
+        dark: { raw: '(prefers-color-scheme: dark)' },
+      },
+    },
   },
   variants: {},
   plugins: [],

From 5d85a212875c0b3de125881abbfbe8e6af939f13 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:03:53 +0530
Subject: [PATCH 009/177] fix: Fix login button is missing in Safari (#4332)

Fixes #4328
---
 .../dashboard/components/buttons/FormSubmitButton.vue  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/javascript/dashboard/components/buttons/FormSubmitButton.vue b/app/javascript/dashboard/components/buttons/FormSubmitButton.vue
index cc65c68b0..1a60b3a43 100644
--- a/app/javascript/dashboard/components/buttons/FormSubmitButton.vue
+++ b/app/javascript/dashboard/components/buttons/FormSubmitButton.vue
@@ -57,3 +57,13 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+button:disabled {
+  opacity: 1;
+  background-color: var(--w-100);
+
+  &:hover {
+    background-color: var(--w-100);
+  }
+}
+</style>

From 3509692055912b5796d9dac7b922e1a11e8b94b8 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Sun, 3 Apr 2022 19:22:56 +0530
Subject: [PATCH 010/177] chore: Fix brand name in survey translations (#4360)

---
 app/javascript/survey/i18n/locale/ar.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/survey/i18n/locale/ar.json b/app/javascript/survey/i18n/locale/ar.json
index 945c640a2..9cd0cc6d1 100644
--- a/app/javascript/survey/i18n/locale/ar.json
+++ b/app/javascript/survey/i18n/locale/ar.json
@@ -15,5 +15,5 @@
       "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
     }
   },
-  "POWERED_BY": "مدعوم بواسطة تشات وت"
+  "POWERED_BY": "مدعوم بواسطة Chatwoot"
 }

From 1dd0c7249c21a5482f08cfc7fe3546003238aea4 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 4 Apr 2022 14:34:01 +0530
Subject: [PATCH 011/177] fix:  Unread notification count in multiple accounts
 (#4373)

Fixes: #4367
---
 app/listeners/base_listener.rb | 5 +++--
 app/models/user.rb             | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/listeners/base_listener.rb b/app/listeners/base_listener.rb
index 397ec62ed..ffd57d2a3 100644
--- a/app/listeners/base_listener.rb
+++ b/app/listeners/base_listener.rb
@@ -8,8 +8,9 @@ class BaseListener
 
   def extract_notification_and_account(event)
     notification = event.data[:notification]
-    unread_count = notification.user.notifications_meta[:unread_count]
-    count = notification.user.notifications_meta[:count]
+    notifications_meta = notification.user.notifications_meta(notification.account_id)
+    unread_count = notifications_meta[:unread_count]
+    count = notifications_meta[:count]
     [notification, notification.account, unread_count, count]
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 8c4b3ce2f..3b7a74672 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -188,10 +188,10 @@ class User < ApplicationRecord
     mutations_from_database.changed?('email')
   end
 
-  def notifications_meta
+  def notifications_meta(account_id)
     {
-      unread_count: notifications.where(read_at: nil).count,
-      count: notifications.count
+      unread_count: notifications.where(account_id: account_id, read_at: nil).count,
+      count: notifications.where(account_id: account_id).count
     }
   end
 end

From 73d8073530a7dab8fa95b1deecb7fa3ad8028296 Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan-brough@users.noreply.github.com>
Date: Mon, 4 Apr 2022 02:45:45 -0700
Subject: [PATCH 012/177] chore: Fix test failure in
 action_cable_listener_spec.rb due to ordering (#4357)

---
 spec/listeners/action_cable_listener_spec.rb | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index 16367848f..b3266abc8 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -24,7 +24,9 @@ describe ActionCableListener do
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
 
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
-        [agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token],
+        a_collection_containing_exactly(
+          agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token
+        ),
         'message.created',
         message.push_event_data.merge(account_id: account.id)
       )
@@ -40,7 +42,9 @@ describe ActionCableListener do
       verified_contact_inbox = create(:contact_inbox, contact: conversation.contact, inbox: inbox, hmac_verified: true)
 
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
-        [agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token, verified_contact_inbox.pubsub_token],
+        a_collection_containing_exactly(
+          agent.pubsub_token, admin.pubsub_token, conversation.contact_inbox.pubsub_token, verified_contact_inbox.pubsub_token
+        ),
         'message.created',
         message.push_event_data.merge(account_id: account.id)
       )
@@ -56,7 +60,9 @@ describe ActionCableListener do
       # HACK: to reload conversation inbox members
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
-        [admin.pubsub_token, conversation.contact.pubsub_token],
+        a_collection_containing_exactly(
+          admin.pubsub_token, conversation.contact.pubsub_token
+        ),
         'conversation.typing_on', conversation: conversation.push_event_data,
                                   user: agent.push_event_data,
                                   account_id: account.id,
@@ -74,7 +80,9 @@ describe ActionCableListener do
       # HACK: to reload conversation inbox members
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
-        [admin.pubsub_token, conversation.contact.pubsub_token],
+        a_collection_containing_exactly(
+          admin.pubsub_token, conversation.contact.pubsub_token
+        ),
         'conversation.typing_off', conversation: conversation.push_event_data,
                                    user: agent.push_event_data,
                                    account_id: account.id,
@@ -91,7 +99,9 @@ describe ActionCableListener do
 
     it 'sends message to account admins, inbox agents' do
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
-        [agent.pubsub_token, admin.pubsub_token],
+        a_collection_containing_exactly(
+          agent.pubsub_token, admin.pubsub_token
+        ),
         'contact.deleted',
         contact.push_event_data.merge(account_id: account.id)
       )

From 591d186d667633f83ba83183c2e69a7221e283d8 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 4 Apr 2022 18:23:38 +0530
Subject: [PATCH 013/177] chore: Add `agent_last_seen_at` in conversation API
 (#4377)

---
 app/views/public/api/v1/models/_conversation.json.jbuilder | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/public/api/v1/models/_conversation.json.jbuilder b/app/views/public/api/v1/models/_conversation.json.jbuilder
index 7029238d9..25d888d3f 100644
--- a/app/views/public/api/v1/models/_conversation.json.jbuilder
+++ b/app/views/public/api/v1/models/_conversation.json.jbuilder
@@ -2,6 +2,7 @@ json.id resource.display_id
 json.inbox_id resource.inbox_id
 json.contact_last_seen_at resource.contact_last_seen_at.to_i
 json.status resource.status
+json.agent_last_seen_at resource.agent_last_seen_at.to_i
 json.messages do
   json.array! resource.messages do |message|
     json.partial! 'public/api/v1/models/message.json.jbuilder', resource: message

From 76f53d9a1168d2e2e3d2d9cedc37c6401d8efa5c Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Mon, 4 Apr 2022 19:27:01 +0530
Subject: [PATCH 014/177] feat: add gh action to run CE edition tests (#4342)

* feat: add gh action to run CE spec

* setup ruby
* add pg,redis services
* fix failing tests
---
 .github/workflows/run-foss-spec.yml | 72 +++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/run-foss-spec.yml

diff --git a/.github/workflows/run-foss-spec.yml b/.github/workflows/run-foss-spec.yml
new file mode 100644
index 000000000..3a6ff5f7b
--- /dev/null
+++ b/.github/workflows/run-foss-spec.yml
@@ -0,0 +1,72 @@
+# #
+# # This action will strip the enterprise folder
+# # and run the spec.
+# # This is set to run against every PR.
+# #
+
+name: Run Chatwoot CE spec
+on:
+  push:
+    branches:
+      - develop
+      - master
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:10.8
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: ""
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        # tmpfs makes DB faster by using RAM
+        options: >-
+          --mount type=tmpfs,destination=/var/lib/postgresql/data
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+        options: --entrypoint redis-server
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        ref: ${{ github.head_ref }}
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0.2 # Not needed with a .ruby-version file
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+    - name: yarn
+      run: yarn install
+
+    - name: Strip enterprise code
+      run: |
+        rm -rf enterprise
+        rm -rf spec/enterprise
+
+    - name: Create database
+      run: bundle exec rake db:create
+
+    - name: Seed database
+      run: bundle exec rake db:schema:load
+
+    - name: yarn check-files
+      run: yarn install --check-files
+
+    # Run rails tests
+    - name: Run backend tests
+      run: |
+        bundle exec rspec --profile=10 --format documentation

From cd5646b4b9aee239d68887bf8687d23a52a18c31 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 5 Apr 2022 14:00:07 +0530
Subject: [PATCH 015/177] fix: Skip `contact_last_seen_at` in empty
 conversation payload (#4387)

* Fix undefined `last_seen_at` empty conversation

* chore: remove the comment

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 .../api/v1/widget/messages/index.json.jbuilder   |  2 +-
 .../api/v1/widget/messages_controller_spec.rb    | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/app/views/api/v1/widget/messages/index.json.jbuilder b/app/views/api/v1/widget/messages/index.json.jbuilder
index d7a441b84..29e80815d 100644
--- a/app/views/api/v1/widget/messages/index.json.jbuilder
+++ b/app/views/api/v1/widget/messages/index.json.jbuilder
@@ -12,5 +12,5 @@ json.payload do
   end
 end
 json.meta do
-  json.contact_last_seen_at @conversation.contact_last_seen_at.to_i
+  json.contact_last_seen_at @conversation.contact_last_seen_at.to_i if @conversation.present?
 end
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index f203f11c8..208327c74 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -9,8 +9,8 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
   let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
 
-  before do
-    2.times.each { create(:message, account: account, inbox: web_widget.inbox, conversation: conversation) }
+  before do |example|
+    2.times.each { create(:message, account: account, inbox: web_widget.inbox, conversation: conversation) } unless example.metadata[:skip_before]
   end
 
   describe 'GET /api/v1/widget/messages' do
@@ -25,6 +25,18 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
         json_response = JSON.parse(response.body)
         # 2 messages created + 2 messages by the email hook
         expect(json_response['payload'].length).to eq(4)
+        expect(json_response['meta']).not_to be_empty
+      end
+
+      it 'returns empty messages', :skip_before do
+        get api_v1_widget_messages_url,
+            params: { website_token: web_widget.website_token },
+            headers: { 'X-Auth-Token' => token },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload'].length).to eq(0)
       end
     end
   end

From 9a8a0bd8655a1af62e003cb0bdceff873404d8f1 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 5 Apr 2022 15:20:34 +0530
Subject: [PATCH 016/177] feat: Ability to customize the online presence
 duration (#4385)

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

diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index 8688c4251..ec5f65812 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -1,5 +1,6 @@
 module OnlineStatusTracker
-  PRESENCE_DURATION = 20.seconds
+  # NOTE: You can customise the environment variable to keep your agents/contacts as online for longer
+  PRESENCE_DURATION = ENV.fetch('PRESENCE_DURATION', 20).to_i.seconds
 
   # presence : sorted set with timestamp as the score & object id as value
 

From 2595e774e5e1525aa32c7540e9d3a839d918b1dc Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 5 Apr 2022 15:22:56 +0530
Subject: [PATCH 017/177] fix: Update validations in automation edit actions
 (#4370)

Co-authored-by: fayazara <fayazara@gmail.com>
---
 .../widgets/AutomationActionInput.vue         |  6 ++-
 .../dashboard/helper/actionQueryGenerator.js  | 13 ++++-
 .../settings/automation/AddAutomationRule.vue | 23 ++++++---
 .../automation/EditAutomationRule.vue         | 50 ++++++++++++++-----
 app/models/automation_rule.rb                 |  2 +-
 5 files changed, 73 insertions(+), 21 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index 0c8178a9b..dc3a31c08 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -18,7 +18,7 @@
           {{ attribute.label }}
         </option>
       </select>
-      <div class="filter__answer--wrap">
+      <div v-if="showActionInput" class="filter__answer--wrap">
         <div v-if="inputType">
           <div
             v-if="inputType === 'multi_select'"
@@ -89,6 +89,10 @@ export default {
       type: Object,
       default: () => null,
     },
+    showActionInput: {
+      type: Boolean,
+      default: true,
+    },
   },
   computed: {
     action_name: {
diff --git a/app/javascript/dashboard/helper/actionQueryGenerator.js b/app/javascript/dashboard/helper/actionQueryGenerator.js
index d8f57b572..7ef5fa56f 100644
--- a/app/javascript/dashboard/helper/actionQueryGenerator.js
+++ b/app/javascript/dashboard/helper/actionQueryGenerator.js
@@ -1,8 +1,19 @@
+const formatArray = params => {
+  if (params.length <= 0) {
+    params = [];
+  } else if (params.every(elem => typeof elem === 'string')) {
+    params = [...params];
+  } else {
+    params = params.map(val => val.id);
+  }
+  return params;
+};
+
 const generatePayload = data => {
   const actions = JSON.parse(JSON.stringify(data));
   let payload = actions.map(item => {
     if (Array.isArray(item.action_params)) {
-      item.action_params = item.action_params.map(val => val.id);
+      item.action_params = formatArray(item.action_params);
     } else if (typeof item.values === 'object') {
       item.action_params = [item.action_params.id];
     } else if (!item.action_params) {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index 2e10280e5..68d2c687c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -100,6 +100,9 @@
               :dropdown-values="
                 getActionDropdownValues(automation.actions[i].action_name)
               "
+              :show-action-input="
+                showActionInput(automation.actions[i].action_name)
+              "
               :v="$v.automation.actions.$each[i]"
               @resetAction="resetAction(i)"
               @removeAction="removeAction(i)"
@@ -413,14 +416,15 @@ export default {
     submitAutomation() {
       this.$v.$touch();
       if (this.$v.$invalid) return;
-      this.automation.conditions[
-        this.automation.conditions.length - 1
+      const automation = JSON.parse(JSON.stringify(this.automation));
+      automation.conditions[
+        automation.conditions.length - 1
       ].query_operator = null;
-      this.automation.conditions = filterQueryGenerator(
-        this.automation.conditions
+      automation.conditions = filterQueryGenerator(
+        automation.conditions
       ).payload;
-      this.automation.actions = actionQueryGenerator(this.automation.actions);
-      this.$emit('saveAutomation', this.automation);
+      automation.actions = actionQueryGenerator(automation.actions);
+      this.$emit('saveAutomation', automation);
     },
     resetFilter(index, currentCondition) {
       this.automation.conditions[index].filter_operator = this.automationTypes[
@@ -438,6 +442,13 @@ export default {
         return false;
       return true;
     },
+    showActionInput(actionName) {
+      const type = AUTOMATION_ACTION_TYPES.find(
+        action => action.key === actionName
+      ).inputType;
+      if (type === null) return false;
+      return true;
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 6add27ba5..cf70a35bb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -97,6 +97,9 @@
               :dropdown-values="
                 getActionDropdownValues(automation.actions[i].action_name)
               "
+              :show-action-input="
+                showActionInput(automation.actions[i].action_name)
+              "
               :v="$v.automation.actions.$each[i]"
               @removeAction="removeAction(i)"
             />
@@ -192,7 +195,13 @@ export default {
         required,
         $each: {
           action_params: {
-            required,
+            required: requiredIf(prop => {
+              return !(
+                prop.action_name === 'mute_conversation' ||
+                prop.action_name === 'snooze_convresation' ||
+                prop.action_name === 'resolve_convresation'
+              );
+            }),
           },
         },
       },
@@ -246,7 +255,7 @@ export default {
     },
   },
   mounted() {
-    this.formatConditions(this.selectedResponse);
+    this.formatAutomation(this.selectedResponse);
   },
   methods: {
     onEventChange() {
@@ -414,14 +423,15 @@ export default {
     submitAutomation() {
       this.$v.$touch();
       if (this.$v.$invalid) return;
-      this.automation.conditions[
-        this.automation.conditions.length - 1
+      const automation = JSON.parse(JSON.stringify(this.automation));
+      automation.conditions[
+        automation.conditions.length - 1
       ].query_operator = null;
-      this.automation.conditions = filterQueryGenerator(
-        this.automation.conditions
+      automation.conditions = filterQueryGenerator(
+        automation.conditions
       ).payload;
-      this.automation.actions = actionQueryGenerator(this.automation.actions);
-      this.$emit('saveAutomation', this.automation, 'EDIT');
+      automation.actions = actionQueryGenerator(automation.actions);
+      this.$emit('saveAutomation', automation, 'EDIT');
     },
     resetFilter(index, currentCondition) {
       this.automation.conditions[index].filter_operator = this.automationTypes[
@@ -436,7 +446,7 @@ export default {
         return false;
       return true;
     },
-    formatConditions(automation) {
+    formatAutomation(automation) {
       const formattedConditions = automation.conditions.map(condition => {
         const inputType = this.automationTypes[
           automation.event_name
@@ -456,11 +466,20 @@ export default {
         };
       });
       const formattedActions = automation.actions.map(action => {
+        let actionParams = [];
+        if (action.action_params.length) {
+          const inputType = AUTOMATION_ACTION_TYPES.find(
+            item => item.key === action.action_name
+          ).inputType;
+          if (inputType === 'multi_select') {
+            actionParams = [
+              ...this.getActionDropdownValues(action.action_name),
+            ].filter(item => [...action.action_params].includes(item.id));
+          } else actionParams = [...action.action_params];
+        }
         return {
           ...action,
-          action_params: [
-            ...this.getActionDropdownValues(action.action_name),
-          ].filter(item => [...action.action_params].includes(item.id)),
+          action_params: actionParams,
         };
       });
       this.automation = {
@@ -469,6 +488,13 @@ export default {
         actions: formattedActions,
       };
     },
+    showActionInput(actionName) {
+      const type = AUTOMATION_ACTION_TYPES.find(
+        action => action.key === actionName
+      ).inputType;
+      if (type === null) return false;
+      return true;
+    },
   },
 };
 </script>
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index b0b62eef9..95cd9543e 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -27,7 +27,7 @@ class AutomationRule < ApplicationRecord
 
   scope :active, -> { where(active: true) }
 
-  CONDITIONS_ATTRS = %w[email country_code status message_type browser_language assignee_id team_id referer city company].freeze
+  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referrer city company].freeze
   ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachments].freeze
 
   private

From 7a8aa4ca2e29cda09217f590eb09dcc1edfa44b5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 5 Apr 2022 16:05:49 +0530
Subject: [PATCH 018/177] chore: Add Swagger Doc for Team Members (#4390)

Add swagger documentation for Team Members APIs
---
 .../team_members/create.json.jbuilder         |   8 +-
 swagger/index.yml                             |  12 +-
 swagger/parameters/team_id.yml                |   2 +-
 swagger/paths/application/agents/create.yml   |   2 +-
 swagger/paths/application/agents/delete.yml   |   2 +-
 swagger/paths/application/agents/index.yml    |   2 +-
 swagger/paths/application/agents/update.yml   |   2 +-
 .../application/canned_responses/create.yml   |   2 +-
 .../application/canned_responses/delete.yml   |   2 +-
 .../application/canned_responses/index.yml    |   2 +-
 .../application/contacts/conversations.yml    |   2 +-
 swagger/paths/application/contacts/crud.yml   |   6 +-
 swagger/paths/application/contacts/filter.yml |   2 +-
 .../application/contacts/list_create.yml      |   4 +-
 swagger/paths/application/contacts/search.yml |   2 +-
 .../paths/application/conversation/filter.yml |   2 +-
 .../paths/application/conversation/index.yml  |   4 +-
 .../paths/application/conversation/show.yml   |   2 +-
 .../conversation/toggle_status.yml            |   2 +-
 .../conversation/update_last_seen.yml         |   2 +-
 .../application/custom_filters/create.yml     |   2 +-
 .../application/custom_filters/delete.yml     |   2 +-
 .../application/custom_filters/index.yml      |   2 +-
 .../paths/application/custom_filters/show.yml |   2 +-
 .../application/custom_filters/update.yml     |   2 +-
 swagger/paths/application/inboxes/create.yml  |   2 +-
 .../application/inboxes/get_agent_bot.yml     |   2 +-
 .../inboxes/inbox_members/create.yml          |   2 +-
 .../inboxes/inbox_members/delete.yml          |   2 +-
 .../inboxes/inbox_members/show.yml            |   2 +-
 .../inboxes/inbox_members/update.yml          |   2 +-
 swagger/paths/application/inboxes/index.yml   |   2 +-
 .../application/inboxes/set_agent_bot.yml     |   2 +-
 swagger/paths/application/inboxes/show.yml    |   2 +-
 swagger/paths/application/inboxes/update.yml  |   2 +-
 .../paths/application/team_members/create.yml |  35 ++
 .../paths/application/team_members/delete.yml |  31 ++
 .../paths/application/team_members/index.yml  |  21 ++
 .../paths/application/team_members/update.yml |  35 ++
 swagger/paths/index.yml                       |  16 +-
 swagger/swagger.json                          | 302 +++++++++++++++---
 41 files changed, 440 insertions(+), 94 deletions(-)
 create mode 100644 swagger/paths/application/team_members/create.yml
 create mode 100644 swagger/paths/application/team_members/delete.yml
 create mode 100644 swagger/paths/application/team_members/index.yml
 create mode 100644 swagger/paths/application/team_members/update.yml

diff --git a/app/views/api/v1/accounts/team_members/create.json.jbuilder b/app/views/api/v1/accounts/team_members/create.json.jbuilder
index e4924f6a2..d8c0d209f 100644
--- a/app/views/api/v1/accounts/team_members/create.json.jbuilder
+++ b/app/views/api/v1/accounts/team_members/create.json.jbuilder
@@ -1,7 +1,3 @@
-if @team_member
-  json.partial! 'api/v1/models/agent.json.jbuilder', resource: @team_member
-elsif @team_members.present?
-  json.array! @team_members do |team_member|
-    json.partial! 'api/v1/models/agent.json.jbuilder', resource: team_member
-  end
+json.array! @team_members do |team_member|
+  json.partial! 'api/v1/models/agent.json.jbuilder', resource: team_member
 end
diff --git a/swagger/index.yml b/swagger/index.yml
index 28f20ce5a..181fed1a8 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -53,18 +53,18 @@ x-tagGroups:
   - name: Application
     tags:
       - Account AgentBots
-      - Agent
-      - Canned Response
-      - Contact
-      - Conversation
+      - Agents
+      - Canned Responses
+      - Contacts
+      - Conversations
       - Conversation Assignment
       - Conversation Labels
-      - Inbox
+      - Inboxes
       - Messages
       - Integrations
       - Profile
       - Teams
-      - Custom Filter
+      - Custom Filters
       - Reports
   - name: Client
     tags:
diff --git a/swagger/parameters/team_id.yml b/swagger/parameters/team_id.yml
index 805c32c2d..c18532b75 100644
--- a/swagger/parameters/team_id.yml
+++ b/swagger/parameters/team_id.yml
@@ -1,5 +1,5 @@
 in: path
-name: id
+name: team_id
 type: integer
 required: true
 description: The ID of the team to be updated
diff --git a/swagger/paths/application/agents/create.yml b/swagger/paths/application/agents/create.yml
index b206eb306..dd191d81f 100644
--- a/swagger/paths/application/agents/create.yml
+++ b/swagger/paths/application/agents/create.yml
@@ -1,5 +1,5 @@
 tags:
-  - Agent
+  - Agents
 operationId: add-new-agent-to-account
 summary: Add a New Agent
 description: Add a new Agent to Account
diff --git a/swagger/paths/application/agents/delete.yml b/swagger/paths/application/agents/delete.yml
index 1872fd8ea..118ddf234 100644
--- a/swagger/paths/application/agents/delete.yml
+++ b/swagger/paths/application/agents/delete.yml
@@ -1,5 +1,5 @@
 tags:
-  - Agent
+  - Agents
 operationId: delete-agent-from-account
 summary: Remove an Agent from Account
 description: Remove an Agent from Account
diff --git a/swagger/paths/application/agents/index.yml b/swagger/paths/application/agents/index.yml
index 026893a4b..7961ad3b0 100644
--- a/swagger/paths/application/agents/index.yml
+++ b/swagger/paths/application/agents/index.yml
@@ -1,5 +1,5 @@
 tags:
-  - Agent
+  - Agents
 operationId: get-account-agents
 summary: List Agents in Account
 description: Get Details of Agents in an Account
diff --git a/swagger/paths/application/agents/update.yml b/swagger/paths/application/agents/update.yml
index 693bef5b2..a72f5ed4e 100644
--- a/swagger/paths/application/agents/update.yml
+++ b/swagger/paths/application/agents/update.yml
@@ -1,5 +1,5 @@
 tags:
-  - Agent
+  - Agents
 operationId: update-agent-in-account
 summary: Update Agent in Account
 description: Update an Agent in Account
diff --git a/swagger/paths/application/canned_responses/create.yml b/swagger/paths/application/canned_responses/create.yml
index 69b3673bc..95eacafb1 100644
--- a/swagger/paths/application/canned_responses/create.yml
+++ b/swagger/paths/application/canned_responses/create.yml
@@ -1,5 +1,5 @@
 tags:
-  - Canned Response
+  - Canned Responses
 operationId: add-new-canned-response-to-account
 summary: Add a New Canned Response
 description: Add a new Canned Response to Account
diff --git a/swagger/paths/application/canned_responses/delete.yml b/swagger/paths/application/canned_responses/delete.yml
index 4b82e5068..2b1d08238 100644
--- a/swagger/paths/application/canned_responses/delete.yml
+++ b/swagger/paths/application/canned_responses/delete.yml
@@ -1,5 +1,5 @@
 tags:
-  - Canned Response
+  - Canned Responses
 operationId: delete-canned-response-from-account
 summary: Remove a Canned Response from Account
 description: Remove a Canned Response from Account
diff --git a/swagger/paths/application/canned_responses/index.yml b/swagger/paths/application/canned_responses/index.yml
index 4e4a24c5d..3094a23a6 100644
--- a/swagger/paths/application/canned_responses/index.yml
+++ b/swagger/paths/application/canned_responses/index.yml
@@ -1,5 +1,5 @@
 tags:
-  - Canned Response
+  - Canned Responses
 operationId: get-account-canned-response
 summary: List all Canned Responses in an Account
 description: Get Details of Canned Responses in an Account
diff --git a/swagger/paths/application/contacts/conversations.yml b/swagger/paths/application/contacts/conversations.yml
index 7d4b507b9..d08235f5e 100644
--- a/swagger/paths/application/contacts/conversations.yml
+++ b/swagger/paths/application/contacts/conversations.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Contact
+    - Contacts
   operationId: contactConversations
   summary: Contact Conversations
   description: Get conversations associated to that contact
diff --git a/swagger/paths/application/contacts/crud.yml b/swagger/paths/application/contacts/crud.yml
index af9fecff7..3c982dfe9 100644
--- a/swagger/paths/application/contacts/crud.yml
+++ b/swagger/paths/application/contacts/crud.yml
@@ -8,7 +8,7 @@ parameters:
 
 get:
   tags:
-    - Contact
+    - Contacts
   operationId: contactDetails
   summary: Show Contact
   description: Get a contact belonging to the account using ID
@@ -24,7 +24,7 @@ get:
 
 put:
   tags:
-    - Contact
+    - Contacts
   operationId: contactUpdate
   summary: Update Contact
   description: Update a contact belonging to the account using ID
@@ -46,7 +46,7 @@ put:
 
 delete:
   tags:
-    - Contact
+    - Contacts
   operationId: contactDelete
   summary: Delete Contact
   responses:
diff --git a/swagger/paths/application/contacts/filter.yml b/swagger/paths/application/contacts/filter.yml
index 27adfbb9f..39aa269d9 100644
--- a/swagger/paths/application/contacts/filter.yml
+++ b/swagger/paths/application/contacts/filter.yml
@@ -1,5 +1,5 @@
 tags:
-  - Contact
+  - Contacts
 operationId: contactFilter
 description: Filter contacts with custom filter options and pagination
 summary: Contact Filter
diff --git a/swagger/paths/application/contacts/list_create.yml b/swagger/paths/application/contacts/list_create.yml
index a80311d32..4329ed3b7 100644
--- a/swagger/paths/application/contacts/list_create.yml
+++ b/swagger/paths/application/contacts/list_create.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Contact
+    - Contacts
   operationId: contactList
   description: Listing all the resolved contacts with pagination (Page size = 15) . Resolved contacts are the ones with a value for identifier, email or phone number
   summary: List Contacts
@@ -20,7 +20,7 @@ get:
 
 post:
   tags:
-    - Contact
+    - Contacts
   operationId: contactCreate
   description: Create a new Contact
   summary: Create Contact
diff --git a/swagger/paths/application/contacts/search.yml b/swagger/paths/application/contacts/search.yml
index e413863bd..63cc11903 100644
--- a/swagger/paths/application/contacts/search.yml
+++ b/swagger/paths/application/contacts/search.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Contact
+    - Contacts
   operationId: contactSearch
   description: Search the resolved contacts using a search key, currently supports email search (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number
   summary: Search Contacts
diff --git a/swagger/paths/application/conversation/filter.yml b/swagger/paths/application/conversation/filter.yml
index 8f7e642c7..3ef141145 100644
--- a/swagger/paths/application/conversation/filter.yml
+++ b/swagger/paths/application/conversation/filter.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversation
+  - Conversations
 operationId: conversationFilter
 description: Filter conversations with custom filter options and pagination
 summary: Conversations Filter
diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index d5f8f9c0c..8041a7af6 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -3,7 +3,7 @@ parameters:
 
 get:
   tags:
-    - Conversation
+    - Conversations
   operationId: conversationList
   description: List all the conversations with pagination
   summary: Conversations List
@@ -43,7 +43,7 @@ get:
 
 post:
   tags:
-    - Conversation
+    - Conversations
   operationId: newConversation
   summary: Create New Conversation
   description: "Creating a conversation in chatwoot requires a source id. \n\n Learn more about source_id: https://github.com/chatwoot/chatwoot/wiki/Building-on-Top-of-Chatwoot:-Importing-Existing-Contacts-and-Creating-Conversations"
diff --git a/swagger/paths/application/conversation/show.yml b/swagger/paths/application/conversation/show.yml
index 81782702c..56c3a292b 100644
--- a/swagger/paths/application/conversation/show.yml
+++ b/swagger/paths/application/conversation/show.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversation
+  - Conversations
 operationId: get-details-of-a-conversation
 summary: Conversation Details
 description: Get all details regarding a conversation with all messages in the conversation
diff --git a/swagger/paths/application/conversation/toggle_status.yml b/swagger/paths/application/conversation/toggle_status.yml
index 14172e27c..20b18d6aa 100644
--- a/swagger/paths/application/conversation/toggle_status.yml
+++ b/swagger/paths/application/conversation/toggle_status.yml
@@ -1,5 +1,5 @@
 tags:
-  - Conversation
+  - Conversations
 operationId: toggle-status-of-a-conversation
 summary: Toggle Status
 description: Toggles the status of the conversation between open and resolved
diff --git a/swagger/paths/application/conversation/update_last_seen.yml b/swagger/paths/application/conversation/update_last_seen.yml
index 2f26df879..0f542dd7f 100644
--- a/swagger/paths/application/conversation/update_last_seen.yml
+++ b/swagger/paths/application/conversation/update_last_seen.yml
@@ -1,6 +1,6 @@
 post:
   tags:
-    - Conversation
+    - Conversations
   operationId: conversationUpdateLastSeen
   summary: Update Last Seen
   description: Updates the last seen of the conversation so that conversations will have the bubbles in the agents screen
diff --git a/swagger/paths/application/custom_filters/create.yml b/swagger/paths/application/custom_filters/create.yml
index 6fbc4c7f8..9d9534976 100644
--- a/swagger/paths/application/custom_filters/create.yml
+++ b/swagger/paths/application/custom_filters/create.yml
@@ -1,5 +1,5 @@
 tags:
-  - Custom Filter
+  - Custom Filters
 operationId: create-a-custom-filter
 summary: Create a custom filter
 description: Create a custom filter in the account
diff --git a/swagger/paths/application/custom_filters/delete.yml b/swagger/paths/application/custom_filters/delete.yml
index 3ae042e9b..e66748858 100644
--- a/swagger/paths/application/custom_filters/delete.yml
+++ b/swagger/paths/application/custom_filters/delete.yml
@@ -1,5 +1,5 @@
 tags:
-  - Custom Filter
+  - Custom Filters
 operationId: delete-a-custom-filter
 summary: Delete a custom filter
 description: Delete a custom filter from the account
diff --git a/swagger/paths/application/custom_filters/index.yml b/swagger/paths/application/custom_filters/index.yml
index b66e7b6f8..b77949dc3 100644
--- a/swagger/paths/application/custom_filters/index.yml
+++ b/swagger/paths/application/custom_filters/index.yml
@@ -1,5 +1,5 @@
 tags:
-  - Custom Filter
+  - Custom Filters
 operationId: list-all-filters
 summary: List all custom filters
 description: List all custom filters in a category of a user
diff --git a/swagger/paths/application/custom_filters/show.yml b/swagger/paths/application/custom_filters/show.yml
index e2e2bf529..14de07d85 100644
--- a/swagger/paths/application/custom_filters/show.yml
+++ b/swagger/paths/application/custom_filters/show.yml
@@ -1,5 +1,5 @@
 tags:
-  - Custom Filter
+  - Custom Filters
 operationId: get-details-of-a-single-custom-filter
 summary: Get a custom filter details
 description: Get the details of a custom filter in the account
diff --git a/swagger/paths/application/custom_filters/update.yml b/swagger/paths/application/custom_filters/update.yml
index 23ff97781..a058b81f8 100644
--- a/swagger/paths/application/custom_filters/update.yml
+++ b/swagger/paths/application/custom_filters/update.yml
@@ -1,5 +1,5 @@
 tags:
-  - Custom Filter
+  - Custom Filters
 operationId: update-a-custom-filter
 summary: Update a custom filter
 description: Update a custom filter's attributes
diff --git a/swagger/paths/application/inboxes/create.yml b/swagger/paths/application/inboxes/create.yml
index 2a63775e7..3d649e820 100644
--- a/swagger/paths/application/inboxes/create.yml
+++ b/swagger/paths/application/inboxes/create.yml
@@ -1,6 +1,6 @@
 post:
   tags:
-    - Inbox
+    - Inboxes
   operationId: inboxCreation
   summary: Create an inbox
   description: You can create more than one website inbox in each account
diff --git a/swagger/paths/application/inboxes/get_agent_bot.yml b/swagger/paths/application/inboxes/get_agent_bot.yml
index b77e7e06a..178151dd3 100644
--- a/swagger/paths/application/inboxes/get_agent_bot.yml
+++ b/swagger/paths/application/inboxes/get_agent_bot.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Inbox
+    - Inboxes
   operationId: getInboxAgentBot
   summary: Show Inbox Agent Bot
   description: See if an agent bot is associated to the Inbox
diff --git a/swagger/paths/application/inboxes/inbox_members/create.yml b/swagger/paths/application/inboxes/inbox_members/create.yml
index 2cbbb4598..9ca5641e6 100644
--- a/swagger/paths/application/inboxes/inbox_members/create.yml
+++ b/swagger/paths/application/inboxes/inbox_members/create.yml
@@ -1,5 +1,5 @@
 tags:
-  - Inbox
+  - Inboxes
 operationId: add-new-agent-to-inbox
 summary: Add a New Agent
 description: Add a new Agent to Inbox
diff --git a/swagger/paths/application/inboxes/inbox_members/delete.yml b/swagger/paths/application/inboxes/inbox_members/delete.yml
index 3167b28c6..78f1435b5 100644
--- a/swagger/paths/application/inboxes/inbox_members/delete.yml
+++ b/swagger/paths/application/inboxes/inbox_members/delete.yml
@@ -1,5 +1,5 @@
 tags:
-  - Inbox
+  - Inboxes
 operationId: delete-agent-in-inbox
 summary: Remove an Agent from Inbox
 description: Remove an Agent from Inbox
diff --git a/swagger/paths/application/inboxes/inbox_members/show.yml b/swagger/paths/application/inboxes/inbox_members/show.yml
index af358f78f..57793f520 100644
--- a/swagger/paths/application/inboxes/inbox_members/show.yml
+++ b/swagger/paths/application/inboxes/inbox_members/show.yml
@@ -1,5 +1,5 @@
 tags:
-  - Inbox
+  - Inboxes
 operationId: get-inbox-members
 summary: List Agents in Inbox
 description: Get Details of Agents in an Inbox
diff --git a/swagger/paths/application/inboxes/inbox_members/update.yml b/swagger/paths/application/inboxes/inbox_members/update.yml
index 3a06cef27..483b8f6ab 100644
--- a/swagger/paths/application/inboxes/inbox_members/update.yml
+++ b/swagger/paths/application/inboxes/inbox_members/update.yml
@@ -1,5 +1,5 @@
 tags:
-  - Inbox
+  - Inboxes
 operationId: update-agents-in-inbox
 summary: Update Agents in Inbox
 description: All agents except the one passed in params will be removed
diff --git a/swagger/paths/application/inboxes/index.yml b/swagger/paths/application/inboxes/index.yml
index 714ff87e7..233488228 100644
--- a/swagger/paths/application/inboxes/index.yml
+++ b/swagger/paths/application/inboxes/index.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Inbox
+    - Inboxes
   operationId: listAllInboxes
   summary: List all inboxes
   description: List all inboxes available in the current account
diff --git a/swagger/paths/application/inboxes/set_agent_bot.yml b/swagger/paths/application/inboxes/set_agent_bot.yml
index b37b06915..56a37d165 100644
--- a/swagger/paths/application/inboxes/set_agent_bot.yml
+++ b/swagger/paths/application/inboxes/set_agent_bot.yml
@@ -1,6 +1,6 @@
 post:
   tags:
-    - Inbox
+    - Inboxes
   operationId: updateAgentBot
   summary: Add or remove agent bot
   description: To add an agent bot pass agent_bot id, to remove agent bot from an inbox pass null
diff --git a/swagger/paths/application/inboxes/show.yml b/swagger/paths/application/inboxes/show.yml
index a0d44c1d2..6bb2e84a5 100644
--- a/swagger/paths/application/inboxes/show.yml
+++ b/swagger/paths/application/inboxes/show.yml
@@ -1,6 +1,6 @@
 get:
   tags:
-    - Inbox
+    - Inboxes
   operationId: GetInbox
   summary: Get an inbox
   description: Get an inbox available in the current account
diff --git a/swagger/paths/application/inboxes/update.yml b/swagger/paths/application/inboxes/update.yml
index d44822114..c5b3aaebf 100644
--- a/swagger/paths/application/inboxes/update.yml
+++ b/swagger/paths/application/inboxes/update.yml
@@ -1,6 +1,6 @@
 patch:
   tags:
-    - Inbox
+    - Inboxes
   operationId: updateInbox
   summary: Update Inbox
   description: Add avatar and disable auto assignment for an inbox
diff --git a/swagger/paths/application/team_members/create.yml b/swagger/paths/application/team_members/create.yml
new file mode 100644
index 000000000..724769319
--- /dev/null
+++ b/swagger/paths/application/team_members/create.yml
@@ -0,0 +1,35 @@
+tags:
+  - Teams
+operationId: add-new-agent-to-team
+summary: Add a New Agent
+description: Add a new Agent to Team
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      required:
+          - user_ids
+      properties:
+        user_ids:
+          type: array
+          items:
+            type: integer
+          description: IDs of users to be added to the team
+responses:
+  200:
+    description: Success
+    schema:
+        type: array
+        description: 'Array of all active agents'
+        items:
+          $ref: '#/definitions/agent'
+  404:
+    description: Team not found
+  403:
+    description: Access denied
+  422:
+    description: User must exist
diff --git a/swagger/paths/application/team_members/delete.yml b/swagger/paths/application/team_members/delete.yml
new file mode 100644
index 000000000..ac7dbb451
--- /dev/null
+++ b/swagger/paths/application/team_members/delete.yml
@@ -0,0 +1,31 @@
+tags:
+  - Teams
+operationId: delete-agent-in-team
+summary: Remove an Agent from Team
+description: Remove an Agent from Team
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      required:
+        - team_id
+        - user_ids
+      properties:
+        user_ids:
+          type: array
+          items:
+            type: integer
+          description: IDs of users to be deleted from the team
+responses:
+  200:
+    description: Success
+  404:
+    description: Team not found
+  403:
+    description: Access denied
+  422:
+    description: User must exist
diff --git a/swagger/paths/application/team_members/index.yml b/swagger/paths/application/team_members/index.yml
new file mode 100644
index 000000000..dc28f2e99
--- /dev/null
+++ b/swagger/paths/application/team_members/index.yml
@@ -0,0 +1,21 @@
+tags:
+  - Teams
+operationId: get-team-members
+summary: List Agents in Team
+description: Get Details of Agents in an Team
+security:
+  - userApiKey: []
+parameters:
+  - $ref: '#/parameters/team_id'
+responses:
+  200:
+    description: Success
+    schema:
+        type: array
+        description: 'Array of all agents in the team'
+        items:
+          $ref: '#/definitions/agent'
+  404:
+    description: Inbox not found
+  403:
+    description: Access denied
diff --git a/swagger/paths/application/team_members/update.yml b/swagger/paths/application/team_members/update.yml
new file mode 100644
index 000000000..81034b9c7
--- /dev/null
+++ b/swagger/paths/application/team_members/update.yml
@@ -0,0 +1,35 @@
+tags:
+  - Teams
+operationId: update-agents-in-team
+summary: Update Agents in Team
+description: All agents except the one passed in params will be removed
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      type: object
+      required:
+        - user_ids
+      properties:
+        user_ids:
+          type: array
+          items:
+            type: integer
+          description: IDs of users to be added to the team
+responses:
+  200:
+    description: Success
+    schema:
+        type: array
+        description: 'Array of all agents in the team'
+        items:
+          $ref: '#/definitions/agent'
+  404:
+    description: Team not found
+  403:
+    description: Access denied
+  422:
+    description: User must exist
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 279ebb7bc..dc00c9b24 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -154,7 +154,7 @@
   delete:
     $ref: ./application/agents/delete.yml
 
-# Agents
+# Canned Responses
 /api/v1/accounts/{account_id}/canned_responses:
   parameters:
     - $ref: '#/parameters/account_id'
@@ -315,7 +315,7 @@
     $ref: ./application/teams/index.yml
   post:
     $ref: ./application/teams/create.yml
-/api/v1/accounts/{account_id}/teams/{id}:
+/api/v1/accounts/{account_id}/teams/{team_id}:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/team_id'
@@ -325,6 +325,18 @@
     $ref: ./application/teams/update.yml
   delete:
     $ref: ./application/teams/delete.yml
+/accounts/{account-id}/teams/{team_id}/team_members:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/team_id'
+  get:
+    $ref: ./application/team_members/index.yml
+  post:
+    $ref: ./application/team_members/create.yml
+  patch:
+    $ref: ./application/team_members/update.yml
+  delete:
+    $ref: ./application/team_members/delete.yml
 
 ### Custom Filters goes here
 
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 4de4db49d..6e188ad5e 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1118,7 +1118,7 @@
       ],
       "get": {
         "tags": [
-          "Agent"
+          "Agents"
         ],
         "operationId": "get-account-agents",
         "summary": "List Agents in Account",
@@ -1148,7 +1148,7 @@
       },
       "post": {
         "tags": [
-          "Agent"
+          "Agents"
         ],
         "operationId": "add-new-agent-to-account",
         "summary": "Add a New Agent",
@@ -1227,7 +1227,7 @@
       ],
       "patch": {
         "tags": [
-          "Agent"
+          "Agents"
         ],
         "operationId": "update-agent-in-account",
         "summary": "Update Agent in Account",
@@ -1299,7 +1299,7 @@
       },
       "delete": {
         "tags": [
-          "Agent"
+          "Agents"
         ],
         "operationId": "delete-agent-from-account",
         "summary": "Remove an Agent from Account",
@@ -1341,7 +1341,7 @@
       ],
       "get": {
         "tags": [
-          "Canned Response"
+          "Canned Responses"
         ],
         "operationId": "get-account-canned-response",
         "summary": "List all Canned Responses in an Account",
@@ -1371,7 +1371,7 @@
       },
       "post": {
         "tags": [
-          "Canned Response"
+          "Canned Responses"
         ],
         "operationId": "add-new-canned-response-to-account",
         "summary": "Add a New Canned Response",
@@ -1460,7 +1460,7 @@
       },
       "delete": {
         "tags": [
-          "Canned Response"
+          "Canned Responses"
         ],
         "operationId": "delete-canned-response-from-account",
         "summary": "Remove a Canned Response from Account",
@@ -1497,7 +1497,7 @@
     "/api/v1/accounts/{account_id}/contacts": {
       "get": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactList",
         "description": "Listing all the resolved contacts with pagination (Page size = 15) . Resolved contacts are the ones with a value for identifier, email or phone number",
@@ -1530,7 +1530,7 @@
       },
       "post": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactCreate",
         "description": "Create a new Contact",
@@ -1579,7 +1579,7 @@
       ],
       "get": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactDetails",
         "summary": "Show Contact",
@@ -1601,7 +1601,7 @@
       },
       "put": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactUpdate",
         "summary": "Update Contact",
@@ -1633,7 +1633,7 @@
       },
       "delete": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactDelete",
         "summary": "Delete Contact",
@@ -1653,7 +1653,7 @@
     "/api/v1/accounts/{account_id}/contacts/{id}/conversations": {
       "get": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactConversations",
         "summary": "Contact Conversations",
@@ -1689,7 +1689,7 @@
     "/api/v1/accounts/{account_id}/contacts/search": {
       "get": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactSearch",
         "description": "Search the resolved contacts using a search key, currently supports email search (Page size = 15). Resolved contacts are the ones with a value for identifier, email or phone number",
@@ -1740,7 +1740,7 @@
       ],
       "post": {
         "tags": [
-          "Contact"
+          "Contacts"
         ],
         "operationId": "contactFilter",
         "description": "Filter contacts with custom filter options and pagination",
@@ -1947,7 +1947,7 @@
       ],
       "get": {
         "tags": [
-          "Conversation"
+          "Conversations"
         ],
         "operationId": "conversationList",
         "description": "List all the conversations with pagination",
@@ -2013,7 +2013,7 @@
       },
       "post": {
         "tags": [
-          "Conversation"
+          "Conversations"
         ],
         "operationId": "newConversation",
         "summary": "Create New Conversation",
@@ -2110,7 +2110,7 @@
       ],
       "post": {
         "tags": [
-          "Conversation"
+          "Conversations"
         ],
         "operationId": "conversationFilter",
         "description": "Filter conversations with custom filter options and pagination",
@@ -2221,7 +2221,7 @@
       ],
       "get": {
         "tags": [
-          "Conversation"
+          "Conversations"
         ],
         "operationId": "get-details-of-a-conversation",
         "summary": "Conversation Details",
@@ -2253,7 +2253,7 @@
       ],
       "post": {
         "tags": [
-          "Conversation"
+          "Conversations"
         ],
         "operationId": "toggle-status-of-a-conversation",
         "summary": "Toggle Status",
@@ -2438,7 +2438,7 @@
     "/api/v1/accounts/{account_id}/inboxes": {
       "get": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "listAllInboxes",
         "summary": "List all inboxes",
@@ -2471,7 +2471,7 @@
     "/api/v1/accounts/{account_id}/inboxes/{id}/": {
       "get": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "GetInbox",
         "summary": "Get an inbox",
@@ -2507,7 +2507,7 @@
     "/api/v1/accounts/{account_id}/inboxes/": {
       "post": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "inboxCreation",
         "summary": "Create an inbox",
@@ -2586,7 +2586,7 @@
     "/api/v1/accounts/{account_id}/inboxes/{id}": {
       "patch": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "updateInbox",
         "summary": "Update Inbox",
@@ -2673,7 +2673,7 @@
     "/api/v1/accounts/{account_id}/inboxes/{id}/agent_bot": {
       "get": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "getInboxAgentBot",
         "summary": "Show Inbox Agent Bot",
@@ -2709,7 +2709,7 @@
     "/api/v1/accounts/{account_id}/inboxes/{id}/set_agent_bot": {
       "post": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "updateAgentBot",
         "summary": "Add or remove agent bot",
@@ -2767,7 +2767,7 @@
       ],
       "get": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "get-inbox-members",
         "summary": "List Agents in Inbox",
@@ -2805,7 +2805,7 @@
       },
       "patch": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "update-agents-in-inbox",
         "summary": "Update Agents in Inbox",
@@ -2868,7 +2868,7 @@
       },
       "delete": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "delete-agent-in-inbox",
         "summary": "Remove an Agent from Inbox",
@@ -2931,7 +2931,7 @@
       ],
       "post": {
         "tags": [
-          "Inbox"
+          "Inboxes"
         ],
         "operationId": "add-new-agent-to-inbox",
         "summary": "Add a New Agent",
@@ -3333,7 +3333,7 @@
         }
       }
     },
-    "/api/v1/accounts/{account_id}/teams/{id}": {
+    "/api/v1/accounts/{account_id}/teams/{team_id}": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -3413,6 +3413,222 @@
         }
       }
     },
+    "/accounts/{account-id}/teams/{team_id}/team_members": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/team_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "get-team-members",
+        "summary": "List Agents in Team",
+        "description": "Get Details of Agents in an Team",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "$ref": "#/parameters/team_id"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all agents in the team",
+              "items": {
+                "$ref": "#/definitions/agent"
+              }
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "add-new-agent-to-team",
+        "summary": "Add a New Agent",
+        "description": "Add a new Agent to Team",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "user_ids"
+              ],
+              "properties": {
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be added to the team"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all active agents",
+              "items": {
+                "$ref": "#/definitions/agent"
+              }
+            }
+          },
+          "404": {
+            "description": "Team not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "update-agents-in-team",
+        "summary": "Update Agents in Team",
+        "description": "All agents except the one passed in params will be removed",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "user_ids"
+              ],
+              "properties": {
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be added to the team"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all agents in the team",
+              "items": {
+                "$ref": "#/definitions/agent"
+              }
+            }
+          },
+          "404": {
+            "description": "Team not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Teams"
+        ],
+        "operationId": "delete-agent-in-team",
+        "summary": "Remove an Agent from Team",
+        "description": "Remove an Agent from Team",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "team_id",
+                "user_ids"
+              ],
+              "properties": {
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be deleted from the team"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Team not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/custom_filters": {
       "parameters": [
         {
@@ -3433,7 +3649,7 @@
       ],
       "get": {
         "tags": [
-          "Custom Filter"
+          "Custom Filters"
         ],
         "operationId": "list-all-filters",
         "summary": "List all custom filters",
@@ -3456,7 +3672,7 @@
       },
       "post": {
         "tags": [
-          "Custom Filter"
+          "Custom Filters"
         ],
         "operationId": "create-a-custom-filter",
         "summary": "Create a custom filter",
@@ -3498,7 +3714,7 @@
       ],
       "get": {
         "tags": [
-          "Custom Filter"
+          "Custom Filters"
         ],
         "operationId": "get-details-of-a-single-custom-filter",
         "summary": "Get a custom filter details",
@@ -3520,7 +3736,7 @@
       },
       "patch": {
         "tags": [
-          "Custom Filter"
+          "Custom Filters"
         ],
         "operationId": "update-a-custom-filter",
         "summary": "Update a custom filter",
@@ -3549,7 +3765,7 @@
       },
       "delete": {
         "tags": [
-          "Custom Filter"
+          "Custom Filters"
         ],
         "operationId": "delete-a-custom-filter",
         "summary": "Delete a custom filter",
@@ -5084,7 +5300,7 @@
     },
     "team_id": {
       "in": "path",
-      "name": "id",
+      "name": "team_id",
       "type": "integer",
       "required": true,
       "description": "The ID of the team to be updated"
@@ -5221,18 +5437,18 @@
       "name": "Application",
       "tags": [
         "Account AgentBots",
-        "Agent",
-        "Canned Response",
-        "Contact",
-        "Conversation",
+        "Agents",
+        "Canned Responses",
+        "Contacts",
+        "Conversations",
         "Conversation Assignment",
         "Conversation Labels",
-        "Inbox",
+        "Inboxes",
         "Messages",
         "Integrations",
         "Profile",
         "Teams",
-        "Custom Filter",
+        "Custom Filters",
         "Reports"
       ]
     },

From 821b953ee9b02d68ab2152fb05ac7a437b0708e4 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 6 Apr 2022 12:36:32 +0530
Subject: [PATCH 019/177] Fix: handling UTF encoded mail (#4384)

---
 app/presenters/mail_presenter.rb             |  2 +-
 spec/fixtures/files/non_utf_encoded_mail.eml | 15 +++++++++++++++
 spec/presenters/mail_presenter_spec.rb       |  9 +++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 spec/fixtures/files/non_utf_encoded_mail.eml

diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index f2d9ac92c..ff355c9f3 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -33,7 +33,7 @@ class MailPresenter < SimpleDelegator
   # encodes mail raw body if mail.content_type is plain/text
   # encodes mail raw body if mail.content_type is html/text
   def text_html_mail(mail_part)
-    decoded = mail_part&.decoded || @mail.body&.decoded
+    decoded = mail_part&.decoded || @mail.decoded
     encoded = encode_to_unicode(decoded)
 
     encoded if html_mail_body? || text_mail_body?
diff --git a/spec/fixtures/files/non_utf_encoded_mail.eml b/spec/fixtures/files/non_utf_encoded_mail.eml
new file mode 100644
index 000000000..78e6e55b1
--- /dev/null
+++ b/spec/fixtures/files/non_utf_encoded_mail.eml
@@ -0,0 +1,15 @@
+In-Reply-To: <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>, <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>
+To: "Replies" <reply+6bdc3f4d-0bec-4515-a284-5d916fdde489@example.com>
+From: "=?UTF-8?B?2YXYqtis2LEg2LPZiNmCINmG2Ko=?=" <example@gmail.com>
+Date: Sun, 3 Apr 2022 11:48:20 -0700
+Message-ID: <CAEjnyt3uiyywAF3SrJzEedMRV5H5XG4aYvFrGdFwxtuGoRCc0w@mail.gmail.com>
+Subject: =?UTF-8?Q?=D8=A3=D9=87=D9=84=D9=8A=D9=86_=D8=B9?= =?UTF-8?Q?=D9=85=D9=8A=D9=84=D9=86=D8=A7_=D8=A7=D9=84?= =?UTF-8?Q?=D9=83=D8=B1=D9=8A=D9=85_?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+Content-Disposition: inline
+Precedence: bulk
+X-Autoreply: yes
+Auto-Submitted: auto-replied
+
+2KPZhti42LHZiNin2Iwg2KPZhtinINij2K3Yqtin2KzZh9inINmB2YLYtyDZhNiq2YLZiNmFINio2KfZhNiq2K/ZgtmK2YIg2YHZiiDZhdmC2KfZhNiq2Yog2KfZhNi02K7YtdmK2KkK
diff --git a/spec/presenters/mail_presenter_spec.rb b/spec/presenters/mail_presenter_spec.rb
index c1049e944..a39559cc4 100644
--- a/spec/presenters/mail_presenter_spec.rb
+++ b/spec/presenters/mail_presenter_spec.rb
@@ -5,6 +5,7 @@ RSpec.describe MailPresenter do
   describe 'parsed mail decorator' do
     let(:mail) { create_inbound_email_from_fixture('welcome.eml').mail }
     let(:html_mail) { create_inbound_email_from_fixture('welcome_html.eml').mail }
+    let(:ascii_mail) { create_inbound_email_from_fixture('non_utf_encoded_mail.eml').mail }
     let(:decorated_mail) { described_class.new(mail) }
 
     let(:mail_with_no_subject) { create_inbound_email_from_fixture('mail_with_no_subject.eml').mail }
@@ -65,5 +66,13 @@ RSpec.describe MailPresenter do
         "I'm learning English as a first language for the past 13 years, but to "
       )
     end
+
+    it 'encodes email to UTF-8' do
+      decorated_html_mail = described_class.new(ascii_mail)
+      expect(decorated_html_mail.subject).to eq('أهلين عميلنا الكريم ')
+      expect(decorated_html_mail.text_content[:reply][0..70]).to eq(
+        'أنظروا، أنا أحتاجها فقط لتقوم بالتدقيق في مقالتي الشخصية'
+      )
+    end
   end
 end

From 0b03e4b296c8c522ea346fb4d93f215a808a9aa3 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 6 Apr 2022 13:54:55 +0530
Subject: [PATCH 020/177] feat: Add an option to disable endConversation button
 (#4352)

---
 .../api/v1/widget/conversations_controller.rb |  5 ++-
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  3 +-
 .../dashboard/settings/inbox/Settings.vue     | 11 ++++++
 .../widget/components/HeaderActions.vue       |  7 ++--
 app/javascript/widget/mixins/configMixin.js   |  3 ++
 .../widget/mixins/specs/configMixin.spec.js   |  5 +--
 app/models/channel/web_widget.rb              |  3 +-
 ...5092033_update_web_widget_feature_flags.rb | 16 +++++++++
 db/schema.rb                                  |  4 +--
 .../widget/conversations_controller_spec.rb   | 34 +++++++++++++++++++
 10 files changed, 81 insertions(+), 10 deletions(-)
 create mode 100644 db/migrate/20220405092033_update_web_widget_feature_flags.rb

diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index cc1b16b75..3b0a460e4 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -45,7 +45,10 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   end
 
   def toggle_status
-    head :not_found && return if conversation.nil?
+    return head :not_found if conversation.nil?
+
+    return head :forbidden unless @web_widget.end_conversation?
+
     unless conversation.resolved?
       conversation.status = :resolved
       conversation.save
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 538d6d5f0..83a28de43 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -395,7 +395,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 31f435a82..5b29091f7 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -285,6 +285,17 @@
             {{ $t('INBOX_MGMT.FEATURES.DISPLAY_EMOJI_PICKER') }}
           </label>
         </div>
+        <div v-if="isAWebWidgetInbox" class="settings-item settings-item">
+          <input
+            v-model="selectedFeatureFlags"
+            type="checkbox"
+            value="end_conversation"
+            @input="handleFeatureFlag"
+          />
+          <label for="end_conversation">
+            {{ $t('INBOX_MGMT.FEATURES.ALLOW_END_CONVERSATION') }}
+          </label>
+        </div>
 
         <woot-submit-button
           v-if="isAPIInbox"
diff --git a/app/javascript/widget/components/HeaderActions.vue b/app/javascript/widget/components/HeaderActions.vue
index 16f10ed12..433c7b6f0 100644
--- a/app/javascript/widget/components/HeaderActions.vue
+++ b/app/javascript/widget/components/HeaderActions.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="showHeaderActions" class="actions flex items-center">
     <button
-      v-if="conversationStatus === 'open'"
+      v-if="conversationStatus === 'open' && hasEndConversationEnabled"
       class="button transparent compact"
       :title="$t('END_CONVERSATION')"
       @click="resolveConversation"
@@ -43,12 +43,13 @@ import { mapGetters } from 'vuex';
 import { IFrameHelper, RNHelper } from 'widget/helpers/utils';
 import { popoutChatWindow } from '../helpers/popoutHelper';
 import FluentIcon from 'shared/components/FluentIcon/Index.vue';
-import darkModeMixin from 'widget/mixins/darkModeMixin.js';
+import darkModeMixin from 'widget/mixins/darkModeMixin';
+import configMixin from 'widget/mixins/configMixin';
 
 export default {
   name: 'HeaderActions',
   components: { FluentIcon },
-  mixins: [darkModeMixin],
+  mixins: [configMixin, darkModeMixin],
   props: {
     showPopoutButton: {
       type: Boolean,
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index c91730767..9cb09f062 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -18,6 +18,9 @@ export default {
     hasAttachmentsEnabled() {
       return this.channelConfig.enabledFeatures.includes('attachments');
     },
+    hasEndConversationEnabled() {
+      return this.channelConfig.enabledFeatures.includes('end_conversation');
+    },
     preChatFormEnabled() {
       return window.chatwootWebChannel.preChatFormEnabled;
     },
diff --git a/app/javascript/widget/mixins/specs/configMixin.spec.js b/app/javascript/widget/mixins/specs/configMixin.spec.js
index c87d9fd71..975001249 100644
--- a/app/javascript/widget/mixins/specs/configMixin.spec.js
+++ b/app/javascript/widget/mixins/specs/configMixin.spec.js
@@ -5,7 +5,7 @@ import Vue from 'vue';
 global.chatwootWebChannel = {
   avatarUrl: 'https://test.url',
   hasAConnectedAgentBot: 'AgentBot',
-  enabledFeatures: ['emoji_picker', 'attachments'],
+  enabledFeatures: ['emoji_picker', 'attachments', 'end_conversation'],
   preChatFormOptions: { require_email: false, pre_chat_message: '' },
 };
 
@@ -24,6 +24,7 @@ describe('configMixin', () => {
     const vm = new Constructor().$mount();
     const wrapper = createWrapper(vm);
     expect(wrapper.vm.hasEmojiPickerEnabled).toBe(true);
+    expect(wrapper.vm.hasEndConversationEnabled).toBe(true);
     expect(wrapper.vm.hasAttachmentsEnabled).toBe(true);
     expect(wrapper.vm.hasAConnectedAgentBot).toBe(true);
     expect(wrapper.vm.useInboxAvatarForBot).toBe(true);
@@ -31,7 +32,7 @@ describe('configMixin', () => {
     expect(wrapper.vm.channelConfig).toEqual({
       avatarUrl: 'https://test.url',
       hasAConnectedAgentBot: 'AgentBot',
-      enabledFeatures: ['emoji_picker', 'attachments'],
+      enabledFeatures: ['emoji_picker', 'attachments', 'end_conversation'],
       preChatFormOptions: {
         pre_chat_message: '',
         require_email: false,
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 949b562be..94ea0138b 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -4,7 +4,7 @@
 #
 #  id                    :integer          not null, primary key
 #  continuity_via_email  :boolean          default(TRUE), not null
-#  feature_flags         :integer          default(3), not null
+#  feature_flags         :integer          default(7), not null
 #  hmac_mandatory        :boolean          default(FALSE)
 #  hmac_token            :string
 #  pre_chat_form_enabled :boolean          default(FALSE)
@@ -43,6 +43,7 @@ class Channel::WebWidget < ApplicationRecord
 
   has_flags 1 => :attachments,
             2 => :emoji_picker,
+            3 => :end_conversation,
             :column => 'feature_flags',
             :check_for_column => false
 
diff --git a/db/migrate/20220405092033_update_web_widget_feature_flags.rb b/db/migrate/20220405092033_update_web_widget_feature_flags.rb
new file mode 100644
index 000000000..5b534aa15
--- /dev/null
+++ b/db/migrate/20220405092033_update_web_widget_feature_flags.rb
@@ -0,0 +1,16 @@
+class UpdateWebWidgetFeatureFlags < ActiveRecord::Migration[6.1]
+  def change
+    change_column_default(:channel_web_widgets, :feature_flags, from: 3, to: 7)
+
+    set_end_conversation_to_default
+  end
+
+  def set_end_conversation_to_default
+    ::Channel::WebWidget.find_in_batches do |widget_batch|
+      widget_batch.each do |widget|
+        widget.end_conversation = true
+        widget.save!
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2f3334b74..c99c2b70c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_02_18_120357) do
+ActiveRecord::Schema.define(version: 2022_04_05_092033) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -280,7 +280,7 @@ ActiveRecord::Schema.define(version: 2022_02_18_120357) do
     t.string "widget_color", default: "#1f93ff"
     t.string "welcome_title"
     t.string "welcome_tagline"
-    t.integer "feature_flags", default: 3, null: false
+    t.integer "feature_flags", default: 7, null: false
     t.integer "reply_time", default: 0
     t.string "hmac_token"
     t.boolean "pre_chat_form_enabled", default: false
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index f6e0ce00f..0d3edb0dd 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -5,9 +5,13 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
   let(:web_widget) { create(:channel_widget, account: account) }
   let(:contact) { create(:contact, account: account, email: nil) }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
+  let(:second_session) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let!(:conversation) { create(:conversation, contact: contact, account: account, inbox: web_widget.inbox, contact_inbox: contact_inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
   let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
+  let(:token_without_conversation) do
+    ::Widget::TokenService.new(payload: { source_id: second_session.source_id, inbox_id: web_widget.inbox.id }).generate_token
+  end
 
   describe 'GET /api/v1/widget/conversations' do
     context 'with a conversation' do
@@ -142,5 +146,35 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
         )
       end
     end
+
+    context 'when end conversation is not permitted' do
+      before do
+        web_widget.end_conversation = false
+        web_widget.save!
+      end
+
+      it 'returns action not permitted status' do
+        expect(conversation.open?).to be true
+
+        get '/api/v1/widget/conversations/toggle_status',
+            headers: { 'X-Auth-Token' => token },
+            params: { website_token: web_widget.website_token },
+            as: :json
+
+        expect(response).to have_http_status(:forbidden)
+        expect(conversation.reload.resolved?).to be false
+      end
+    end
+
+    context 'when a token without any conversation is used' do
+      it 'returns not found status' do
+        get '/api/v1/widget/conversations/toggle_status',
+            headers: { 'X-Auth-Token' => token_without_conversation },
+            params: { website_token: web_widget.website_token },
+            as: :json
+
+        expect(response).to have_http_status(:not_found)
+      end
+    end
   end
 end

From 9329f08e1408308c1bb798dbd39a8acda0ef7f7a Mon Sep 17 00:00:00 2001
From: Justman10000 <49990629+Justman10000@users.noreply.github.com>
Date: Wed, 6 Apr 2022 16:51:19 +0200
Subject: [PATCH 021/177] chore: Fix typo in en localisation file (#4405)

Fix

Co-authored-by: Vishnu Narayanan <vishnu@chatwoot.com>
---
 app/javascript/dashboard/i18n/locale/en/teamsSettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
index 34d85384b..50dcb780d 100644
--- a/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
 
     "FINISH": {

From 75ce5345a9b20be2402bf1fc83aa92262da79f30 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Wed, 6 Apr 2022 21:14:04 +0530
Subject: [PATCH 022/177] feat: add gh action to build Chatwoot CE/foss docker
 image (#4406)

Github action to build and push chatwoot-ce(foss) edition images. This action will run on merges to master, develop and when tags are created. Corresponding docker tags are as follows.

GitHub branch/tag  -->	docker tag
----
master 	--> latest-ce
develop 	---> develop-ce
v2.3.2 	---> v2.3.2-ce
v* 	---> v*-ce

Fixes #4388
---
 .github/workflows/publish_foss_docker.yml     | 55 +++++++++++++++++++
 .../{run-foss-spec.yml => run_foss_spec.yml}  |  0
 2 files changed, 55 insertions(+)
 create mode 100644 .github/workflows/publish_foss_docker.yml
 rename .github/workflows/{run-foss-spec.yml => run_foss_spec.yml} (100%)

diff --git a/.github/workflows/publish_foss_docker.yml b/.github/workflows/publish_foss_docker.yml
new file mode 100644
index 000000000..f56d67f99
--- /dev/null
+++ b/.github/workflows/publish_foss_docker.yml
@@ -0,0 +1,55 @@
+# #
+# # This action will publish Chatwoot CE docker image.
+# # This is set to run against merges to develop, master
+# # when tags are created.
+# #
+
+name: Publish Chatwoot CE docker images
+on:
+  push:
+    branches:
+      - develop
+      - master
+    tags:
+      - v*
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      GIT_REF: ${{ github.head_ref || github.ref_name }} # ref_name to get tags/branches
+    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Strip enterprise code
+        run: |
+          rm -rf enterprise
+          rm -rf spec/enterprise
+
+      - name: set docker tag
+        run: |
+          echo "DOCKER_TAG=chatwoot/chatwoot:$GIT_REF-ce" >> $GITHUB_ENV
+
+      - name: replace docker tag if master
+        if: github.ref_name == 'master'
+        run: |
+          echo "DOCKER_TAG=chatwoot/chatwoot:latest-ce" >> $GITHUB_ENV
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: docker/Dockerfile
+          push: true
+          tags: ${{ env.DOCKER_TAG }}
diff --git a/.github/workflows/run-foss-spec.yml b/.github/workflows/run_foss_spec.yml
similarity index 100%
rename from .github/workflows/run-foss-spec.yml
rename to .github/workflows/run_foss_spec.yml

From c2afdd5c93cc05b5b90b4c87a875ad3cee886742 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 7 Apr 2022 00:07:53 +0530
Subject: [PATCH 023/177] chore: Remove unnecessary fields from notification
 payload (#4403)

---
 app/models/notification.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/models/notification.rb b/app/models/notification.rb
index e0b1ef5ec..78591b96a 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -64,9 +64,15 @@ class Notification < ApplicationRecord
 
   def primary_actor_data
     if %w[assigned_conversation_new_message conversation_mention].include? notification_type
-      primary_actor.conversation.push_event_data
+      {
+        id: primary_actor.conversation.push_event_data[:id],
+        meta: primary_actor.conversation.push_event_data[:meta]
+      }
     else
-      primary_actor.push_event_data
+      {
+        id: primary_actor.push_event_data[:id],
+        meta: primary_actor.push_event_data[:meta]
+      }
     end
   end
 

From 5b490bc8cc5f284d85bbb601bb20940f968606a1 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 7 Apr 2022 07:14:40 +0530
Subject: [PATCH 024/177] chore: fix scroll bar color in the dark mode (#4404)

---
 app/javascript/widget/App.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 9d6600264..f18927f39 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -302,4 +302,9 @@ export default {
 
 <style lang="scss">
 @import '~widget/assets/scss/woot.scss';
+@media (prefers-color-scheme: dark) {
+  html {
+    color-scheme: dark;
+  }
+}
 </style>

From 8482ecc1b10306f86e999f38d2cc7938e059084d Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 7 Apr 2022 10:01:08 +0530
Subject: [PATCH 025/177] Feat - Sort inboxes alphabetically (#4383)

---
 .../layout/sidebarComponents/Secondary.vue    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 1f98305a1..8d486a454 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -85,14 +85,20 @@ export default {
         toState: frontendURL(`accounts/${this.accountId}/settings/inboxes/new`),
         toStateName: 'settings_inbox_new',
         newLinkRouteName: 'settings_inbox_new',
-        children: this.inboxes.map(inbox => ({
-          id: inbox.id,
-          label: inbox.name,
-          truncateLabel: true,
-          toState: frontendURL(`accounts/${this.accountId}/inbox/${inbox.id}`),
-          type: inbox.channel_type,
-          phoneNumber: inbox.phone_number,
-        })),
+        children: this.inboxes
+          .map(inbox => ({
+            id: inbox.id,
+            label: inbox.name,
+            truncateLabel: true,
+            toState: frontendURL(
+              `accounts/${this.accountId}/inbox/${inbox.id}`
+            ),
+            type: inbox.channel_type,
+            phoneNumber: inbox.phone_number,
+          }))
+          .sort((a, b) =>
+            a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1
+          ),
       };
     },
     labelSection() {

From d4a046a21ef5de3fb3722b6d72872b2bd05b8eb3 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Thu, 7 Apr 2022 10:23:18 +0530
Subject: [PATCH 026/177] fix: Audio notification would not work without action
 on the dashboard (#4303)

* fixes: Audio notification would not work without an action on dashboard

* fixes spec

* Minor fixes

* Minor fixes

* Review fixes

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 app/javascript/shared/helpers/AudioNotificationHelper.js    | 6 +++++-
 .../shared/helpers/specs/AudioNotificationHelper.spec.js    | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/shared/helpers/AudioNotificationHelper.js b/app/javascript/shared/helpers/AudioNotificationHelper.js
index 672816f90..d4fbc9e2c 100644
--- a/app/javascript/shared/helpers/AudioNotificationHelper.js
+++ b/app/javascript/shared/helpers/AudioNotificationHelper.js
@@ -3,7 +3,7 @@ import { IFrameHelper } from 'widget/helpers/utils';
 
 import { showBadgeOnFavicon } from './faviconHelper';
 
-export const initOnEvents = ['click', 'touchstart', 'keypress'];
+export const initOnEvents = ['click', 'touchstart', 'keypress', 'keydown'];
 export const getAlertAudio = async (baseUrl = '') => {
   const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
   const playsound = audioBuffer => {
@@ -53,6 +53,10 @@ export const shouldPlayAudio = (
     message_type: messageType,
     private: isPrivate,
   } = message;
+  if (!isDocHidden && messageType === MESSAGE_TYPE.INCOMING) {
+    showBadgeOnFavicon();
+    return false;
+  }
   const isFromCurrentUser = userId === senderId;
 
   const playAudio =
diff --git a/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js b/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js
index 7bdb6b059..7dc935400 100644
--- a/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/AudioNotificationHelper.spec.js
@@ -17,7 +17,7 @@ describe('shouldPlayAudio', () => {
         message_type: 0,
         private: false,
       };
-      const [conversationId, userId, isDocHiddden] = [1, 2, false];
+      const [conversationId, userId, isDocHiddden] = [1, 2, true];
       const result = shouldPlayAudio(
         message,
         conversationId,

From dfb56f6bb8ecec578cefae06d718331359d073de Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 7 Apr 2022 19:01:31 +0530
Subject: [PATCH 027/177] doc: Swagger for custom attribute APIs  (#4382)

---
 swagger/definitions/index.yml                 |   8 +-
 .../create_update_payload.yml                 |  22 ++
 .../definitions/resource/custom_attribute.yml |  29 ++
 swagger/index.yml                             |   1 +
 .../application/custom_attributes/create.yml  |  20 ++
 .../application/custom_attributes/delete.yml  |  20 ++
 .../application/custom_attributes/index.yml   |  24 ++
 .../application/custom_attributes/show.yml    |  14 +
 .../application/custom_attributes/update.yml  |  28 ++
 swagger/paths/index.yml                       |  18 ++
 swagger/swagger.json                          | 272 +++++++++++++++++-
 11 files changed, 453 insertions(+), 3 deletions(-)
 create mode 100644 swagger/definitions/request/custom_attribute/create_update_payload.yml
 create mode 100644 swagger/definitions/resource/custom_attribute.yml
 create mode 100644 swagger/paths/application/custom_attributes/create.yml
 create mode 100644 swagger/paths/application/custom_attributes/delete.yml
 create mode 100644 swagger/paths/application/custom_attributes/index.yml
 create mode 100644 swagger/paths/application/custom_attributes/show.yml
 create mode 100644 swagger/paths/application/custom_attributes/update.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index c120320c8..c06dd1471 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -14,6 +14,8 @@ generic_id:
   $ref: ./resource/extension/generic.yml
 canned_response:
   $ref: ./resource/canned_response.yml
+custom_attribute:
+  $ref: ./resource/custom_attribute.yml
 contact:
   $ref: ./resource/contact.yml
 conversation:
@@ -69,6 +71,8 @@ user_create_update_payload:
 canned_response_create_update_payload:
   $ref: ./request/canned_response/create_update_payload.yml
 
+custom_attribute_create_update_payload:
+  $ref: ./request/custom_attribute/create_update_payload.yml
 ## contact
 contact_create:
   $ref: ./request/contact/create.yml
@@ -154,6 +158,6 @@ account_summary:
   $ref: './resource/reports/summary.yml'
 agent_conversation_metrics:
   $ref: './resource/reports/conversation/agent.yml'
-    
-    
+
+
 
diff --git a/swagger/definitions/request/custom_attribute/create_update_payload.yml b/swagger/definitions/request/custom_attribute/create_update_payload.yml
new file mode 100644
index 000000000..fd368f98c
--- /dev/null
+++ b/swagger/definitions/request/custom_attribute/create_update_payload.yml
@@ -0,0 +1,22 @@
+type: object
+properties:
+  attribute_display_name:
+    type: string
+    description: Attribute display name
+  attribute_display_type:
+    type: integer
+    description: Attribute display type (text- 0, number- 1, currency- 2, percent- 3, link- 4, date- 5, list- 6, checkbox- 7)
+  attribute_description:
+    type: string
+    description: Attribute description
+  attribute_key:
+    type: string
+    description: Attribute unique key value
+  attribute_values:
+    type: array
+    description: Attribute values
+    items:
+      type: string
+  attribute_model:
+    type: integer
+    description: Attribute type(conversation_attribute- 0, contact_attribute- 1)
diff --git a/swagger/definitions/resource/custom_attribute.yml b/swagger/definitions/resource/custom_attribute.yml
new file mode 100644
index 000000000..ba36fd714
--- /dev/null
+++ b/swagger/definitions/resource/custom_attribute.yml
@@ -0,0 +1,29 @@
+type: object
+properties:
+  id:
+    type: integer
+    description: Identifier
+  attribute_display_name:
+    type: string
+    description: Attribute display name
+  attribute_display_type:
+    type: string
+    description: Attribute display type (text, number, currency, percent, link, date, list, checkbox)
+  attribute_description:
+    type: string
+    description: Attribute description
+  attribute_key:
+    type: string
+    description: Attribute unique key value
+  attribute_values:
+    type: string
+    description: Attribute values
+  default_value:
+    type: string
+    description: Attribute default value
+  attribute_model:
+    type: string
+    description: Attribute type(conversation_attribute/contact_attribute)
+  account_id:
+    type: integer
+    description: Account Id
diff --git a/swagger/index.yml b/swagger/index.yml
index 181fed1a8..b2dd91e46 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -66,6 +66,7 @@ x-tagGroups:
       - Teams
       - Custom Filters
       - Reports
+      - Custom Attributes
   - name: Client
     tags:
       - Contacts API
diff --git a/swagger/paths/application/custom_attributes/create.yml b/swagger/paths/application/custom_attributes/create.yml
new file mode 100644
index 000000000..fa01fc8e4
--- /dev/null
+++ b/swagger/paths/application/custom_attributes/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Custom Attributes
+operationId: add-new-custom-attribute-to-account
+summary: Add a new custom attribute
+description: Add a new custom attribute to account
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/custom_attribute_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+       $ref: '#/definitions/custom_attribute'
+  403:
+    description: Access denied
diff --git a/swagger/paths/application/custom_attributes/delete.yml b/swagger/paths/application/custom_attributes/delete.yml
new file mode 100644
index 000000000..cfdb68adc
--- /dev/null
+++ b/swagger/paths/application/custom_attributes/delete.yml
@@ -0,0 +1,20 @@
+tags:
+  - Custom Attributes
+operationId: delete-custom-attribute-from-account
+summary: Remove a custom attribute from account
+description: Remove a custom attribute from account
+security:
+  - userApiKey: []
+parameters:
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the custom attribute to be deleted
+responses:
+  200:
+    description: Success
+  404:
+    description: Custom attribute not found
+  403:
+    description: Access denied
diff --git a/swagger/paths/application/custom_attributes/index.yml b/swagger/paths/application/custom_attributes/index.yml
new file mode 100644
index 000000000..a3a91144b
--- /dev/null
+++ b/swagger/paths/application/custom_attributes/index.yml
@@ -0,0 +1,24 @@
+tags:
+  - Custom Attributes
+operationId: get-account-custom-attribute
+summary: List all custom attributes in an account
+parameters:
+    - name: attribute_model
+      in: query
+      type: string
+      enum: ['0', '1']
+      description: conversation_attribute(0)/contact_attribute(1)
+      required: true
+description: Get details of custom attributes in an Account
+security:
+  - userApiKey: []
+responses:
+  200:
+    description: Success
+    schema:
+        type: array
+        description: 'Array of all custom attributes'
+        items:
+          $ref: '#/definitions/custom_attribute'
+  403:
+    description: Access denied
diff --git a/swagger/paths/application/custom_attributes/show.yml b/swagger/paths/application/custom_attributes/show.yml
new file mode 100644
index 000000000..4e6f61e49
--- /dev/null
+++ b/swagger/paths/application/custom_attributes/show.yml
@@ -0,0 +1,14 @@
+tags:
+  - Custom Attributes
+operationId: get-details-of-a-single-custom-attribute
+summary: Get a custom attribute details
+description: Get the details of a custom attribute in the account
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/custom_attribute'
+  401:
+    description: Unauthorized
+  404:
+    description: The given attribute ID does not exist in the account
diff --git a/swagger/paths/application/custom_attributes/update.yml b/swagger/paths/application/custom_attributes/update.yml
new file mode 100644
index 000000000..4b69f21bd
--- /dev/null
+++ b/swagger/paths/application/custom_attributes/update.yml
@@ -0,0 +1,28 @@
+tags:
+  - Custom Attributes
+operationId: update-custom-attribute-in-account
+summary: Update custom attribute in Account
+description: Update a custom attribute in account
+security:
+  - userApiKey: []
+parameters:
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the custom attribute to be updated.
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/custom_attribute_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+        description: 'The updated custom attribute'
+        $ref: '#/definitions/custom_attribute'
+  404:
+    description: Agent not found
+  403:
+    description: Access denied
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index dc00c9b24..87faec643 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -170,6 +170,24 @@
   delete:
     $ref: ./application/canned_responses/delete.yml
 
+# Custom Attributes
+/api/v1/accounts/{account_id}/custom_attribute_definitions:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: ./application/custom_attributes/index.yml
+  post:
+    $ref: ./application/custom_attributes/create.yml
+/api/v1/accounts/{account_id}/custom_attribute_definitions/{id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: './application/custom_attributes/show.yml'
+  patch:
+    $ref: ./application/custom_attributes/update.yml
+  delete:
+    $ref: ./application/custom_attributes/delete.yml
+
 # Contacts
 /api/v1/accounts/{account_id}/contacts:
   $ref: ./application/contacts/list_create.yml
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 6e188ad5e..b654a669b 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1494,6 +1494,202 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/custom_attribute_definitions": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Custom Attributes"
+        ],
+        "operationId": "get-account-custom-attribute",
+        "summary": "List all custom attributes in an account",
+        "parameters": [
+          {
+            "name": "attribute_model",
+            "in": "query",
+            "type": "string",
+            "enum": [
+              "0",
+              "1"
+            ],
+            "description": "conversation_attribute(0)/contact_attribute(1)",
+            "required": true
+          }
+        ],
+        "description": "Get details of custom attributes in an Account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all custom attributes",
+              "items": {
+                "$ref": "#/definitions/custom_attribute"
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Custom Attributes"
+        ],
+        "operationId": "add-new-custom-attribute-to-account",
+        "summary": "Add a new custom attribute",
+        "description": "Add a new custom attribute to account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/custom_attribute_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/custom_attribute"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/custom_attribute_definitions/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Custom Attributes"
+        ],
+        "operationId": "get-details-of-a-single-custom-attribute",
+        "summary": "Get a custom attribute details",
+        "description": "Get the details of a custom attribute in the account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/custom_attribute"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given attribute ID does not exist in the account"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Custom Attributes"
+        ],
+        "operationId": "update-custom-attribute-in-account",
+        "summary": "Update custom attribute in Account",
+        "description": "Update a custom attribute in account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the custom attribute to be updated."
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/custom_attribute_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/custom_attribute"
+            }
+          },
+          "404": {
+            "description": "Agent not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Custom Attributes"
+        ],
+        "operationId": "delete-custom-attribute-from-account",
+        "summary": "Remove a custom attribute from account",
+        "description": "Remove a custom attribute from account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the custom attribute to be deleted"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "404": {
+            "description": "Custom attribute not found"
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/contacts": {
       "get": {
         "tags": [
@@ -4058,6 +4254,47 @@
         }
       }
     },
+    "custom_attribute": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "integer",
+          "description": "Identifier"
+        },
+        "attribute_display_name": {
+          "type": "string",
+          "description": "Attribute display name"
+        },
+        "attribute_display_type": {
+          "type": "string",
+          "description": "Attribute display type (text, number, currency, percent, link, date, list, checkbox)"
+        },
+        "attribute_description": {
+          "type": "string",
+          "description": "Attribute description"
+        },
+        "attribute_key": {
+          "type": "string",
+          "description": "Attribute unique key value"
+        },
+        "attribute_values": {
+          "type": "string",
+          "description": "Attribute values"
+        },
+        "default_value": {
+          "type": "string",
+          "description": "Attribute default value"
+        },
+        "attribute_model": {
+          "type": "string",
+          "description": "Attribute type(conversation_attribute/contact_attribute)"
+        },
+        "account_id": {
+          "type": "integer",
+          "description": "Account Id"
+        }
+      }
+    },
     "contact": {
       "type": "object",
       "properties": {
@@ -4718,6 +4955,38 @@
         }
       }
     },
+    "custom_attribute_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "attribute_display_name": {
+          "type": "string",
+          "description": "Attribute display name"
+        },
+        "attribute_display_type": {
+          "type": "integer",
+          "description": "Attribute display type (text- 0, number- 1, currency- 2, percent- 3, link- 4, date- 5, list- 6, checkbox- 7)"
+        },
+        "attribute_description": {
+          "type": "string",
+          "description": "Attribute description"
+        },
+        "attribute_key": {
+          "type": "string",
+          "description": "Attribute unique key value"
+        },
+        "attribute_values": {
+          "type": "array",
+          "description": "Attribute values",
+          "items": {
+            "type": "string"
+          }
+        },
+        "attribute_model": {
+          "type": "integer",
+          "description": "Attribute type(conversation_attribute- 0, contact_attribute- 1)"
+        }
+      }
+    },
     "contact_create": {
       "type": "object",
       "required": [
@@ -5449,7 +5718,8 @@
         "Profile",
         "Teams",
         "Custom Filters",
-        "Reports"
+        "Reports",
+        "Custom Attributes"
       ]
     },
     {

From 5ea043605120677824ff948ea023f03e191473c2 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Thu, 7 Apr 2022 22:16:45 +0530
Subject: [PATCH 028/177] feat: Adds support for draft in conversation reply
 box (#4205)

* Add draft support

* Fixes issue with draft loading

* Adds draft for private notes

* Use localstorage helper

* .remove instead of .clear

* Remove timestamp

* clearLocalStorageOnLogout

* Fix draft save on refresh

* Remove usage of delete operator

* Adds autosave for draft messages

* Remove setinterval and add debounce

* Removes draft redundancy check

* Adds test cases for debouncer

* Update app/javascript/shared/helpers/specs/TimeHelpers.spec.js

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

* Update app/javascript/shared/helpers/specs/TimeHelpers.spec.js

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

* Review fixes

* Fixes issue with debouncer

* FIxes debouncer issue

* Fixes issue with draft empty message

* Removes empty keys from local storage drafts

* Fixes error with empty draft

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
Co-authored-by: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
---
 .../dashboard/components/app/UpdateBanner.vue | 15 ++--
 .../components/widgets/WootWriter/Editor.vue  |  4 +-
 .../widgets/conversation/ReplyBox.vue         | 82 ++++++++++++++++++-
 .../dashboard/helper/localStorage.js          | 43 ++++++----
 .../dashboard/store/modules/auth.js           |  9 +-
 .../store/modules/conversations/helpers.js    |  7 ++
 .../specs/conversations/helpers.spec.js       |  7 ++
 app/javascript/dashboard/store/utils/api.js   |  6 ++
 app/javascript/shared/helpers/TimeHelpers.js  | 21 +++++
 .../shared/helpers/specs/TimeHelpers.spec.js  | 32 ++++++++
 10 files changed, 202 insertions(+), 24 deletions(-)
 create mode 100644 app/javascript/shared/helpers/TimeHelpers.js
 create mode 100644 app/javascript/shared/helpers/specs/TimeHelpers.spec.js

diff --git a/app/javascript/dashboard/components/app/UpdateBanner.vue b/app/javascript/dashboard/components/app/UpdateBanner.vue
index 2e4b00031..63c7bd457 100644
--- a/app/javascript/dashboard/components/app/UpdateBanner.vue
+++ b/app/javascript/dashboard/components/app/UpdateBanner.vue
@@ -12,12 +12,11 @@
 </template>
 <script>
 import Banner from 'dashboard/components/ui/Banner.vue';
-import LocalStorage from '../../helper/localStorage';
+import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../helper/localStorage';
 import { mapGetters } from 'vuex';
 import adminMixin from 'dashboard/mixins/isAdmin';
 
 const semver = require('semver');
-const dismissedUpdates = new LocalStorage('dismissedUpdates');
 
 export default {
   components: {
@@ -57,16 +56,22 @@ export default {
   },
   methods: {
     isVersionNotificationDismissed(version) {
-      return dismissedUpdates.get().includes(version);
+      const dismissedVersions =
+        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
+      return dismissedVersions.includes(version);
     },
     dismissUpdateBanner() {
-      let updatedDismissedItems = dismissedUpdates.get();
+      let updatedDismissedItems =
+        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
       if (updatedDismissedItems instanceof Array) {
         updatedDismissedItems.push(this.latestChatwootVersion);
       } else {
         updatedDismissedItems = [this.latestChatwootVersion];
       }
-      dismissedUpdates.store(updatedDismissedItems);
+      LocalStorage.set(
+        LOCAL_STORAGE_KEYS.DISMISSED_UPDATES,
+        updatedDismissedItems
+      );
       this.latestChatwootVersion = this.globalConfig.appVersion;
     },
   },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 1ac0ec333..45e8fb86a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -148,8 +148,8 @@ export default {
     showCannedMenu(updatedValue) {
       this.$emit('toggle-canned-menu', !this.isPrivate && updatedValue);
     },
-    value(newValue = '') {
-      if (newValue !== this.lastValue) {
+    value(newValue = '', oldValue = '') {
+      if (newValue !== oldValue) {
         const { tr } = this.state;
         if (this.isFormatMode) {
           this.state = createState(
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 99321eff8..d153b53aa 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -137,6 +137,7 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
+import { debounce } from 'shared/helpers/TimeHelpers';
 
 import {
   isEscape,
@@ -149,6 +150,8 @@ import inboxMixin from 'shared/mixins/inboxMixin';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { DirectUpload } from 'activestorage';
 import { frontendURL } from '../../../helper/URLHelper';
+import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../../helper/localStorage';
+import { trimMessage } from '../../../store/modules/conversations/helpers';
 
 export default {
   components: {
@@ -201,6 +204,7 @@ export default {
       hasSlashCommand: false,
       bccEmails: '',
       ccEmails: '',
+      doAutoSaveDraft: () => {},
     };
   },
   computed: {
@@ -406,10 +410,19 @@ export default {
     profilePath() {
       return frontendURL(`accounts/${this.accountId}/profile/settings`);
     },
+    conversationId() {
+      return this.currentChat.id;
+    },
   },
   watch: {
-    currentChat(conversation) {
+    currentChat(conversation, oldConversation) {
       const { can_reply: canReply } = conversation;
+
+      if (oldConversation.id !== conversation.id) {
+        this.setToDraft(oldConversation.id, this.replyType);
+        this.getFromDraft();
+      }
+
       if (this.isOnPrivateNote) {
         return;
       }
@@ -434,22 +447,87 @@ export default {
         this.mentionSearchKey = '';
         this.showMentions = false;
       }
+      this.doAutoSaveDraft();
+    },
+    replyType(updatedReplyType, oldReplyType) {
+      this.setToDraft(this.conversationId, oldReplyType);
+      this.getFromDraft();
     },
   },
 
   mounted() {
+    this.getFromDraft();
     // Donot use the keyboard listener mixin here as the events here are supposed to be
     // working even if input/textarea is focussed.
     document.addEventListener('keydown', this.handleKeyEvents);
     document.addEventListener('paste', this.onPaste);
 
     this.setCCEmailFromLastChat();
+    this.doAutoSaveDraft = debounce(
+      () => {
+        this.saveDraft(this.conversationId, this.replyType);
+      },
+      5000,
+      false
+    );
   },
   destroyed() {
     document.removeEventListener('keydown', this.handleKeyEvents);
     document.removeEventListener('paste', this.onPaste);
   },
   methods: {
+    getSavedDraftMessages() {
+      return LocalStorage.get(LOCAL_STORAGE_KEYS.DRAFT_MESSAGES) || {};
+    },
+    saveDraft(conversationId, replyType) {
+      if (this.message || this.message === '') {
+        const savedDraftMessages = this.getSavedDraftMessages();
+        const key = `draft-${conversationId}-${replyType}`;
+        const draftToSave = trimMessage(this.message || '');
+        const {
+          [key]: currentDraft,
+          ...restOfDraftMessages
+        } = savedDraftMessages;
+
+        const updatedDraftMessages = draftToSave
+          ? {
+              ...restOfDraftMessages,
+              [key]: draftToSave,
+            }
+          : restOfDraftMessages;
+
+        LocalStorage.set(
+          LOCAL_STORAGE_KEYS.DRAFT_MESSAGES,
+          updatedDraftMessages
+        );
+      }
+    },
+    setToDraft(conversationId, replyType) {
+      this.saveDraft(conversationId, replyType);
+      this.message = '';
+    },
+    getFromDraft() {
+      if (this.conversationId) {
+        try {
+          const key = `draft-${this.conversationId}-${this.replyType}`;
+          const savedDraftMessages = this.getSavedDraftMessages();
+          this.message = `${savedDraftMessages[key] || ''}`;
+        } catch (error) {
+          this.message = '';
+        }
+      }
+    },
+    removeFromDraft() {
+      if (this.conversationId) {
+        const key = `draft-${this.conversationId}-${this.replyType}`;
+        const draftMessages = this.getSavedDraftMessages();
+        const { [key]: toBeRemoved, ...updatedDraftMessages } = draftMessages;
+        LocalStorage.set(
+          LOCAL_STORAGE_KEYS.DRAFT_MESSAGES,
+          updatedDraftMessages
+        );
+      }
+    },
     onPaste(e) {
       const data = e.clipboardData.files;
       if (!this.showRichContentEditor && data.length !== 0) {
@@ -537,6 +615,7 @@ export default {
             messagePayload
           );
           bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
+          this.removeFromDraft();
         } catch (error) {
           const errorMessage =
             error?.response?.data?.error ||
@@ -608,6 +687,7 @@ export default {
     },
     onBlur() {
       this.isFocused = false;
+      this.saveDraft(this.conversationId, this.replyType);
     },
     onFocus() {
       this.isFocused = true;
diff --git a/app/javascript/dashboard/helper/localStorage.js b/app/javascript/dashboard/helper/localStorage.js
index cc963aa48..cbc562417 100644
--- a/app/javascript/dashboard/helper/localStorage.js
+++ b/app/javascript/dashboard/helper/localStorage.js
@@ -1,17 +1,32 @@
-class LocalStorage {
-  constructor(key) {
-    this.key = key;
-  }
+export const LOCAL_STORAGE_KEYS = {
+  DISMISSED_UPDATES: 'dismissedUpdates',
+  DRAFT_MESSAGES: 'draftMessages',
+};
 
-  store(allItems) {
-    localStorage.setItem(this.key, JSON.stringify(allItems));
-    localStorage.setItem(this.key + ':ts', Date.now());
-  }
+export const LocalStorage = {
+  clearAll() {
+    window.localStorage.clear();
+  },
 
-  get() {
-    let stored = localStorage.getItem(this.key);
-    return JSON.parse(stored) || [];
-  }
-}
+  get(key) {
+    const value = window.localStorage.getItem(key);
+    try {
+      return typeof value === 'string' ? JSON.parse(value) : value;
+    } catch (error) {
+      return value;
+    }
+  },
+  set(key, value) {
+    if (typeof value === 'object') {
+      window.localStorage.setItem(key, JSON.stringify(value));
+    } else {
+      window.localStorage.setItem(key, value);
+    }
+    window.localStorage.setItem(key + ':ts', Date.now());
+  },
 
-export default LocalStorage;
+  remove(key) {
+    window.localStorage.removeItem(key);
+    window.localStorage.removeItem(key + ':ts');
+  },
+};
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index 5b2feef11..f9a45646a 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -5,7 +5,12 @@ import * as types from '../mutation-types';
 import authAPI from '../../api/auth';
 import createAxios from '../../helper/APIHelper';
 import actionCable from '../../helper/actionCable';
-import { setUser, getHeaderExpiry, clearCookiesOnLogout } from '../utils/api';
+import {
+  setUser,
+  getHeaderExpiry,
+  clearCookiesOnLogout,
+  clearLocalStorageOnLogout,
+} from '../utils/api';
 import { getLoginRedirectURL } from '../../helper/URLHelper';
 
 const state = {
@@ -94,9 +99,9 @@ export const actions = {
         .login(credentials)
         .then(response => {
           commit(types.default.SET_CURRENT_USER);
+          clearLocalStorageOnLogout();
           window.axios = createAxios(axios);
           actionCable.init(Vue);
-
           window.location = getLoginRedirectURL(ssoAccountId, response.data);
           resolve();
         })
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers.js b/app/javascript/dashboard/store/modules/conversations/helpers.js
index be136af54..1a24cdde5 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers.js
@@ -35,3 +35,10 @@ export const applyPageFilters = (conversation, filters) => {
 
   return shouldFilter;
 };
+
+export const trimMessage = (content = '', maxLength = 1024) => {
+  if (content.length > maxLength) {
+    return content.substring(0, maxLength);
+  }
+  return content;
+};
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
index af25f5527..599826a99 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
@@ -1,6 +1,7 @@
 import {
   findPendingMessageIndex,
   applyPageFilters,
+  trimMessage,
 } from '../../conversations/helpers';
 
 const conversationList = [
@@ -119,3 +120,9 @@ describe('#applyPageFilters', () => {
     });
   });
 });
+
+describe('#trimMessage', () => {
+  expect(trimMessage('Hello world', 5)).toEqual('Hello');
+  expect(trimMessage('Hello', 5)).toEqual('Hello');
+  expect(trimMessage(undefined, 5)).toEqual('');
+});
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 37fd68c7b..9077a43c4 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -9,6 +9,7 @@ import {
   CHATWOOT_RESET,
   CHATWOOT_SET_USER,
 } from '../../helper/scriptHelpers';
+import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../helper/localStorage';
 
 Cookies.defaults = { sameSite: 'Lax' };
 
@@ -43,10 +44,15 @@ export const clearBrowserSessionCookies = () => {
   Cookies.remove('user');
 };
 
+export const clearLocalStorageOnLogout = () => {
+  LocalStorage.remove(LOCAL_STORAGE_KEYS.DRAFT_MESSAGES);
+};
+
 export const clearCookiesOnLogout = () => {
   window.bus.$emit(CHATWOOT_RESET);
   window.bus.$emit(ANALYTICS_RESET);
   clearBrowserSessionCookies();
+  clearLocalStorageOnLogout();
   const globalConfig = window.globalConfig || {};
   const logoutRedirectLink =
     globalConfig.LOGOUT_REDIRECT_LINK || frontendURL('login');
diff --git a/app/javascript/shared/helpers/TimeHelpers.js b/app/javascript/shared/helpers/TimeHelpers.js
new file mode 100644
index 000000000..8473b0f5c
--- /dev/null
+++ b/app/javascript/shared/helpers/TimeHelpers.js
@@ -0,0 +1,21 @@
+// Returns a function, that, as long as it continues to be invoked, will not
+// be triggered. The function will be called after it stops being called for
+// N milliseconds. If `immediate` is passed, trigger the function on the
+// leading edge, instead of the trailing.
+
+export const debounce = (func, delay, immediate) => {
+  let timerId;
+  return (...args) => {
+    const boundFunc = func.bind(this, ...args);
+    clearTimeout(timerId);
+    if (immediate && !timerId) {
+      boundFunc();
+    }
+    const calleeFunc = immediate
+      ? () => {
+          timerId = null;
+        }
+      : boundFunc;
+    timerId = setTimeout(calleeFunc, delay);
+  };
+};
diff --git a/app/javascript/shared/helpers/specs/TimeHelpers.spec.js b/app/javascript/shared/helpers/specs/TimeHelpers.spec.js
new file mode 100644
index 000000000..e6a94b090
--- /dev/null
+++ b/app/javascript/shared/helpers/specs/TimeHelpers.spec.js
@@ -0,0 +1,32 @@
+import { debounce } from '../TimeHelpers';
+// Tell Jest to mock all timeout functions
+jest.useFakeTimers('modern');
+
+describe('debounce', () => {
+  test('execute just once with immediate false', () => {
+    let func = jest.fn();
+    let debouncedFunc = debounce(func, 1000);
+
+    for (let i = 0; i < 100; i += 1) {
+      debouncedFunc();
+    }
+
+    // Fast-forward time
+    jest.runAllTimers();
+
+    expect(func).toBeCalledTimes(1);
+  });
+
+  test('execute just once with immediate true', () => {
+    let func = jest.fn();
+    let debouncedFunc = debounce(func, 1000, true);
+
+    for (let i = 0; i < 100; i += 1) {
+      debouncedFunc();
+    }
+
+    jest.runAllTimers();
+
+    expect(func).toBeCalledTimes(1);
+  });
+});

From 14e6a5d6b025ec645157f3a458bd289435146511 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Fri, 8 Apr 2022 10:54:51 +0530
Subject: [PATCH 029/177] fix: Background dark mode colour issue in campaign
 view (#4416)

---
 app/javascript/widget/App.vue                         | 5 -----
 app/javascript/widget/components/ConversationWrap.vue | 1 +
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index f18927f39..9d6600264 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -302,9 +302,4 @@ export default {
 
 <style lang="scss">
 @import '~widget/assets/scss/woot.scss';
-@media (prefers-color-scheme: dark) {
-  html {
-    color-scheme: dark;
-  }
-}
 </style>
diff --git a/app/javascript/widget/components/ConversationWrap.vue b/app/javascript/widget/components/ConversationWrap.vue
index 828f37e22..813325fcd 100755
--- a/app/javascript/widget/components/ConversationWrap.vue
+++ b/app/javascript/widget/components/ConversationWrap.vue
@@ -109,6 +109,7 @@ export default {
   flex-direction: column;
   flex: 1;
   overflow-y: auto;
+  color-scheme: light dark;
 }
 
 .conversation-wrap {

From 57359be37e88b7230b079a01a20f69bc1c89f31c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 8 Apr 2022 11:20:19 +0530
Subject: [PATCH 030/177] Fix: Find mailbox with cc email (#4372)

---
 app/finders/email_channel_finder.rb        | 15 +++++++++++
 app/mailboxes/application_mailbox.rb       | 17 +++++++-----
 app/mailboxes/mailbox_helper.rb            |  2 ++
 app/mailboxes/support_mailbox.rb           | 10 +++++---
 spec/finders/email_channel_finder_spec.rb  | 29 +++++++++++++++++++++
 spec/fixtures/files/in_reply_to.eml        |  2 +-
 spec/fixtures/files/reply_cc.eml           | 30 ++++++++++++++++++++++
 spec/mailboxes/application_mailbox_spec.rb |  9 +++++++
 spec/mailboxes/support_mailbox_spec.rb     |  1 +
 9 files changed, 103 insertions(+), 12 deletions(-)
 create mode 100644 app/finders/email_channel_finder.rb
 create mode 100644 spec/finders/email_channel_finder_spec.rb
 create mode 100644 spec/fixtures/files/reply_cc.eml

diff --git a/app/finders/email_channel_finder.rb b/app/finders/email_channel_finder.rb
new file mode 100644
index 000000000..1c8eaeaf2
--- /dev/null
+++ b/app/finders/email_channel_finder.rb
@@ -0,0 +1,15 @@
+class EmailChannelFinder
+  def initialize(email_object)
+    @email_object = email_object
+  end
+
+  def perform
+    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)
+      break if channel.present?
+    end
+    channel
+  end
+end
diff --git a/app/mailboxes/application_mailbox.rb b/app/mailboxes/application_mailbox.rb
index f27db5a49..f5e9abe1b 100644
--- a/app/mailboxes/application_mailbox.rb
+++ b/app/mailboxes/application_mailbox.rb
@@ -21,17 +21,20 @@ class ApplicationMailbox < ActionMailbox::Base
   def self.support_mail?
     proc do |inbound_mail_obj|
       is_a_support_email = false
-      inbound_mail_obj.mail.to&.each do |email|
-        channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', email.downcase, email.downcase)
-        if channel.present?
-          is_a_support_email = true
-          break
-        end
-      end
+
+      is_a_support_email = true if reply_to_mail?(inbound_mail_obj, is_a_support_email)
+
       is_a_support_email
     end
   end
 
+  def self.reply_to_mail?(inbound_mail_obj, is_a_support_email)
+    return if is_a_support_email
+
+    channel = EmailChannelFinder.new(inbound_mail_obj.mail).perform
+    channel.present?
+  end
+
   def self.catch_all_mail?
     proc { |_mail| true }
   end
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 831baa91a..927ab5eb5 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -2,6 +2,8 @@ module MailboxHelper
   private
 
   def create_message
+    return if @conversation.messages.find_by(source_id: processed_mail.message_id).present?
+
     @message = @conversation.messages.create(
       account_id: @conversation.account_id,
       sender: @conversation.contact,
diff --git a/app/mailboxes/support_mailbox.rb b/app/mailboxes/support_mailbox.rb
index d215310e0..b0a1a68df 100644
--- a/app/mailboxes/support_mailbox.rb
+++ b/app/mailboxes/support_mailbox.rb
@@ -21,15 +21,17 @@ class SupportMailbox < ApplicationMailbox
   private
 
   def find_channel
-    mail.to.each do |email|
-      @channel = Channel::Email.find_by('lower(email) = ? OR lower(forward_to_email) = ?', email.downcase, email.downcase)
-      break if @channel.present?
-    end
+    find_channel_with_to_mail if @channel.blank?
+
     raise 'Email channel/inbox not found' if @channel.nil?
 
     @channel
   end
 
+  def find_channel_with_to_mail
+    @channel = EmailChannelFinder.new(mail).perform
+  end
+
   def load_account
     @account = @channel.account
   end
diff --git a/spec/finders/email_channel_finder_spec.rb b/spec/finders/email_channel_finder_spec.rb
new file mode 100644
index 000000000..75cae37a9
--- /dev/null
+++ b/spec/finders/email_channel_finder_spec.rb
@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+describe ::EmailChannelFinder do
+  include ActionMailbox::TestHelper
+  let!(:channel_email) { create(:channel_email) }
+
+  describe '#perform' do
+    context 'with cc mail' do
+      let(:reply_cc_mail) { create_inbound_email_from_fixture('reply_cc.eml') }
+
+      it 'return channel with cc email' do
+        channel_email.update(email: 'test@example.com')
+        channel = described_class.new(reply_cc_mail.mail).perform
+        expect(channel).to eq(channel_email)
+      end
+    end
+
+    context 'with to mail' do
+      let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
+
+      it 'return channel with to email' do
+        channel_email.update(email: 'test@example.com')
+        reply_mail.mail['to'] = 'test@example.com'
+        channel = described_class.new(reply_mail.mail).perform
+        expect(channel).to eq(channel_email)
+      end
+    end
+  end
+end
diff --git a/spec/fixtures/files/in_reply_to.eml b/spec/fixtures/files/in_reply_to.eml
index eda6eac86..3a565ea9e 100644
--- a/spec/fixtures/files/in_reply_to.eml
+++ b/spec/fixtures/files/in_reply_to.eml
@@ -5,7 +5,7 @@ Subject: Discussion: Let's debate these attachments
 Date: Tue, 20 Apr 2020 04:20:20 -0400
 In-Reply-To: <0CB459E0-0336-41DA-BC88-E6E28C697DDB@chatwoot.com>
 References: <4e6e35f5a38b4_479f13bb90078178@small-app-01.mail>
-Message-Id: <0CB459E0-0336-41DA-BC88-E6E28C697DDB@chatwoot.com>
+Message-Id: <0CB459E0-0336-41DA-BC88-E6E28C697DDBF@chatwoot.com>
 X-Mailer: Apple Mail (2.1244.3)
 
 --Apple-Mail=_33A037C7-4BB3-4772-AE52-FCF2D7535F74
diff --git a/spec/fixtures/files/reply_cc.eml b/spec/fixtures/files/reply_cc.eml
new file mode 100644
index 000000000..6fd2e8e3b
--- /dev/null
+++ b/spec/fixtures/files/reply_cc.eml
@@ -0,0 +1,30 @@
+MIME-Version: 1.0
+Date: Thu, 31 Mar 2022 19:25:32 +0530
+Message-ID: <CAFkiBVw2B=CPf=8=VqBQqssFp7XfGm4u6LpByHuMXWsPZCxPYQ@mail.gmail.com>
+Subject: Discussion: Let's debate these attachments
+From: Sony Mathew <sony@chatwoot.com>
+To: <test123@example.com>
+Cc: Replies <test@example.com>
+Content-Type: multipart/alternative; boundary="00000000000001f49e05db8404a8"
+
+--00000000000001f49e05db8404a8
+Content-Type: text/plain; charset="UTF-8"
+
+Hello,
+
+Find the related inbox.
+
+--
+*Sony Mathew*
+
+--00000000000001f49e05db8404a8
+Content-Type: text/html; charset="UTF-8"
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Hello,<div><br></div><div>Find the related inbox.<br clear=
+=3D"all"><div><br></div>-- <br><div dir=3D"ltr" class=3D"gmail_signature" d=
+ata-smartmail=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><d=
+iv><div><b>Sony Mathew</b><br></div><br></di=
+v></div></div></div></div></div></div>
+
+--00000000000001f49e05db8404a8--
diff --git a/spec/mailboxes/application_mailbox_spec.rb b/spec/mailboxes/application_mailbox_spec.rb
index f8b2e877f..3f3e8b97f 100644
--- a/spec/mailboxes/application_mailbox_spec.rb
+++ b/spec/mailboxes/application_mailbox_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe ApplicationMailbox, type: :mailbox do
   describe 'route the inbound mail to appropriate mailbox' do
     let(:welcome_mail) { create_inbound_email_from_fixture('welcome.eml') }
     let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
+    let(:reply_cc_mail) { create_inbound_email_from_fixture('reply_cc.eml') }
     let(:reply_mail_without_uuid) { create_inbound_email_from_fixture('reply.eml') }
     let(:reply_mail_with_in_reply_to) { create_inbound_email_from_fixture('in_reply_to.eml') }
     let(:support_mail) { create_inbound_email_from_fixture('support.eml') }
@@ -55,6 +56,14 @@ RSpec.describe ApplicationMailbox, type: :mailbox do
         expect(dbl).to receive(:perform_processing).and_return(true)
         described_class.route support_mail
       end
+
+      it 'routes support emails to Support Mailbox with cc email' do
+        channel_email.update(email: 'test@example.com')
+        dbl = double
+        expect(SupportMailbox).to receive(:new).and_return(dbl)
+        expect(dbl).to receive(:perform_processing).and_return(true)
+        described_class.route reply_cc_mail
+      end
     end
   end
 end
diff --git a/spec/mailboxes/support_mailbox_spec.rb b/spec/mailboxes/support_mailbox_spec.rb
index bad22aff3..7f5368ea4 100644
--- a/spec/mailboxes/support_mailbox_spec.rb
+++ b/spec/mailboxes/support_mailbox_spec.rb
@@ -148,6 +148,7 @@ RSpec.describe SupportMailbox, type: :mailbox do
         expect(conversation_1.messages.count).to eq(1)
 
         reply_mail_without_uuid.mail['In-Reply-To'] = 'conversation/6bdc3f4d-0bec-4515-a284-5d916fdde489/messages/123'
+        reply_mail_without_uuid.mail['Message-Id'] = '0CB459E0-0336-41DA-BC88-E6E28C697SFC@chatwoot.com'
 
         described_class.receive reply_mail_without_uuid
 

From d5536d65f75be6ebb3238f133df61b88d65c8668 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Fri, 8 Apr 2022 12:48:18 +0530
Subject: [PATCH 031/177] feat: Consider business hours while generating the
 reports (#4330)

* feat: Consider business hours while generating the reports
---
 Gemfile                                       |  3 ++
 Gemfile.lock                                  |  4 ++
 .../api/v2/accounts/reports_controller.rb     | 40 +++++++--------
 app/helpers/report_helper.rb                  | 22 +++++---
 app/helpers/reporting_event_helper.rb         | 50 +++++++++++++++++++
 app/javascript/dashboard/api/reports.js       | 14 +++++-
 .../assets/scss/widgets/_report.scss          |  5 ++
 .../assets/scss/widgets/_reports.scss         | 18 +++++++
 .../dashboard/i18n/locale/en/report.json      |  3 +-
 .../dashboard/settings/reports/Index.vue      | 12 ++++-
 .../reports/components/FilterSelector.vue     | 10 ++++
 .../reports/components/ReportFilters.vue      | 10 ++++
 .../reports/components/WootReports.vue        | 12 ++++-
 .../dashboard/store/modules/reports.js        |  6 ++-
 app/listeners/reporting_event_listener.rb     | 13 ++++-
 app/models/reporting_event.rb                 | 21 ++++----
 ...ue_in_business_hours_to_reporting_event.rb |  9 ++++
 db/schema.rb                                  |  3 ++
 .../reporting_event_listener_spec.rb          | 34 +++++++++++++
 19 files changed, 241 insertions(+), 48 deletions(-)
 create mode 100644 app/helpers/reporting_event_helper.rb
 create mode 100644 db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb

diff --git a/Gemfile b/Gemfile
index 297a88497..e94303f45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,6 +125,9 @@ gem 'procore-sift'
 gem 'email_reply_trimmer'
 gem 'html2text'
 
+# to calculate working hours
+gem 'working_hours'
+
 group :production, :staging do
   # we dont want request timing out in development while using byebug
   gem 'rack-timeout'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6c314817d..4b128f424 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -636,6 +636,9 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.0)
+    working_hours (1.4.1)
+      activesupport (>= 3.2)
+      tzinfo
     zeitwerk (2.5.4)
 
 PLATFORMS
@@ -746,6 +749,7 @@ DEPENDENCIES
   webpacker (~> 5.x)
   webpush
   wisper (= 2.0.0)
+  working_hours
 
 RUBY VERSION
    ruby 3.0.2p107
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index b2932e34f..227ba2500 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -47,36 +47,36 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
     raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
   end
 
-  def current_summary_params
+  def common_params
     {
       type: params[:type].to_sym,
       id: params[:id],
-      since: range[:current][:since],
-      until: range[:current][:until],
-      group_by: params[:group_by]
+      group_by: params[:group_by],
+      business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
     }
   end
 
+  def current_summary_params
+    common_params.merge({
+                          since: range[:current][:since],
+                          until: range[:current][:until]
+                        })
+  end
+
   def previous_summary_params
-    {
-      type: params[:type].to_sym,
-      id: params[:id],
-      since: range[:previous][:since],
-      until: range[:previous][:until],
-      group_by: params[:group_by]
-    }
+    common_params.merge({
+                          since: range[:previous][:since],
+                          until: range[:previous][:until]
+                        })
   end
 
   def report_params
-    {
-      metric: params[:metric],
-      type: params[:type].to_sym,
-      since: params[:since],
-      until: params[:until],
-      id: params[:id],
-      group_by: params[:group_by],
-      timezone_offset: params[:timezone_offset]
-    }
+    common_params.merge({
+                          metric: params[:metric],
+                          since: params[:since],
+                          until: params[:until],
+                          timezone_offset: params[:timezone_offset]
+                        })
   end
 
   def conversation_params
diff --git a/app/helpers/report_helper.rb b/app/helpers/report_helper.rb
index 31e2c1ce8..9f37295cb 100644
--- a/app/helpers/report_helper.rb
+++ b/app/helpers/report_helper.rb
@@ -33,17 +33,23 @@ module ReportHelper
   end
 
   def avg_first_response_time
-    (get_grouped_values scope.reporting_events.where(name: 'first_response')).average(:value)
+    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response'))
+    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
+
+    grouped_reporting_events.average(:value)
   end
 
   def avg_resolution_time
-    (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved')).average(:value)
+    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved'))
+    return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
+
+    grouped_reporting_events.average(:value)
   end
 
   def avg_resolution_time_summary
-    avg_rt = scope.reporting_events
-                  .where(name: 'conversation_resolved', created_at: range)
-                  .average(:value)
+    reporting_events = scope.reporting_events
+                            .where(name: 'conversation_resolved', created_at: range)
+    avg_rt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
 
     return 0 if avg_rt.blank?
 
@@ -51,9 +57,9 @@ module ReportHelper
   end
 
   def avg_first_response_time_summary
-    avg_frt = scope.reporting_events
-                   .where(name: 'first_response', created_at: range)
-                   .average(:value)
+    reporting_events = scope.reporting_events
+                            .where(name: 'first_response', created_at: range)
+    avg_frt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
 
     return 0 if avg_frt.blank?
 
diff --git a/app/helpers/reporting_event_helper.rb b/app/helpers/reporting_event_helper.rb
new file mode 100644
index 000000000..eee1af283
--- /dev/null
+++ b/app/helpers/reporting_event_helper.rb
@@ -0,0 +1,50 @@
+module ReportingEventHelper
+  def business_hours(inbox, from, to)
+    return 0 unless inbox.working_hours_enabled?
+
+    inbox_working_hours = configure_working_hours(inbox.working_hours)
+    return 0 if inbox_working_hours.blank?
+
+    # Configure working hours
+    WorkingHours::Config.working_hours = inbox_working_hours
+
+    # Configure timezone
+    WorkingHours::Config.time_zone = inbox.timezone
+
+    # Use inbox timezone to change from & to values.
+    from_in_inbox_timezone = from.in_time_zone(inbox.timezone).to_time
+    to_in_inbox_timezone = to.in_time_zone(inbox.timezone).to_time
+    from_in_inbox_timezone.working_time_until(to_in_inbox_timezone)
+  end
+
+  private
+
+  def configure_working_hours(working_hours)
+    working_hours.each_with_object({}) do |working_hour, object|
+      object[day(working_hour.day_of_week)] = working_hour_range(working_hour) unless working_hour.closed_all_day?
+    end
+  end
+
+  def day(day_of_week)
+    week_days = {
+      0 => :sun,
+      1 => :mon,
+      2 => :tue,
+      3 => :wed,
+      4 => :thu,
+      5 => :fri,
+      6 => :sat
+    }
+    week_days[day_of_week]
+  end
+
+  def working_hour_range(working_hour)
+    { format_time(working_hour.open_hour, working_hour.open_minutes) => format_time(working_hour.close_hour, working_hour.close_minutes) }
+  end
+
+  def format_time(hour, minute)
+    hour = hour < 10 ? "0#{hour}" : hour
+    minute = minute < 10 ? "0#{minute}" : minute
+    "#{hour}:#{minute}"
+  end
+end
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 90f8b34ea..5c39ddbe6 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -8,7 +8,15 @@ class ReportsAPI extends ApiClient {
     super('reports', { accountScoped: true, apiVersion: 'v2' });
   }
 
-  getReports(metric, since, until, type = 'account', id, group_by) {
+  getReports(
+    metric,
+    since,
+    until,
+    type = 'account',
+    id,
+    group_by,
+    business_hours
+  ) {
     return axios.get(`${this.url}`, {
       params: {
         metric,
@@ -17,12 +25,13 @@ class ReportsAPI extends ApiClient {
         type,
         id,
         group_by,
+        business_hours,
         timezone_offset: getTimeOffset(),
       },
     });
   }
 
-  getSummary(since, until, type = 'account', id, group_by) {
+  getSummary(since, until, type = 'account', id, group_by, business_hours) {
     return axios.get(`${this.url}/summary`, {
       params: {
         since,
@@ -30,6 +39,7 @@ class ReportsAPI extends ApiClient {
         type,
         id,
         group_by,
+        business_hours,
       },
     });
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_report.scss b/app/javascript/dashboard/assets/scss/widgets/_report.scss
index 444dccb7c..5299f1155 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_report.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_report.scss
@@ -78,5 +78,10 @@
       font-size: $font-size-default;
       color: $color-gray;
     }
+
+    .business-hours {
+      margin: $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 bbd03ce9f..742129655 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reports.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reports.scss
@@ -25,3 +25,21 @@
   align-items: center;
   display: flex;
 }
+
+.business-hours {
+  align-items: center;
+  display: flex;
+  justify-content: end;
+  margin-bottom: var(--space-normal);
+  margin-left: auto;
+  padding-right: var(--space-normal);
+}
+
+.business-hours-text {
+  font-size: var(--font-size-small);
+}
+
+.switch {
+  margin-bottom: var(--space-zero);
+  margin-left: var(--space-small);
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index ed730d798..a14704007 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -78,7 +78,8 @@
       { "id": 2, "groupBy": "Week" },
       { "id": 3, "groupBy": "Month" },
       { "id": 4, "groupBy": "Year" }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index 1b46c474a..f9a9256f4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -15,6 +15,7 @@
       :filter-items-list="filterItemsList"
       @date-range-change="onDateRangeChange"
       @filter-change="onFilterChange"
+      @business-hours-toggle="onBusinessHoursToggle"
     />
     <div class="row">
       <woot-report-stats-card
@@ -79,6 +80,7 @@ export default {
       groupBy: GROUP_BY_FILTER[1],
       filterItemsList: this.$t('REPORT.GROUP_BY_DAY_OPTIONS'),
       selectedGroupByFilter: {},
+      businessHours: false,
     };
   },
   computed: {
@@ -166,21 +168,23 @@ export default {
   },
   methods: {
     fetchAllData() {
-      const { from, to, groupBy } = this;
+      const { from, to, groupBy, businessHours } = this;
       this.$store.dispatch('fetchAccountSummary', {
         from,
         to,
         groupBy: groupBy.period,
+        businessHours,
       });
       this.fetchChartData();
     },
     fetchChartData() {
-      const { from, to, groupBy } = this;
+      const { from, to, groupBy, businessHours } = this;
       this.$store.dispatch('fetchAccountReport', {
         metric: this.metrics[this.currentSelection].KEY,
         from,
         to,
         groupBy: groupBy.period,
+        businessHours,
       });
     },
     downloadAgentReports() {
@@ -226,6 +230,10 @@ export default {
           return this.$t('REPORT.GROUP_BY_DAY_OPTIONS');
       }
     },
+    onBusinessHoursToggle(value) {
+      this.businessHours = value;
+      this.fetchAllData();
+    },
   },
 };
 </script>
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 885b76283..87a422be0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -61,6 +61,12 @@
         @input="handleAgentsFilterSelection"
       />
     </div>
+    <div class="small-12 medium-3 business-hours">
+      <span class="business-hours-text">{{ $t('REPORT.BUSINESS_HOURS') }}</span>
+      <span>
+        <woot-switch v-model="businessHoursSelected" />
+      </span>
+    </div>
   </div>
 </template>
 <script>
@@ -105,6 +111,7 @@ export default {
       customDateRange: [new Date(), new Date()],
       currentSelectedFilter: null,
       selectedAgents: [],
+      businessHoursSelected: false,
     };
   },
   computed: {
@@ -153,6 +160,9 @@ export default {
     filterItemsList() {
       this.currentSelectedFilter = this.selectedGroupByFilter;
     },
+    businessHoursSelected() {
+      this.$emit('business-hours-toggle', this.businessHoursSelected);
+    },
   },
   mounted() {
     this.onDateRangeChange();
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 857a74363..89d1fd4a9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -145,6 +145,12 @@
         @input="changeGroupByFilterSelection"
       />
     </div>
+    <div class="small-12 medium-3 business-hours">
+      <span class="business-hours-text">{{ $t('REPORT.BUSINESS_HOURS') }}</span>
+      <span>
+        <woot-switch v-model="businessHoursSelected" />
+      </span>
+    </div>
   </div>
 </template>
 <script>
@@ -188,6 +194,7 @@ export default {
       dateRange: this.$t('REPORT.DATE_RANGE'),
       customDateRange: [new Date(), new Date()],
       currentSelectedGroupByFilter: null,
+      businessHoursSelected: false,
     };
   },
   computed: {
@@ -249,6 +256,9 @@ export default {
     groupByFilterItemsList() {
       this.currentSelectedGroupByFilter = this.selectedGroupByFilter;
     },
+    businessHoursSelected() {
+      this.$emit('business-hours-toggle', this.businessHoursSelected);
+    },
   },
   mounted() {
     this.onDateRangeChange();
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 c5cf3993b..7a54765b8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -17,6 +17,7 @@
       @date-range-change="onDateRangeChange"
       @filter-change="onFilterChange"
       @group-by-filter-change="onGroupByFilterChange"
+      @business-hours-toggle="onBusinessHoursToggle"
     />
     <div>
       <div v-if="filterItemsList.length" class="row">
@@ -100,6 +101,7 @@ export default {
       groupBy: GROUP_BY_FILTER[1],
       groupByfilterItemsList: this.$t('REPORT.GROUP_BY_DAY_OPTIONS'),
       selectedGroupByFilter: null,
+      businessHours: false,
     };
   },
   computed: {
@@ -202,19 +204,20 @@ export default {
   methods: {
     fetchAllData() {
       if (this.selectedFilter) {
-        const { from, to, groupBy } = this;
+        const { from, to, groupBy, businessHours } = this;
         this.$store.dispatch('fetchAccountSummary', {
           from,
           to,
           type: this.type,
           id: this.selectedFilter.id,
           groupBy: groupBy.period,
+          businessHours,
         });
         this.fetchChartData();
       }
     },
     fetchChartData() {
-      const { from, to, groupBy } = this;
+      const { from, to, groupBy, businessHours } = this;
       this.$store.dispatch('fetchAccountReport', {
         metric: this.metrics[this.currentSelection].KEY,
         from,
@@ -222,6 +225,7 @@ export default {
         type: this.type,
         id: this.selectedFilter.id,
         groupBy: groupBy.period,
+        businessHours,
       });
     },
     downloadReports() {
@@ -288,6 +292,10 @@ export default {
           return this.$t('REPORT.GROUP_BY_DAY_OPTIONS');
       }
     },
+    onBusinessHoursToggle(value) {
+      this.businessHours = value;
+      this.fetchAllData();
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index cb1efe3ff..67f468add 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -42,7 +42,8 @@ export const actions = {
       reportObj.to,
       reportObj.type,
       reportObj.id,
-      reportObj.groupBy
+      reportObj.groupBy,
+      reportObj.businessHours
     ).then(accountReport => {
       let { data } = accountReport;
       data = data.filter(
@@ -69,7 +70,8 @@ export const actions = {
       reportObj.to,
       reportObj.type,
       reportObj.id,
-      reportObj.groupBy
+      reportObj.groupBy,
+      reportObj.businessHours
     )
       .then(accountSummary => {
         commit(types.default.SET_ACCOUNT_SUMMARY, accountSummary.data);
diff --git a/app/listeners/reporting_event_listener.rb b/app/listeners/reporting_event_listener.rb
index 05aa1db4b..d87b6574b 100644
--- a/app/listeners/reporting_event_listener.rb
+++ b/app/listeners/reporting_event_listener.rb
@@ -1,4 +1,5 @@
 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
@@ -6,10 +7,14 @@ class ReportingEventListener < BaseListener
     reporting_event = ReportingEvent.new(
       name: 'conversation_resolved',
       value: time_to_resolve,
+      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
+      conversation_id: conversation.id,
+      event_start_time: conversation.created_at,
+      event_end_time: conversation.updated_at
     )
     reporting_event.save
   end
@@ -22,10 +27,14 @@ class ReportingEventListener < BaseListener
     reporting_event = ReportingEvent.new(
       name: 'first_response',
       value: first_response_time,
+      value_in_business_hours: business_hours(conversation.inbox, conversation.created_at,
+                                              message.created_at),
       account_id: conversation.account_id,
       inbox_id: conversation.inbox_id,
       user_id: conversation.assignee_id,
-      conversation_id: conversation.id
+      conversation_id: conversation.id,
+      event_start_time: conversation.created_at,
+      event_end_time: message.created_at
     )
     reporting_event.save
   end
diff --git a/app/models/reporting_event.rb b/app/models/reporting_event.rb
index 288b15504..02f6e4d20 100644
--- a/app/models/reporting_event.rb
+++ b/app/models/reporting_event.rb
@@ -2,15 +2,18 @@
 #
 # Table name: reporting_events
 #
-#  id              :bigint           not null, primary key
-#  name            :string
-#  value           :float
-#  created_at      :datetime         not null
-#  updated_at      :datetime         not null
-#  account_id      :integer
-#  conversation_id :integer
-#  inbox_id        :integer
-#  user_id         :integer
+#  id                      :bigint           not null, primary key
+#  event_end_time          :datetime
+#  event_start_time        :datetime
+#  name                    :string
+#  value                   :float
+#  value_in_business_hours :float
+#  created_at              :datetime         not null
+#  updated_at              :datetime         not null
+#  account_id              :integer
+#  conversation_id         :integer
+#  inbox_id                :integer
+#  user_id                 :integer
 #
 # Indexes
 #
diff --git a/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb b/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb
new file mode 100644
index 000000000..4b8138eb7
--- /dev/null
+++ b/db/migrate/20220329131401_add_value_in_business_hours_to_reporting_event.rb
@@ -0,0 +1,9 @@
+class AddValueInBusinessHoursToReportingEvent < ActiveRecord::Migration[6.1]
+  def change
+    change_table :reporting_events, bulk: true do |t|
+      t.float :value_in_business_hours, default: nil
+      t.datetime :event_start_time, default: nil
+      t.datetime :event_end_time, default: nil
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c99c2b70c..84619b696 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -657,6 +657,9 @@ ActiveRecord::Schema.define(version: 2022_04_05_092033) do
     t.integer "conversation_id"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.float "value_in_business_hours"
+    t.datetime "event_start_time"
+    t.datetime "event_end_time"
     t.index ["account_id"], name: "index_reporting_events_on_account_id"
     t.index ["created_at"], name: "index_reporting_events_on_created_at"
     t.index ["inbox_id"], name: "index_reporting_events_on_inbox_id"
diff --git a/spec/listeners/reporting_event_listener_spec.rb b/spec/listeners/reporting_event_listener_spec.rb
index 399815014..d3b6bd35d 100644
--- a/spec/listeners/reporting_event_listener_spec.rb
+++ b/spec/listeners/reporting_event_listener_spec.rb
@@ -17,6 +17,21 @@ describe ReportingEventListener do
       listener.conversation_resolved(event)
       expect(account.reporting_events.where(name: 'conversation_resolved').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_resolved event with business hour value' do
+        event = Events::Base.new('conversation.resolved', Time.zone.now, conversation: new_conversation)
+        listener.conversation_resolved(event)
+        expect(account.reporting_events.where(name: 'conversation_resolved')[0]['value_in_business_hours']).to be 144_000.0
+      end
+    end
   end
 
   describe '#first_reply_created' do
@@ -26,5 +41,24 @@ describe ReportingEventListener do
       listener.first_reply_created(event)
       expect(account.reporting_events.where(name: 'first_response').count).to eql previous_count + 1
     end
+
+    context 'when business hours enabled for inbox' do
+      let(:conversation_created_at) { Time.zone.parse('March 20, 2022 00:00') }
+      let(:message_created_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: conversation_created_at, account: account, inbox: new_inbox, assignee: user)
+      end
+      let!(:new_message) do
+        create(:message, message_type: 'outgoing', created_at: message_created_at,
+                         account: account, inbox: new_inbox, conversation: new_conversation)
+      end
+
+      it 'creates first_response event with business hour value' do
+        event = Events::Base.new('first.reply.created', Time.zone.now, message: new_message)
+        listener.first_reply_created(event)
+        expect(account.reporting_events.where(name: 'first_response')[0]['value_in_business_hours']).to be 144_000.0
+      end
+    end
   end
 end

From 727993aa193170eb7d59b35098fd3041f7e2c101 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 8 Apr 2022 14:02:26 +0530
Subject: [PATCH 032/177] feat: Add toggle button component(#4419)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../components/buttons/ToggleButton.vue       | 66 +++++++++++++++++++
 .../dashboard/settings/automation/Index.vue   | 56 ++--------------
 2 files changed, 71 insertions(+), 51 deletions(-)
 create mode 100644 app/javascript/dashboard/components/buttons/ToggleButton.vue

diff --git a/app/javascript/dashboard/components/buttons/ToggleButton.vue b/app/javascript/dashboard/components/buttons/ToggleButton.vue
new file mode 100644
index 000000000..8d80ccd94
--- /dev/null
+++ b/app/javascript/dashboard/components/buttons/ToggleButton.vue
@@ -0,0 +1,66 @@
+<template>
+  <button
+    type="button"
+    class="toggle-button"
+    :class="{ active }"
+    role="switch"
+    :aria-checked="active.toString()"
+    @click="onClick"
+  >
+    <span aria-hidden="true" :class="{ active }"></span>
+  </button>
+</template>
+
+<script>
+export default {
+  props: {
+    active: { type: Boolean, default: false },
+  },
+  methods: {
+    onClick(e) {
+      this.$emit('click', e);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.toggle-button {
+  --toggle-button-box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px,
+    rgba(59, 130, 246, 0.5) 0px 0px 0px 0px, rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
+    rgba(0, 0, 0, 0.06) 0px 1px 2px 0px;
+  background-color: var(--s-200);
+  border-radius: var(--border-radius-large);
+  border: 2px solid transparent;
+  cursor: pointer;
+  display: flex;
+  flex-shrink: 0;
+  height: 19px;
+  position: relative;
+  transition-duration: 200ms;
+  transition-property: background-color;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  width: 34px;
+
+  &.active {
+    background-color: var(--w-500);
+  }
+
+  span {
+    --space-one-point-five: 1.5rem;
+    background-color: var(--white);
+    border-radius: 100%;
+    box-shadow: var(--toggle-button-box-shadow);
+    display: inline-block;
+    height: var(--space-one-point-five);
+    transform: translate(0, 0);
+    transition-duration: 200ms;
+    transition-property: transform;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    width: var(--space-one-point-five);
+
+    &.active {
+      transform: translate(var(--space-one-point-five), var(--space-zero));
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 811fc95c6..5157c4dfc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -34,19 +34,10 @@
               <td>{{ automation.name }}</td>
               <td>{{ automation.description }}</td>
               <td>
-                <button
-                  type="button"
-                  class="toggle-button"
-                  :class="{ active: automation.active }"
-                  role="switch"
-                  :aria-checked="automation.active.toString()"
+                <toggle-button
+                  :active="automation.active"
                   @click="toggleAutomation(automation, automation.active)"
-                >
-                  <span
-                    aria-hidden="true"
-                    :class="{ active: automation.active }"
-                  ></span>
-                </button>
+                />
               </td>
               <td>{{ readableTime(automation.created_on) }}</td>
               <td class="button-wrapper">
@@ -140,11 +131,12 @@ import AddAutomationRule from './AddAutomationRule.vue';
 import EditAutomationRule from './EditAutomationRule.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import timeMixin from 'dashboard/mixins/time';
-
+import ToggleButton from 'dashboard/components/buttons/ToggleButton';
 export default {
   components: {
     AddAutomationRule,
     EditAutomationRule,
+    ToggleButton,
   },
   mixins: [alertMixin, timeMixin],
   data() {
@@ -238,7 +230,6 @@ export default {
           mode === 'EDIT'
             ? this.$t('AUTOMATION.EDIT.API.SUCCESS_MESSAGE')
             : this.$t('AUTOMATION.ADD.API.SUCCESS_MESSAGE');
-
         await await this.$store.dispatch(action, payload);
         this.showAlert(this.$t(successMessage));
         this.hideAddPopup();
@@ -290,41 +281,4 @@ export default {
 .automation__status-checkbox {
   margin: 0;
 }
-.toggle-button {
-  background-color: var(--s-200);
-  position: relative;
-  display: inline-flex;
-  height: 19px;
-  width: 34px;
-  border: 2px solid transparent;
-  border-radius: var(--border-radius-large);
-  cursor: pointer;
-  transition-property: background-color;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 200ms;
-  flex-shrink: 0;
-}
-
-.toggle-button.active {
-  background-color: var(--w-500);
-}
-
-.toggle-button span {
-  --space-one-point-five: 1.5rem;
-  height: var(--space-one-point-five);
-  width: var(--space-one-point-five);
-  display: inline-block;
-  background-color: var(--white);
-  box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px,
-    rgba(59, 130, 246, 0.5) 0px 0px 0px 0px, rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
-    rgba(0, 0, 0, 0.06) 0px 1px 2px 0px;
-  transform: translate(0, 0);
-  border-radius: 100%;
-  transition-property: transform;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 200ms;
-}
-.toggle-button span.active {
-  transform: translate(var(--space-one-point-five), var(--space-zero));
-}
 </style>

From 7e5ec7925c35188d0c67cb9ce06afd213aeb5023 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 8 Apr 2022 14:53:37 +0530
Subject: [PATCH 033/177] feat: Add `phone_number` & `custom_attributes` in
 create conversation end point (#4421)

---
 .../api/v1/widget/base_controller.rb          | 26 ++++++++++++++++---
 .../api/v1/widget/conversations_controller.rb | 11 ++++++--
 app/javascript/widget/api/endPoints.js        |  2 ++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index 8df4737db..67132869d 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -39,7 +39,8 @@ class Api::V1::Widget::BaseController < ApplicationController
         browser: browser_params,
         referer: permitted_params[:message][:referer_url],
         initiated_at: timestamp_params
-      }
+      },
+      custom_attributes: permitted_params[:custom_attributes].presence || {}
     }
   end
 
@@ -52,16 +53,33 @@ class Api::V1::Widget::BaseController < ApplicationController
         mergee_contact: @contact
       ).perform
     else
-      @contact.update!(email: email, name: contact_name)
+      @contact.update!(email: email)
+    end
+  end
+
+  def update_contact_phone_number(phone_number)
+    contact_with_phone_number = @current_account.contacts.find_by(phone_number: phone_number)
+    if contact_with_phone_number
+      @contact = ::ContactMergeAction.new(
+        account: @current_account,
+        base_contact: contact_with_phone_number,
+        mergee_contact: @contact
+      ).perform
+    else
+      @contact.update!(phone_number: phone_number)
     end
   end
 
   def contact_email
-    permitted_params[:contact][:email].downcase
+    permitted_params[:contact][:email].downcase if permitted_params[:contact].present?
   end
 
   def contact_name
-    params[:contact][:name] || contact_email.split('@')[0]
+    params[:contact][:name] || contact_email.split('@')[0] if contact_email.present?
+  end
+
+  def contact_phone_number
+    params[:contact][:phone_number]
   end
 
   def browser_params
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index 3b0a460e4..ef2422bef 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -7,12 +7,18 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
 
   def create
     ActiveRecord::Base.transaction do
-      update_contact(contact_email) if @contact.email.blank? && contact_email.present?
+      process_update_contact
       @conversation = create_conversation
       conversation.messages.create(message_params)
     end
   end
 
+  def process_update_contact
+    update_contact(contact_email) if @contact.email.blank? && contact_email.present?
+    update_contact_phone_number(contact_phone_number) if @contact.phone_number.blank? && contact_phone_number.present?
+    @contact.update!(name: contact_name) if contact_name.present?
+  end
+
   def update_last_seen
     head :ok && return if conversation.nil?
 
@@ -63,6 +69,7 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id])
+    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id],
+                                                               custom_attributes: {})
   end
 end
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index df37f2363..870275382 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -10,12 +10,14 @@ const createConversation = params => {
       contact: {
         name: params.fullName,
         email: params.emailAddress,
+        phone_number: params.phoneNumber,
       },
       message: {
         content: params.message,
         timestamp: new Date().toString(),
         referer_url: referrerURL,
       },
+      custom_attributes: params.customAttributes,
     },
   };
 };

From bc7bcc20b8ff4b1f3a302f13bc028958876d4c4d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 8 Apr 2022 15:52:39 +0530
Subject: [PATCH 034/177] Revert "feat: Adds support for draft in conversation
 reply box (#4205)" (#4425)

This reverts commit 5ea043605120677824ff948ea023f03e191473c2.
---
 .../dashboard/components/app/UpdateBanner.vue | 15 ++--
 .../components/widgets/WootWriter/Editor.vue  |  4 +-
 .../widgets/conversation/ReplyBox.vue         | 82 +------------------
 .../dashboard/helper/localStorage.js          | 43 ++++------
 .../dashboard/store/modules/auth.js           |  9 +-
 .../store/modules/conversations/helpers.js    |  7 --
 .../specs/conversations/helpers.spec.js       |  7 --
 app/javascript/dashboard/store/utils/api.js   |  6 --
 app/javascript/shared/helpers/TimeHelpers.js  | 21 -----
 .../shared/helpers/specs/TimeHelpers.spec.js  | 32 --------
 10 files changed, 24 insertions(+), 202 deletions(-)
 delete mode 100644 app/javascript/shared/helpers/TimeHelpers.js
 delete mode 100644 app/javascript/shared/helpers/specs/TimeHelpers.spec.js

diff --git a/app/javascript/dashboard/components/app/UpdateBanner.vue b/app/javascript/dashboard/components/app/UpdateBanner.vue
index 63c7bd457..2e4b00031 100644
--- a/app/javascript/dashboard/components/app/UpdateBanner.vue
+++ b/app/javascript/dashboard/components/app/UpdateBanner.vue
@@ -12,11 +12,12 @@
 </template>
 <script>
 import Banner from 'dashboard/components/ui/Banner.vue';
-import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../helper/localStorage';
+import LocalStorage from '../../helper/localStorage';
 import { mapGetters } from 'vuex';
 import adminMixin from 'dashboard/mixins/isAdmin';
 
 const semver = require('semver');
+const dismissedUpdates = new LocalStorage('dismissedUpdates');
 
 export default {
   components: {
@@ -56,22 +57,16 @@ export default {
   },
   methods: {
     isVersionNotificationDismissed(version) {
-      const dismissedVersions =
-        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
-      return dismissedVersions.includes(version);
+      return dismissedUpdates.get().includes(version);
     },
     dismissUpdateBanner() {
-      let updatedDismissedItems =
-        LocalStorage.get(LOCAL_STORAGE_KEYS.DISMISSED_UPDATES) || [];
+      let updatedDismissedItems = dismissedUpdates.get();
       if (updatedDismissedItems instanceof Array) {
         updatedDismissedItems.push(this.latestChatwootVersion);
       } else {
         updatedDismissedItems = [this.latestChatwootVersion];
       }
-      LocalStorage.set(
-        LOCAL_STORAGE_KEYS.DISMISSED_UPDATES,
-        updatedDismissedItems
-      );
+      dismissedUpdates.store(updatedDismissedItems);
       this.latestChatwootVersion = this.globalConfig.appVersion;
     },
   },
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 45e8fb86a..1ac0ec333 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -148,8 +148,8 @@ export default {
     showCannedMenu(updatedValue) {
       this.$emit('toggle-canned-menu', !this.isPrivate && updatedValue);
     },
-    value(newValue = '', oldValue = '') {
-      if (newValue !== oldValue) {
+    value(newValue = '') {
+      if (newValue !== this.lastValue) {
         const { tr } = this.state;
         if (this.isFormatMode) {
           this.state = createState(
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index d153b53aa..99321eff8 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -137,7 +137,6 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
-import { debounce } from 'shared/helpers/TimeHelpers';
 
 import {
   isEscape,
@@ -150,8 +149,6 @@ import inboxMixin from 'shared/mixins/inboxMixin';
 import uiSettingsMixin from 'dashboard/mixins/uiSettings';
 import { DirectUpload } from 'activestorage';
 import { frontendURL } from '../../../helper/URLHelper';
-import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../../helper/localStorage';
-import { trimMessage } from '../../../store/modules/conversations/helpers';
 
 export default {
   components: {
@@ -204,7 +201,6 @@ export default {
       hasSlashCommand: false,
       bccEmails: '',
       ccEmails: '',
-      doAutoSaveDraft: () => {},
     };
   },
   computed: {
@@ -410,19 +406,10 @@ export default {
     profilePath() {
       return frontendURL(`accounts/${this.accountId}/profile/settings`);
     },
-    conversationId() {
-      return this.currentChat.id;
-    },
   },
   watch: {
-    currentChat(conversation, oldConversation) {
+    currentChat(conversation) {
       const { can_reply: canReply } = conversation;
-
-      if (oldConversation.id !== conversation.id) {
-        this.setToDraft(oldConversation.id, this.replyType);
-        this.getFromDraft();
-      }
-
       if (this.isOnPrivateNote) {
         return;
       }
@@ -447,87 +434,22 @@ export default {
         this.mentionSearchKey = '';
         this.showMentions = false;
       }
-      this.doAutoSaveDraft();
-    },
-    replyType(updatedReplyType, oldReplyType) {
-      this.setToDraft(this.conversationId, oldReplyType);
-      this.getFromDraft();
     },
   },
 
   mounted() {
-    this.getFromDraft();
     // Donot use the keyboard listener mixin here as the events here are supposed to be
     // working even if input/textarea is focussed.
     document.addEventListener('keydown', this.handleKeyEvents);
     document.addEventListener('paste', this.onPaste);
 
     this.setCCEmailFromLastChat();
-    this.doAutoSaveDraft = debounce(
-      () => {
-        this.saveDraft(this.conversationId, this.replyType);
-      },
-      5000,
-      false
-    );
   },
   destroyed() {
     document.removeEventListener('keydown', this.handleKeyEvents);
     document.removeEventListener('paste', this.onPaste);
   },
   methods: {
-    getSavedDraftMessages() {
-      return LocalStorage.get(LOCAL_STORAGE_KEYS.DRAFT_MESSAGES) || {};
-    },
-    saveDraft(conversationId, replyType) {
-      if (this.message || this.message === '') {
-        const savedDraftMessages = this.getSavedDraftMessages();
-        const key = `draft-${conversationId}-${replyType}`;
-        const draftToSave = trimMessage(this.message || '');
-        const {
-          [key]: currentDraft,
-          ...restOfDraftMessages
-        } = savedDraftMessages;
-
-        const updatedDraftMessages = draftToSave
-          ? {
-              ...restOfDraftMessages,
-              [key]: draftToSave,
-            }
-          : restOfDraftMessages;
-
-        LocalStorage.set(
-          LOCAL_STORAGE_KEYS.DRAFT_MESSAGES,
-          updatedDraftMessages
-        );
-      }
-    },
-    setToDraft(conversationId, replyType) {
-      this.saveDraft(conversationId, replyType);
-      this.message = '';
-    },
-    getFromDraft() {
-      if (this.conversationId) {
-        try {
-          const key = `draft-${this.conversationId}-${this.replyType}`;
-          const savedDraftMessages = this.getSavedDraftMessages();
-          this.message = `${savedDraftMessages[key] || ''}`;
-        } catch (error) {
-          this.message = '';
-        }
-      }
-    },
-    removeFromDraft() {
-      if (this.conversationId) {
-        const key = `draft-${this.conversationId}-${this.replyType}`;
-        const draftMessages = this.getSavedDraftMessages();
-        const { [key]: toBeRemoved, ...updatedDraftMessages } = draftMessages;
-        LocalStorage.set(
-          LOCAL_STORAGE_KEYS.DRAFT_MESSAGES,
-          updatedDraftMessages
-        );
-      }
-    },
     onPaste(e) {
       const data = e.clipboardData.files;
       if (!this.showRichContentEditor && data.length !== 0) {
@@ -615,7 +537,6 @@ export default {
             messagePayload
           );
           bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
-          this.removeFromDraft();
         } catch (error) {
           const errorMessage =
             error?.response?.data?.error ||
@@ -687,7 +608,6 @@ export default {
     },
     onBlur() {
       this.isFocused = false;
-      this.saveDraft(this.conversationId, this.replyType);
     },
     onFocus() {
       this.isFocused = true;
diff --git a/app/javascript/dashboard/helper/localStorage.js b/app/javascript/dashboard/helper/localStorage.js
index cbc562417..cc963aa48 100644
--- a/app/javascript/dashboard/helper/localStorage.js
+++ b/app/javascript/dashboard/helper/localStorage.js
@@ -1,32 +1,17 @@
-export const LOCAL_STORAGE_KEYS = {
-  DISMISSED_UPDATES: 'dismissedUpdates',
-  DRAFT_MESSAGES: 'draftMessages',
-};
+class LocalStorage {
+  constructor(key) {
+    this.key = key;
+  }
 
-export const LocalStorage = {
-  clearAll() {
-    window.localStorage.clear();
-  },
+  store(allItems) {
+    localStorage.setItem(this.key, JSON.stringify(allItems));
+    localStorage.setItem(this.key + ':ts', Date.now());
+  }
 
-  get(key) {
-    const value = window.localStorage.getItem(key);
-    try {
-      return typeof value === 'string' ? JSON.parse(value) : value;
-    } catch (error) {
-      return value;
-    }
-  },
-  set(key, value) {
-    if (typeof value === 'object') {
-      window.localStorage.setItem(key, JSON.stringify(value));
-    } else {
-      window.localStorage.setItem(key, value);
-    }
-    window.localStorage.setItem(key + ':ts', Date.now());
-  },
+  get() {
+    let stored = localStorage.getItem(this.key);
+    return JSON.parse(stored) || [];
+  }
+}
 
-  remove(key) {
-    window.localStorage.removeItem(key);
-    window.localStorage.removeItem(key + ':ts');
-  },
-};
+export default LocalStorage;
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index f9a45646a..5b2feef11 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -5,12 +5,7 @@ import * as types from '../mutation-types';
 import authAPI from '../../api/auth';
 import createAxios from '../../helper/APIHelper';
 import actionCable from '../../helper/actionCable';
-import {
-  setUser,
-  getHeaderExpiry,
-  clearCookiesOnLogout,
-  clearLocalStorageOnLogout,
-} from '../utils/api';
+import { setUser, getHeaderExpiry, clearCookiesOnLogout } from '../utils/api';
 import { getLoginRedirectURL } from '../../helper/URLHelper';
 
 const state = {
@@ -99,9 +94,9 @@ export const actions = {
         .login(credentials)
         .then(response => {
           commit(types.default.SET_CURRENT_USER);
-          clearLocalStorageOnLogout();
           window.axios = createAxios(axios);
           actionCable.init(Vue);
+
           window.location = getLoginRedirectURL(ssoAccountId, response.data);
           resolve();
         })
diff --git a/app/javascript/dashboard/store/modules/conversations/helpers.js b/app/javascript/dashboard/store/modules/conversations/helpers.js
index 1a24cdde5..be136af54 100644
--- a/app/javascript/dashboard/store/modules/conversations/helpers.js
+++ b/app/javascript/dashboard/store/modules/conversations/helpers.js
@@ -35,10 +35,3 @@ export const applyPageFilters = (conversation, filters) => {
 
   return shouldFilter;
 };
-
-export const trimMessage = (content = '', maxLength = 1024) => {
-  if (content.length > maxLength) {
-    return content.substring(0, maxLength);
-  }
-  return content;
-};
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
index 599826a99..af25f5527 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/helpers.spec.js
@@ -1,7 +1,6 @@
 import {
   findPendingMessageIndex,
   applyPageFilters,
-  trimMessage,
 } from '../../conversations/helpers';
 
 const conversationList = [
@@ -120,9 +119,3 @@ describe('#applyPageFilters', () => {
     });
   });
 });
-
-describe('#trimMessage', () => {
-  expect(trimMessage('Hello world', 5)).toEqual('Hello');
-  expect(trimMessage('Hello', 5)).toEqual('Hello');
-  expect(trimMessage(undefined, 5)).toEqual('');
-});
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 9077a43c4..37fd68c7b 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -9,7 +9,6 @@ import {
   CHATWOOT_RESET,
   CHATWOOT_SET_USER,
 } from '../../helper/scriptHelpers';
-import { LocalStorage, LOCAL_STORAGE_KEYS } from '../../helper/localStorage';
 
 Cookies.defaults = { sameSite: 'Lax' };
 
@@ -44,15 +43,10 @@ export const clearBrowserSessionCookies = () => {
   Cookies.remove('user');
 };
 
-export const clearLocalStorageOnLogout = () => {
-  LocalStorage.remove(LOCAL_STORAGE_KEYS.DRAFT_MESSAGES);
-};
-
 export const clearCookiesOnLogout = () => {
   window.bus.$emit(CHATWOOT_RESET);
   window.bus.$emit(ANALYTICS_RESET);
   clearBrowserSessionCookies();
-  clearLocalStorageOnLogout();
   const globalConfig = window.globalConfig || {};
   const logoutRedirectLink =
     globalConfig.LOGOUT_REDIRECT_LINK || frontendURL('login');
diff --git a/app/javascript/shared/helpers/TimeHelpers.js b/app/javascript/shared/helpers/TimeHelpers.js
deleted file mode 100644
index 8473b0f5c..000000000
--- a/app/javascript/shared/helpers/TimeHelpers.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Returns a function, that, as long as it continues to be invoked, will not
-// be triggered. The function will be called after it stops being called for
-// N milliseconds. If `immediate` is passed, trigger the function on the
-// leading edge, instead of the trailing.
-
-export const debounce = (func, delay, immediate) => {
-  let timerId;
-  return (...args) => {
-    const boundFunc = func.bind(this, ...args);
-    clearTimeout(timerId);
-    if (immediate && !timerId) {
-      boundFunc();
-    }
-    const calleeFunc = immediate
-      ? () => {
-          timerId = null;
-        }
-      : boundFunc;
-    timerId = setTimeout(calleeFunc, delay);
-  };
-};
diff --git a/app/javascript/shared/helpers/specs/TimeHelpers.spec.js b/app/javascript/shared/helpers/specs/TimeHelpers.spec.js
deleted file mode 100644
index e6a94b090..000000000
--- a/app/javascript/shared/helpers/specs/TimeHelpers.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import { debounce } from '../TimeHelpers';
-// Tell Jest to mock all timeout functions
-jest.useFakeTimers('modern');
-
-describe('debounce', () => {
-  test('execute just once with immediate false', () => {
-    let func = jest.fn();
-    let debouncedFunc = debounce(func, 1000);
-
-    for (let i = 0; i < 100; i += 1) {
-      debouncedFunc();
-    }
-
-    // Fast-forward time
-    jest.runAllTimers();
-
-    expect(func).toBeCalledTimes(1);
-  });
-
-  test('execute just once with immediate true', () => {
-    let func = jest.fn();
-    let debouncedFunc = debounce(func, 1000, true);
-
-    for (let i = 0; i < 100; i += 1) {
-      debouncedFunc();
-    }
-
-    jest.runAllTimers();
-
-    expect(func).toBeCalledTimes(1);
-  });
-});

From b1efcde495179ec4c3fa5eaa7bbe78e7872eb9cc Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 8 Apr 2022 18:25:08 +0530
Subject: [PATCH 035/177] feat: Remove duplicate Switch Component (#4427)

---
 .../components/buttons/ToggleButton.vue       | 66 -------------
 .../dashboard/components/ui/Switch.vue        | 98 +++++++++++--------
 .../dashboard/settings/automation/Index.vue   |  9 +-
 .../reports/components/FilterSelector.vue     |  4 +-
 .../reports/components/ReportFilters.vue      |  8 +-
 5 files changed, 67 insertions(+), 118 deletions(-)
 delete mode 100644 app/javascript/dashboard/components/buttons/ToggleButton.vue

diff --git a/app/javascript/dashboard/components/buttons/ToggleButton.vue b/app/javascript/dashboard/components/buttons/ToggleButton.vue
deleted file mode 100644
index 8d80ccd94..000000000
--- a/app/javascript/dashboard/components/buttons/ToggleButton.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <button
-    type="button"
-    class="toggle-button"
-    :class="{ active }"
-    role="switch"
-    :aria-checked="active.toString()"
-    @click="onClick"
-  >
-    <span aria-hidden="true" :class="{ active }"></span>
-  </button>
-</template>
-
-<script>
-export default {
-  props: {
-    active: { type: Boolean, default: false },
-  },
-  methods: {
-    onClick(e) {
-      this.$emit('click', e);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.toggle-button {
-  --toggle-button-box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px,
-    rgba(59, 130, 246, 0.5) 0px 0px 0px 0px, rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
-    rgba(0, 0, 0, 0.06) 0px 1px 2px 0px;
-  background-color: var(--s-200);
-  border-radius: var(--border-radius-large);
-  border: 2px solid transparent;
-  cursor: pointer;
-  display: flex;
-  flex-shrink: 0;
-  height: 19px;
-  position: relative;
-  transition-duration: 200ms;
-  transition-property: background-color;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  width: 34px;
-
-  &.active {
-    background-color: var(--w-500);
-  }
-
-  span {
-    --space-one-point-five: 1.5rem;
-    background-color: var(--white);
-    border-radius: 100%;
-    box-shadow: var(--toggle-button-box-shadow);
-    display: inline-block;
-    height: var(--space-one-point-five);
-    transform: translate(0, 0);
-    transition-duration: 200ms;
-    transition-property: transform;
-    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-    width: var(--space-one-point-five);
-
-    &.active {
-      transform: translate(var(--space-one-point-five), var(--space-zero));
-    }
-  }
-}
-</style>
diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index 98755a91b..b0bc32881 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -1,54 +1,66 @@
 <template>
-  <label class="switch" :class="classObject">
-    <input
-      :id="id"
-      v-model="value"
-      class="switch-input"
-      :name="name"
-      :disabled="disabled"
-      type="checkbox"
-    />
-    <div class="switch-paddle" :for="name">
-      <span class="show-for-sr">on off</span>
-    </div>
-  </label>
+  <button
+    type="button"
+    class="toggle-button"
+    :class="{ active: value }"
+    role="switch"
+    :aria-checked="value.toString()"
+    @click="onClick"
+  >
+    <span aria-hidden="true" :class="{ active: value }"></span>
+  </button>
 </template>
 
 <script>
 export default {
   props: {
-    disabled: Boolean,
-    type: { type: String, default: '' },
-    size: { type: String, default: '' },
-    checked: Boolean,
-    name: { type: String, default: '' },
-    id: { type: String, default: '' },
+    value: { type: Boolean, default: false },
   },
-  data() {
-    return {
-      value: null,
-    };
-  },
-  computed: {
-    classObject() {
-      const { type, size, value } = this;
-      return {
-        [`is-${type}`]: type,
-        [`${size}`]: size,
-        checked: value,
-      };
+  methods: {
+    onClick() {
+      this.$emit('input', !this.value);
     },
   },
-  watch: {
-    value(val) {
-      this.$emit('input', val);
-    },
-  },
-  beforeMount() {
-    this.value = this.checked;
-  },
-  mounted() {
-    this.$emit('input', (this.value = !!this.checked));
-  },
 };
 </script>
+<style lang="scss" scoped>
+.toggle-button {
+  --toggle-button-box-shadow: rgb(255, 255, 255) 0px 0px 0px 0px,
+    rgba(59, 130, 246, 0.5) 0px 0px 0px 0px, rgba(0, 0, 0, 0.1) 0px 1px 3px 0px,
+    rgba(0, 0, 0, 0.06) 0px 1px 2px 0px;
+  background-color: var(--s-200);
+  border-radius: var(--border-radius-large);
+  border: 2px solid transparent;
+  cursor: pointer;
+  display: flex;
+  flex-shrink: 0;
+  height: 19px;
+  position: relative;
+  transition-duration: 200ms;
+  transition-property: background-color;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  width: 34px;
+
+  &.active {
+    background-color: var(--w-500);
+  }
+
+  span {
+    --space-one-point-five: 1.5rem;
+    background-color: var(--white);
+    border-radius: 100%;
+    box-shadow: var(--toggle-button-box-shadow);
+    display: inline-block;
+    height: var(--space-one-point-five);
+    transform: translate(0, 0);
+    transition-duration: 200ms;
+    transition-property: transform;
+    transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+    width: var(--space-one-point-five);
+
+    &.active {
+      transform: translate(var(--space-one-point-five), var(--space-zero));
+    }
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 5157c4dfc..f028933cb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -34,9 +34,9 @@
               <td>{{ automation.name }}</td>
               <td>{{ automation.description }}</td>
               <td>
-                <toggle-button
-                  :active="automation.active"
-                  @click="toggleAutomation(automation, automation.active)"
+                <woot-switch
+                  :value="automation.active"
+                  @input="toggleAutomation(automation, automation.active)"
                 />
               </td>
               <td>{{ readableTime(automation.created_on) }}</td>
@@ -131,12 +131,11 @@ import AddAutomationRule from './AddAutomationRule.vue';
 import EditAutomationRule from './EditAutomationRule.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import timeMixin from 'dashboard/mixins/time';
-import ToggleButton from 'dashboard/components/buttons/ToggleButton';
+
 export default {
   components: {
     AddAutomationRule,
     EditAutomationRule,
-    ToggleButton,
   },
   mixins: [alertMixin, timeMixin],
   data() {
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 87a422be0..cadf4078e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -62,7 +62,9 @@
       />
     </div>
     <div class="small-12 medium-3 business-hours">
-      <span class="business-hours-text">{{ $t('REPORT.BUSINESS_HOURS') }}</span>
+      <span class="business-hours-text margin-right-small">
+        {{ $t('REPORT.BUSINESS_HOURS') }}
+      </span>
       <span>
         <woot-switch v-model="businessHoursSelected" />
       </span>
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 89d1fd4a9..0bfeae8a1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -146,9 +146,11 @@
       />
     </div>
     <div class="small-12 medium-3 business-hours">
-      <span class="business-hours-text">{{ $t('REPORT.BUSINESS_HOURS') }}</span>
-      <span>
-        <woot-switch v-model="businessHoursSelected" />
+      <span class="business-hours-text margin-right-small">
+        {{ $t('REPORT.BUSINESS_HOURS') }}
+        <span>
+          <woot-switch v-model="businessHoursSelected" />
+        </span>
       </span>
     </div>
   </div>

From f1ae09d21bf52c7516bf5297832db3a27215d6fe Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 11 Apr 2022 12:35:03 +0530
Subject: [PATCH 036/177] fix: SMTP shouldn't be configurable without IMAP
 enabled (#4428)

* fix: Configure SMTP only if IMAP is enabled
---
 .../dashboard/components/SettingsSection.vue         | 12 ++++++++++++
 .../dashboard/i18n/locale/en/inboxMgmt.json          |  4 +++-
 .../routes/dashboard/settings/inbox/ImapSettings.vue |  8 +++++++-
 .../routes/dashboard/settings/inbox/Settings.vue     |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index 26caff02c..e700e9467 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -7,6 +7,10 @@
       <p class="sub-head">
         {{ subTitle }}
       </p>
+      <p v-if="note">
+        <span class="note">{{ $t('INBOX_MGMT.NOTE') }}</span>
+        {{ note }}
+      </p>
     </div>
     <div class="medium-6 small-12">
       <slot></slot>
@@ -25,6 +29,10 @@ export default {
       type: String,
       required: true,
     },
+    note: {
+      type: String,
+      default: '',
+    },
   },
 };
 </script>
@@ -46,5 +54,9 @@ export default {
   .title--section {
     padding-right: var(--space-large);
   }
+
+  .note {
+    font-weight: var(--font-weight-bold);
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 83a28de43..bf2652e09 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -470,6 +470,7 @@
     "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",
@@ -529,6 +530,7 @@
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
       "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
index 801e6fa98..c404c2872 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
@@ -3,6 +3,7 @@
     <settings-section
       :title="$t('INBOX_MGMT.IMAP.TITLE')"
       :sub-title="$t('INBOX_MGMT.IMAP.SUBTITLE')"
+      :note="$t('INBOX_MGMT.IMAP.NOTE_TEXT')"
     >
       <form @submit.prevent="updateInbox">
         <label for="toggle-imap-enable">
@@ -132,7 +133,7 @@ export default {
     async updateInbox() {
       try {
         this.loading = true;
-        const payload = {
+        let payload = {
           id: this.inbox.id,
           formData: false,
           channel: {
@@ -147,6 +148,11 @@ export default {
               : undefined,
           },
         };
+
+        if (!this.isIMAPEnabled) {
+          payload.channel.smtp_enabled = false;
+        }
+
         await this.$store.dispatch('inboxes/updateInboxIMAP', payload);
         this.showAlert(this.$t('INBOX_MGMT.IMAP.EDIT.SUCCESS_MESSAGE'));
       } catch (error) {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 5b29091f7..16b6b0f74 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -422,7 +422,7 @@
           </settings-section>
         </div>
         <imap-settings :inbox="inbox" />
-        <smtp-settings :inbox="inbox" />
+        <smtp-settings v-if="inbox.imap_enabled" :inbox="inbox" />
       </div>
     </div>
     <div v-if="selectedTabKey === 'preChatForm'">

From fb3ed29c90cc6a31b1e8737f3ef0b98bc93e90e0 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 11 Apr 2022 14:06:44 +0530
Subject: [PATCH 037/177] chore: Add missing test cases in
 `conversations_controller_spec` (#4438)

---
 .../api/v1/widget/conversations/create.json.jbuilder     | 1 +
 .../api/v1/widget/conversations_controller_spec.rb       | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/api/v1/widget/conversations/create.json.jbuilder b/app/views/api/v1/widget/conversations/create.json.jbuilder
index 2576af592..17585c2f8 100644
--- a/app/views/api/v1/widget/conversations/create.json.jbuilder
+++ b/app/views/api/v1/widget/conversations/create.json.jbuilder
@@ -7,4 +7,5 @@ json.messages do
     json.partial! 'api/v1/models/widget_message', resource: message
   end
 end
+json.custom_attributes @conversation.custom_attributes
 json.contact @conversation.contact
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 0d3edb0dd..88f41dea0 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -54,19 +54,22 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
              website_token: web_widget.website_token,
              contact: {
                name: 'contact-name',
-               email: 'contact-email@chatwoot.com'
+               email: 'contact-email@chatwoot.com',
+               phone_number: '+919745313456'
              },
              message: {
                content: 'This is a test message'
-             }
+             },
+             custom_attributes: { order_id: '12345' }
            },
            as: :json
 
       expect(response).to have_http_status(:success)
       json_response = JSON.parse(response.body)
-
       expect(json_response['id']).not_to eq nil
       expect(json_response['contact']['email']).to eq 'contact-email@chatwoot.com'
+      expect(json_response['contact']['phone_number']).to eq '+919745313456'
+      expect(json_response['custom_attributes']['order_id']).to eq '12345'
       expect(json_response['messages'][0]['content']).to eq 'This is a test message'
     end
   end

From 8622740161237398bcafd7384ecac262dfd01940 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 15:10:37 +0530
Subject: [PATCH 038/177] chore(deps): bump moment from 2.29.1 to 2.29.2
 (#4434)

Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

---
updated-dependencies:
- dependency-name: moment
  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 9acb20d6a..b4c4e505c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10167,9 +10167,9 @@ mkdirp@^1.0.3, mkdirp@^1.0.4:
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
 moment@^2.10.2, moment@^2.27.0:
-  version "2.29.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
-  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 move-concurrently@^1.0.1:
   version "1.0.1"

From 9b5eb98c5924201a3aae8e98c62b20b63284eb24 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 11 Apr 2022 15:43:05 +0530
Subject: [PATCH 039/177] feat: Support additional authentication mechanisms
 for SMTP (#4431)

* Support additional authentication mechanisms for SMTP
---
 app/helpers/api/v1/inboxes_helper.rb          |  6 +++-
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  3 +-
 .../dashboard/settings/inbox/SmtpSettings.vue | 23 +++++++++++++++
 app/models/channel/email.rb                   |  2 +-
 app/views/api/v1/models/_inbox.json.jbuilder  |  1 +
 .../v1/accounts/inboxes_controller_spec.rb    | 28 +++++++++++++++++++
 6 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/app/helpers/api/v1/inboxes_helper.rb b/app/helpers/api/v1/inboxes_helper.rb
index 8cdf8d987..7f3b68953 100644
--- a/app/helpers/api/v1/inboxes_helper.rb
+++ b/app/helpers/api/v1/inboxes_helper.rb
@@ -29,8 +29,12 @@ module Api::V1::InboxesHelper
     smtp = Net::SMTP.new(channel_data[:smtp_address], channel_data[:smtp_port])
 
     set_smtp_encryption(channel_data, smtp)
+    check_smtp_connection(channel_data, smtp)
+  end
 
-    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_email], channel_data[:smtp_password], :login)
+  def check_smtp_connection(channel_data, smtp)
+    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_email], channel_data[:smtp_password],
+               channel_data[:smtp_authentication]&.to_sym || :login)
     smtp.finish unless smtp&.nil?
   end
 
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index bf2652e09..b2a054ebc 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -529,7 +529,8 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
     },
     "NOTE": "Note: "
   }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
index 21a8955ef..92b9a5446 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
@@ -69,6 +69,13 @@
             :options="openSSLVerifyModes"
             :action="handleSSLModeChange"
           />
+          <single-select-dropdown
+            class="medium-9 columns"
+            :label="$t('INBOX_MGMT.SMTP.AUTH_MECHANISM')"
+            :selected="authMechanism"
+            :options="authMechanisms"
+            :action="handleAuthMechanismChange"
+          />
         </div>
         <woot-submit-button
           :button-text="$t('INBOX_MGMT.SMTP.UPDATE')"
@@ -112,6 +119,7 @@ export default {
       ssl: false,
       starttls: true,
       openSSLVerifyMode: 'none',
+      authMechanism: 'login',
       encryptionProtocols: [
         { id: 'ssl', title: 'SSL/TLS', checked: false },
         { id: 'starttls', title: 'STARTTLS', checked: true },
@@ -122,6 +130,15 @@ export default {
         { key: 3, value: 'client_once' },
         { key: 4, value: 'fail_if_no_peer_cert' },
       ],
+      authMechanisms: [
+        { key: 1, value: 'plain' },
+        { key: 2, value: 'login' },
+        { key: 3, value: 'cram-md5' },
+        { key: 4, value: 'xoauth' },
+        { key: 5, value: 'xoauth2' },
+        { key: 6, value: 'ntlm' },
+        { key: 7, value: 'gssapi' },
+      ],
     };
   },
   validations: {
@@ -157,6 +174,7 @@ export default {
         smtp_enable_starttls_auto,
         smtp_enable_ssl_tls,
         smtp_openssl_verify_mode,
+        smtp_authentication,
       } = this.inbox;
       this.isSMTPEnabled = smtp_enabled;
       this.address = smtp_address;
@@ -167,6 +185,7 @@ export default {
       this.starttls = smtp_enable_starttls_auto;
       this.ssl = smtp_enable_ssl_tls;
       this.openSSLVerifyMode = smtp_openssl_verify_mode;
+      this.authMechanism = smtp_authentication;
 
       this.encryptionProtocols = [
         { id: 'ssl', title: 'SSL/TLS', checked: smtp_enable_ssl_tls },
@@ -189,6 +208,9 @@ export default {
     handleSSLModeChange(mode) {
       this.openSSLVerifyMode = mode;
     },
+    handleAuthMechanismChange(mode) {
+      this.authMechanism = mode;
+    },
     async updateInbox() {
       try {
         const payload = {
@@ -204,6 +226,7 @@ export default {
             smtp_enable_ssl_tls: this.ssl,
             smtp_enable_starttls_auto: this.starttls,
             smtp_openssl_verify_mode: this.openSSLVerifyMode,
+            smtp_authentication: this.authMechanism,
           },
         };
         await this.$store.dispatch('inboxes/updateInboxSMTP', payload);
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index c101bc8c1..1c7f534a4 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -39,7 +39,7 @@ class Channel::Email < ApplicationRecord
   self.table_name = 'channel_email'
   EDITABLE_ATTRS = [:email, :imap_enabled, :imap_email, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
                     :smtp_enabled, :smtp_email, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
-                    :smtp_enable_ssl_tls, :smtp_openssl_verify_mode].freeze
+                    :smtp_enable_ssl_tls, :smtp_openssl_verify_mode, :smtp_authentication].freeze
 
   validates :email, uniqueness: true
   validates :forward_to_email, uniqueness: true
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 671d52072..dded0ec0d 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -70,6 +70,7 @@ if resource.email?
   json.smtp_enable_ssl_tls resource.channel.try(:smtp_enable_ssl_tls)
   json.smtp_enable_starttls_auto resource.channel.try(:smtp_enable_starttls_auto)
   json.smtp_openssl_verify_mode resource.channel.try(:smtp_openssl_verify_mode)
+  json.smtp_authentication resource.channel.try(:smtp_authentication)
 end
 
 ## API Channel Attributes
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 7ebe8434a..420a94835 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -540,6 +540,34 @@ RSpec.describe 'Inboxes API', type: :request do
         expect(email_channel.reload.smtp_enable_ssl_tls).to be true
         expect(email_channel.reload.smtp_openssl_verify_mode).to eq('none')
       end
+
+      it 'updates smtp configuration with authentication mechanism' do
+        smtp_connection = double
+        allow(smtp_connection).to receive(:start).and_return(true)
+        allow(smtp_connection).to receive(:finish).and_return(true)
+        allow(smtp_connection).to receive(:respond_to?).and_return(true)
+        allow(smtp_connection).to receive(:enable_starttls_auto).and_return(true)
+        allow(Net::SMTP).to receive(:new).and_return(smtp_connection)
+
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{email_inbox.id}",
+              headers: admin.create_new_auth_token,
+              params: {
+                channel: {
+                  smtp_enabled: true,
+                  smtp_address: 'smtp.gmail.com',
+                  smtp_port: 587,
+                  smtp_email: 'smtptest@gmail.com',
+                  smtp_authentication: 'plain'
+                }
+              },
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(email_channel.reload.smtp_enabled).to be true
+        expect(email_channel.reload.smtp_address).to eq('smtp.gmail.com')
+        expect(email_channel.reload.smtp_port).to eq(587)
+        expect(email_channel.reload.smtp_authentication).to eq('plain')
+      end
     end
   end
 

From 1194188f135a0b7e59e6db1471e7a5781dde6ba8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 11 Apr 2022 16:43:09 +0530
Subject: [PATCH 040/177] chore: Swagger doc for Conversation meta API (#4394)

fixes: https://github.com/chatwoot/chatwoot/issues/4327
---
 .../resource/extension/conversation/list.yml  |   2 +
 swagger/parameters/index.yml                  |  12 +-
 .../paths/application/conversation/index.yml  |  24 ++-
 .../paths/application/conversation/meta.yml   |  53 ++++++
 swagger/paths/index.yml                       |   2 +
 swagger/swagger.json                          | 159 +++++++++++++++---
 6 files changed, 212 insertions(+), 40 deletions(-)
 create mode 100644 swagger/paths/application/conversation/meta.yml

diff --git a/swagger/definitions/resource/extension/conversation/list.yml b/swagger/definitions/resource/extension/conversation/list.yml
index b1a17baee..426902d4f 100644
--- a/swagger/definitions/resource/extension/conversation/list.yml
+++ b/swagger/definitions/resource/extension/conversation/list.yml
@@ -10,6 +10,8 @@ properties:
             type: number
           unassigned_count:
             type: number
+          assigned_count:
+            type: number
           all_count:
             type: number
       payload:
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index 89b685a41..d69640369 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -16,24 +16,24 @@ hook_id:
 source_id:
   $ref: ./source_id.yml
 
+contact_sort_param:
+  $ref: ./contact_sort.yml
+
 conversation_id:
   $ref: ./conversation_id.yml
 
+custom_filter_id:
+  $ref: ./custom_filter_id.yml
+
 message_id:
   $ref: ./message_id.yml
 
-contact_sort_param:
-  $ref: ./contact_sort.yml
-
 page:
   $ref: ./page.yml
 
 platform_user_id:
   $ref: ./platform_user_id.yml
 
-custom_filter_id:
-  $ref: ./custom_filter_id.yml
-
 report_type:
   $ref: ./report_type.yml
 
diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index 8041a7af6..54650f4d2 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -12,17 +12,22 @@ get:
       in: query
       type: string
       enum: ['me', 'unassigned', 'all', 'assigned']
-      required: true
+      default: 'all'
+      description: Filter conversations by assignee type.
     - name: status
       in: query
       type: string
-      enum: ['open', 'resolved', 'pending']
-      required: true
-    - name: page
+      enum: ['open', 'resolved', 'pending', 'snoozed']
+      default: 'open'
+      description: Filter by conversation status.
+    - name: q
+      in: query
+      type: string
+      description: Filters conversations with messages containing the search term
+    - name: inbox_id
       in: query
       type: integer
-      required: true
-    - name: inbox_id
+    - name: team_id
       in: query
       type: integer
     - name: labels
@@ -30,7 +35,12 @@ get:
       type: array
       items:
         type: string
-
+    - name: page
+      in: query
+      type: integer
+      default: 1
+      description: paginate through conversations
+   
   responses:
     200:
       description: Success
diff --git a/swagger/paths/application/conversation/meta.yml b/swagger/paths/application/conversation/meta.yml
new file mode 100644
index 000000000..9bf32ef03
--- /dev/null
+++ b/swagger/paths/application/conversation/meta.yml
@@ -0,0 +1,53 @@
+parameters:
+  - $ref: '#/parameters/account_id'
+
+get:
+  tags:
+    - Conversations
+  operationId: conversationListMeta
+  description: Get open, unassigned and all Conversation counts
+  summary: Get Conversation Counts
+  parameters:
+    - name: status
+      in: query
+      type: string
+      enum: ['open', 'resolved', 'pending', 'snoozed']
+      default: 'open'
+      description: Filter by conversation status.
+    - name: q
+      in: query
+      type: string
+      description: Filters conversations with messages containing the search term
+    - name: inbox_id
+      in: query
+      type: integer
+    - name: team_id
+      in: query
+      type: integer
+    - name: labels
+      in: query
+      type: array
+      items:
+        type: string
+
+  responses:
+    200:
+      description: Success
+      schema:
+        type: object
+        properties:
+          meta:
+            type: object
+            properties:
+              mine_count:
+                type: number
+              unassigned_count:
+                type: number
+              assigned_count:
+                type: number
+              all_count:
+                type: number
+    400:
+      description: Bad Request Error
+      schema:
+        $ref: '#/definitions/bad_request_error'
\ No newline at end of file
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 87faec643..2175a3154 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -209,6 +209,8 @@
 
 
 # Conversations
+/api/v1/accounts/{account_id}/conversations/meta:
+  $ref: ./application/conversation/meta.yml
 /api/v1/accounts/{account_id}/conversations:
   $ref: ./application/conversation/index.yml
 /api/v1/accounts/{account_id}/conversations/filter:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index b654a669b..c1266fcff 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -2135,6 +2135,93 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/conversations/meta": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Conversations"
+        ],
+        "operationId": "conversationListMeta",
+        "description": "Get open, unassigned and all Conversation counts",
+        "summary": "Get Conversation Counts",
+        "parameters": [
+          {
+            "name": "status",
+            "in": "query",
+            "type": "string",
+            "enum": [
+              "open",
+              "resolved",
+              "pending",
+              "snoozed"
+            ],
+            "default": "open",
+            "description": "Filter by conversation status."
+          },
+          {
+            "name": "q",
+            "in": "query",
+            "type": "string",
+            "description": "Filters conversations with messages containing the search term"
+          },
+          {
+            "name": "inbox_id",
+            "in": "query",
+            "type": "integer"
+          },
+          {
+            "name": "team_id",
+            "in": "query",
+            "type": "integer"
+          },
+          {
+            "name": "labels",
+            "in": "query",
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "object",
+              "properties": {
+                "meta": {
+                  "type": "object",
+                  "properties": {
+                    "mine_count": {
+                      "type": "number"
+                    },
+                    "unassigned_count": {
+                      "type": "number"
+                    },
+                    "assigned_count": {
+                      "type": "number"
+                    },
+                    "all_count": {
+                      "type": "number"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad Request Error",
+            "schema": {
+              "$ref": "#/definitions/bad_request_error"
+            }
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations": {
       "parameters": [
         {
@@ -2159,7 +2246,8 @@
               "all",
               "assigned"
             ],
-            "required": true
+            "default": "all",
+            "description": "Filter conversations by assignee type."
           },
           {
             "name": "status",
@@ -2168,21 +2256,28 @@
             "enum": [
               "open",
               "resolved",
-              "pending"
+              "pending",
+              "snoozed"
             ],
-            "required": true
+            "default": "open",
+            "description": "Filter by conversation status."
           },
           {
-            "name": "page",
+            "name": "q",
             "in": "query",
-            "type": "integer",
-            "required": true
+            "type": "string",
+            "description": "Filters conversations with messages containing the search term"
           },
           {
             "name": "inbox_id",
             "in": "query",
             "type": "integer"
           },
+          {
+            "name": "team_id",
+            "in": "query",
+            "type": "integer"
+          },
           {
             "name": "labels",
             "in": "query",
@@ -2190,6 +2285,13 @@
             "items": {
               "type": "string"
             }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "type": "integer",
+            "default": 1,
+            "description": "paginate through conversations"
           }
         ],
         "responses": {
@@ -5314,6 +5416,9 @@
                 "unassigned_count": {
                   "type": "number"
                 },
+                "assigned_count": {
+                  "type": "number"
+                },
                 "all_count": {
                   "type": "number"
                 }
@@ -5595,20 +5700,6 @@
       "type": "string",
       "description": "Id of the session for which the conversation is created.\n\n\n\n Source Ids can be obtained through contactable inboxes API or via generated.<br/><br/>Website: Chatwoot generated string which can be obtained from webhook events. <br/> Phone Channels(Twilio): Phone number in e164 format <br/> Email Channels: Contact Email address <br/> API Channel: Any Random String"
     },
-    "conversation_id": {
-      "in": "path",
-      "name": "conversation_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the conversation"
-    },
-    "message_id": {
-      "in": "path",
-      "name": "message_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the message"
-    },
     "contact_sort_param": {
       "in": "query",
       "name": "sort",
@@ -5626,6 +5717,27 @@
       "required": false,
       "description": "The attribute by which list should be sorted"
     },
+    "conversation_id": {
+      "in": "path",
+      "name": "conversation_id",
+      "type": "integer",
+      "required": true,
+      "description": "The numeric ID of the conversation"
+    },
+    "custom_filter_id": {
+      "in": "path",
+      "name": "custom_filter_id",
+      "type": "integer",
+      "required": true,
+      "description": "The numeric ID of the custom filter"
+    },
+    "message_id": {
+      "in": "path",
+      "name": "message_id",
+      "type": "integer",
+      "required": true,
+      "description": "The numeric ID of the message"
+    },
     "page": {
       "in": "query",
       "name": "page",
@@ -5641,13 +5753,6 @@
       "required": true,
       "description": "The numeric ID of the user on the platform"
     },
-    "custom_filter_id": {
-      "in": "path",
-      "name": "custom_filter_id",
-      "type": "integer",
-      "required": true,
-      "description": "The numeric ID of the custom filter"
-    },
     "report_type": {
       "in": "query",
       "name": "report_type",

From 3d164271a85b13486b72e40ead24052514febd5c Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 11 Apr 2022 17:27:28 +0530
Subject: [PATCH 041/177] fix: Yellow color shades are inconsistent (#4391)

---
 .../dashboard/assets/scss/_utility-helpers.scss           | 4 ----
 app/javascript/dashboard/components/ui/Banner.vue         | 6 +++---
 app/javascript/dashboard/components/ui/Label.vue          | 2 +-
 app/javascript/dashboard/components/widgets/Thumbnail.vue | 2 +-
 .../widgets/conversation/AvailabilityStatusBadge.vue      | 2 +-
 .../widgets/conversation/ConversationHeader.vue           | 8 ++++++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
index 8a85dc6a5..abea0e28c 100644
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -51,10 +51,6 @@
   background-color: var(--white);
 }
 
-.text-y-800 {
-  color: var(--y-800);
-}
-
 .text-ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
index c9d71bfaf..227b0a37e 100644
--- a/app/javascript/dashboard/components/ui/Banner.vue
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -112,10 +112,10 @@ export default {
   }
 
   &.warning {
-    background: var(--y-800);
-    color: var(--s-600);
+    background: var(--y-600);
+    color: var(--y-500);
     a {
-      color: var(--s-600);
+      color: var(--y-500);
     }
   }
 
diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index 83e55b040..504f6fc9e 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -157,7 +157,7 @@ export default {
   &.warning {
     background: var(--y-100);
     color: var(--y-900);
-    border: 1px solid var(--y-300);
+    border: 1px solid var(--y-200);
     a {
       color: var(--y-900);
     }
diff --git a/app/javascript/dashboard/components/widgets/Thumbnail.vue b/app/javascript/dashboard/components/widgets/Thumbnail.vue
index 5a4a69008..d12a927ef 100644
--- a/app/javascript/dashboard/components/widgets/Thumbnail.vue
+++ b/app/javascript/dashboard/components/widgets/Thumbnail.vue
@@ -209,7 +209,7 @@ export default {
   }
 
   .user-online-status--busy {
-    background: var(--y-700);
+    background: var(--y-500);
   }
 
   .user-online-status--offline {
diff --git a/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue b/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
index 766166fd3..50bcab5ab 100644
--- a/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/AvailabilityStatusBadge.vue
@@ -23,7 +23,7 @@ export default {
     background: var(--s-500);
   }
   &__busy {
-    background: var(--y-400);
+    background: var(--y-500);
   }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 89431eca3..c30f23c20 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -14,8 +14,8 @@
           <fluent-icon
             v-if="!isHMACVerified"
             v-tooltip="$t('CONVERSATION.UNVERIFIED_SESSION')"
-            class="text-y-800"
             size="14"
+            class="hmac-warning__icon"
             icon="warning"
           />
         </h3>
@@ -181,7 +181,11 @@ export default {
 
   .snoozed--display-text {
     font-weight: var(--font-weight-medium);
-    color: var(--y-900);
+    color: var(--y-600);
   }
 }
+
+.hmac-warning__icon {
+  color: var(--y-600);
+}
 </style>

From 31cdc63e18f3ceda86ae4014469ac7ac70a09fe6 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 11 Apr 2022 19:37:20 +0530
Subject: [PATCH 042/177] fix: Remove IMAP and SMTP email validation (#4435)

* Remove IMAP and SMTP email validation
* Rename imap_email & smtp_email columns to imap_login & smtp_login respectively.
* Use channel email domain if inbound email domain not present
---
 app/helpers/api/v1/inboxes_helper.rb          |  4 ++--
 .../dashboard/i18n/locale/en/inboxMgmt.json   | 12 +++++-----
 .../dashboard/settings/inbox/ImapSettings.vue | 22 +++++++++----------
 .../dashboard/settings/inbox/SmtpSettings.vue | 22 +++++++++----------
 app/jobs/inboxes/fetch_imap_emails_job.rb     |  2 +-
 app/mailers/conversation_reply_mailer.rb      |  4 ++--
 .../conversation_reply_mailer_helper.rb       | 14 +++++++++---
 app/models/channel/email.rb                   |  8 +++----
 app/views/api/v1/models/_inbox.json.jbuilder  |  4 ++--
 config/schedule.yml                           |  2 +-
 ...ename_imap_email_and_smtp_email_columns.rb |  6 +++++
 db/schema.rb                                  |  6 ++---
 .../v1/accounts/inboxes_controller_spec.rb    |  6 ++---
 .../fetch_imap_email_inboxes_job_spec.rb      |  2 +-
 .../inboxes/fetch_imap_emails_job_spec.rb     |  2 +-
 spec/mailboxes/imap/imap_mailbox_spec.rb      |  2 +-
 .../mailers/conversation_reply_mailer_spec.rb | 21 +++++++++++++++++-
 17 files changed, 86 insertions(+), 53 deletions(-)
 create mode 100644 db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb

diff --git a/app/helpers/api/v1/inboxes_helper.rb b/app/helpers/api/v1/inboxes_helper.rb
index 7f3b68953..56fb79908 100644
--- a/app/helpers/api/v1/inboxes_helper.rb
+++ b/app/helpers/api/v1/inboxes_helper.rb
@@ -14,7 +14,7 @@ module Api::V1::InboxesHelper
     Mail.defaults do
       retriever_method :imap, { address: channel_data[:imap_address],
                                 port: channel_data[:imap_port],
-                                user_name: channel_data[:imap_email],
+                                user_name: channel_data[:imap_login],
                                 password: channel_data[:imap_password],
                                 enable_ssl: channel_data[:imap_enable_ssl] }
     end
@@ -33,7 +33,7 @@ module Api::V1::InboxesHelper
   end
 
   def check_smtp_connection(channel_data, smtp)
-    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_email], channel_data[:smtp_password],
+    smtp.start(channel_data[:smtp_domain], channel_data[:smtp_login], channel_data[:smtp_password],
                channel_data[:smtp_authentication]&.to_sym || :login)
     smtp.finish unless smtp&.nil?
   end
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index b2a054ebc..365fd92f9 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -486,9 +486,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -514,9 +514,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
index c404c2872..af2d5dd5c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
@@ -34,12 +34,12 @@
             @blur="$v.port.$touch"
           />
           <woot-input
-            v-model="email"
-            :class="{ error: $v.email.$error }"
+            v-model="login"
+            :class="{ error: $v.login.$error }"
             class="medium-9 columns"
-            :label="$t('INBOX_MGMT.IMAP.EMAIL.LABEL')"
-            :placeholder="$t('INBOX_MGMT.IMAP.EMAIL.PLACE_HOLDER')"
-            @blur="$v.email.$touch"
+            :label="$t('INBOX_MGMT.IMAP.LOGIN.LABEL')"
+            :placeholder="$t('INBOX_MGMT.IMAP.LOGIN.PLACE_HOLDER')"
+            @blur="$v.login.$touch"
           />
           <woot-input
             v-model="password"
@@ -73,7 +73,7 @@
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import SettingsSection from 'dashboard/components/SettingsSection';
-import { required, minLength, email } from 'vuelidate/lib/validators';
+import { required, minLength } from 'vuelidate/lib/validators';
 
 export default {
   components: {
@@ -91,7 +91,7 @@ export default {
       isIMAPEnabled: false,
       address: '',
       port: '',
-      email: '',
+      login: '',
       password: '',
       isSSLEnabled: true,
     };
@@ -99,7 +99,7 @@ export default {
   validations: {
     address: { required },
     port: { required, minLength: minLength(2) },
-    email: { required, email },
+    login: { required },
     password: { required },
   },
   computed: {
@@ -119,14 +119,14 @@ export default {
         imap_enabled,
         imap_address,
         imap_port,
-        imap_email,
+        imap_login,
         imap_password,
         imap_enable_ssl,
       } = this.inbox;
       this.isIMAPEnabled = imap_enabled;
       this.address = imap_address;
       this.port = imap_port;
-      this.email = imap_email;
+      this.login = imap_login;
       this.password = imap_password;
       this.isSSLEnabled = imap_enable_ssl;
     },
@@ -140,7 +140,7 @@ export default {
             imap_enabled: this.isIMAPEnabled,
             imap_address: this.address,
             imap_port: this.port,
-            imap_email: this.email,
+            imap_login: this.login,
             imap_password: this.password,
             imap_enable_ssl: this.isSSLEnabled,
             imap_inbox_synced_at: this.isIMAPEnabled
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
index 92b9a5446..553be1821 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/SmtpSettings.vue
@@ -33,12 +33,12 @@
             @blur="$v.port.$touch"
           />
           <woot-input
-            v-model="email"
-            :class="{ error: $v.email.$error }"
+            v-model="login"
+            :class="{ error: $v.login.$error }"
             class="medium-9 columns"
-            :label="$t('INBOX_MGMT.SMTP.EMAIL.LABEL')"
-            :placeholder="$t('INBOX_MGMT.SMTP.EMAIL.PLACE_HOLDER')"
-            @blur="$v.email.$touch"
+            :label="$t('INBOX_MGMT.SMTP.LOGIN.LABEL')"
+            :placeholder="$t('INBOX_MGMT.SMTP.LOGIN.PLACE_HOLDER')"
+            @blur="$v.login.$touch"
           />
           <woot-input
             v-model="password"
@@ -91,7 +91,7 @@
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
 import SettingsSection from 'dashboard/components/SettingsSection';
-import { required, minLength, email } from 'vuelidate/lib/validators';
+import { required, minLength } from 'vuelidate/lib/validators';
 import InputRadioGroup from './components/InputRadioGroup';
 import SingleSelectDropdown from './components/SingleSelectDropdown';
 
@@ -113,7 +113,7 @@ export default {
       isSMTPEnabled: false,
       address: '',
       port: '',
-      email: '',
+      login: '',
       password: '',
       domain: '',
       ssl: false,
@@ -147,7 +147,7 @@ export default {
       required,
       minLength: minLength(2),
     },
-    email: { required, email },
+    login: { required },
     password: { required },
     domain: { required },
   },
@@ -168,7 +168,7 @@ export default {
         smtp_enabled,
         smtp_address,
         smtp_port,
-        smtp_email,
+        smtp_login,
         smtp_password,
         smtp_domain,
         smtp_enable_starttls_auto,
@@ -179,7 +179,7 @@ export default {
       this.isSMTPEnabled = smtp_enabled;
       this.address = smtp_address;
       this.port = smtp_port;
-      this.email = smtp_email;
+      this.login = smtp_login;
       this.password = smtp_password;
       this.domain = smtp_domain;
       this.starttls = smtp_enable_starttls_auto;
@@ -220,7 +220,7 @@ export default {
             smtp_enabled: this.isSMTPEnabled,
             smtp_address: this.address,
             smtp_port: this.port,
-            smtp_email: this.email,
+            smtp_login: this.login,
             smtp_password: this.password,
             smtp_domain: this.domain,
             smtp_enable_ssl_tls: this.ssl,
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 94dd101c8..0fb22224a 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -26,7 +26,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     Mail.defaults do
       retriever_method :imap, address: channel.imap_address,
                               port: channel.imap_port,
-                              user_name: channel.imap_email,
+                              user_name: channel.imap_login,
                               password: channel.imap_password,
                               enable_ssl: channel.imap_enable_ssl
     end
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
index 2e6e4bf67..f24bc46bb 100644
--- a/app/mailers/conversation_reply_mailer.rb
+++ b/app/mailers/conversation_reply_mailer.rb
@@ -128,11 +128,11 @@ class ConversationReplyMailer < ApplicationMailer
   def custom_message_id
     last_message = @message || @messages&.last
 
-    "<conversation/#{@conversation.uuid}/messages/#{last_message&.id}@#{@account.inbound_email_domain}>"
+    "<conversation/#{@conversation.uuid}/messages/#{last_message&.id}@#{channel_email_domain}>"
   end
 
   def in_reply_to_email
-    conversation_reply_email_id || "<account/#{@account.id}/conversation/#{@conversation.uuid}@#{@account.inbound_email_domain}>"
+    conversation_reply_email_id || "<account/#{@account.id}/conversation/#{@conversation.uuid}@#{channel_email_domain}>"
   end
 
   def conversation_reply_email_id
diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
index f95150232..21bc9b939 100644
--- a/app/mailers/conversation_reply_mailer_helper.rb
+++ b/app/mailers/conversation_reply_mailer_helper.rb
@@ -26,7 +26,7 @@ module ConversationReplyMailerHelper
     smtp_settings = {
       address: @channel.smtp_address,
       port: @channel.smtp_port,
-      user_name: @channel.smtp_email,
+      user_name: @channel.smtp_login,
       password: @channel.smtp_password,
       domain: @channel.smtp_domain,
       tls: @channel.smtp_enable_ssl_tls,
@@ -48,10 +48,18 @@ module ConversationReplyMailerHelper
   end
 
   def email_from
-    email_smtp_enabled ? @channel.smtp_email : from_email_with_name
+    email_smtp_enabled ? @channel.email : from_email_with_name
   end
 
   def email_reply_to
-    email_imap_enabled ? @channel.imap_email : reply_email
+    email_imap_enabled ? @channel.email : reply_email
+  end
+
+  # Use channel email domain in case of account email domain is not set for custom message_id and in_reply_to
+  def channel_email_domain
+    return @account.inbound_email_domain if @account.inbound_email_domain.present?
+
+    email = @inbox.channel.try(:email)
+    email.present? ? email.split('@').last : raise(StandardError, 'Channel email domain not present.')
   end
 end
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 1c7f534a4..5b1cc0c91 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -6,19 +6,19 @@
 #  email                     :string           not null
 #  forward_to_email          :string           not null
 #  imap_address              :string           default("")
-#  imap_email                :string           default("")
 #  imap_enable_ssl           :boolean          default(TRUE)
 #  imap_enabled              :boolean          default(FALSE)
 #  imap_inbox_synced_at      :datetime
+#  imap_login                :string           default("")
 #  imap_password             :string           default("")
 #  imap_port                 :integer          default(0)
 #  smtp_address              :string           default("")
 #  smtp_authentication       :string           default("login")
 #  smtp_domain               :string           default("")
-#  smtp_email                :string           default("")
 #  smtp_enable_ssl_tls       :boolean          default(FALSE)
 #  smtp_enable_starttls_auto :boolean          default(TRUE)
 #  smtp_enabled              :boolean          default(FALSE)
+#  smtp_login                :string           default("")
 #  smtp_openssl_verify_mode  :string           default("none")
 #  smtp_password             :string           default("")
 #  smtp_port                 :integer          default(0)
@@ -37,8 +37,8 @@ class Channel::Email < ApplicationRecord
   include Reauthorizable
 
   self.table_name = 'channel_email'
-  EDITABLE_ATTRS = [:email, :imap_enabled, :imap_email, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
-                    :smtp_enabled, :smtp_email, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
+  EDITABLE_ATTRS = [:email, :imap_enabled, :imap_login, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
+                    :smtp_enabled, :smtp_login, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
                     :smtp_enable_ssl_tls, :smtp_openssl_verify_mode, :smtp_authentication].freeze
 
   validates :email, uniqueness: true
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index dded0ec0d..17bde23e0 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -53,7 +53,7 @@ if resource.email?
   json.email resource.channel.try(:email)
 
   ## IMAP
-  json.imap_email resource.channel.try(:imap_email)
+  json.imap_login resource.channel.try(:imap_login)
   json.imap_password resource.channel.try(:imap_password)
   json.imap_address resource.channel.try(:imap_address)
   json.imap_port resource.channel.try(:imap_port)
@@ -61,7 +61,7 @@ if resource.email?
   json.imap_enable_ssl resource.channel.try(:imap_enable_ssl)
 
   ## SMTP
-  json.smtp_email resource.channel.try(:smtp_email)
+  json.smtp_login resource.channel.try(:smtp_login)
   json.smtp_password resource.channel.try(:smtp_password)
   json.smtp_address resource.channel.try(:smtp_address)
   json.smtp_port resource.channel.try(:smtp_port)
diff --git a/config/schedule.yml b/config/schedule.yml
index 156a19787..94aca4896 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -16,6 +16,6 @@ trigger_scheduled_items_job:
 
 # executed At every 5th minute..
 trigger_imap_email_inboxes_job:
-  cron: '*/5 * * * *'
+  cron: '*/1 * * * *'
   class: 'Inboxes::FetchImapEmailInboxesJob'
   queue: scheduled_jobs
diff --git a/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb b/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb
new file mode 100644
index 000000000..4518647b4
--- /dev/null
+++ b/db/migrate/20220409044943_rename_imap_email_and_smtp_email_columns.rb
@@ -0,0 +1,6 @@
+class RenameImapEmailAndSmtpEmailColumns < ActiveRecord::Migration[6.1]
+  def change
+    rename_column :channel_email, :imap_email, :imap_login
+    rename_column :channel_email, :smtp_email, :smtp_login
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 84619b696..93b96cec7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_05_092033) do
+ActiveRecord::Schema.define(version: 2022_04_09_044943) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -190,14 +190,14 @@ ActiveRecord::Schema.define(version: 2022_04_05_092033) do
     t.boolean "imap_enabled", default: false
     t.string "imap_address", default: ""
     t.integer "imap_port", default: 0
-    t.string "imap_email", default: ""
+    t.string "imap_login", default: ""
     t.string "imap_password", default: ""
     t.boolean "imap_enable_ssl", default: true
     t.datetime "imap_inbox_synced_at"
     t.boolean "smtp_enabled", default: false
     t.string "smtp_address", default: ""
     t.integer "smtp_port", default: 0
-    t.string "smtp_email", default: ""
+    t.string "smtp_login", default: ""
     t.string "smtp_password", default: ""
     t.string "smtp_domain", default: ""
     t.boolean "smtp_enable_starttls_auto", default: true
diff --git a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
index 420a94835..6cf33e7ad 100644
--- a/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -426,7 +426,7 @@ RSpec.describe 'Inboxes API', type: :request do
                   imap_enabled: true,
                   imap_address: 'imap.gmail.com',
                   imap_port: 993,
-                  imap_email: 'imaptest@gmail.com'
+                  imap_login: 'imaptest@gmail.com'
                 }
               },
               as: :json
@@ -496,7 +496,7 @@ RSpec.describe 'Inboxes API', type: :request do
                   smtp_enabled: true,
                   smtp_address: 'smtp.gmail.com',
                   smtp_port: 587,
-                  smtp_email: 'smtptest@gmail.com',
+                  smtp_login: 'smtptest@gmail.com',
                   smtp_enable_starttls_auto: true,
                   smtp_openssl_verify_mode: 'peer'
                 }
@@ -525,7 +525,7 @@ RSpec.describe 'Inboxes API', type: :request do
                 channel: {
                   smtp_enabled: true,
                   smtp_address: 'smtp.gmail.com',
-                  smtp_email: 'smtptest@gmail.com',
+                  smtp_login: 'smtptest@gmail.com',
                   smtp_port: 587,
                   smtp_enable_ssl_tls: true,
                   smtp_openssl_verify_mode: 'none'
diff --git a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
index 210602ac9..0b23ef9c4 100644
--- a/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_email_inboxes_job_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Inboxes::FetchImapEmailInboxesJob, type: :job do
   let(:account) { create(:account) }
   let(:imap_email_channel) do
-    create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_email: 'imap@gmail.com',
+    create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_login: 'imap@gmail.com',
                            imap_password: 'password', account: account)
   end
   let(:email_inbox) { create(:inbox, channel: imap_email_channel, account: account) }
diff --git a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
index 6c1beecaf..e61198bed 100644
--- a/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
+++ b/spec/jobs/inboxes/fetch_imap_emails_job_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Inboxes::FetchImapEmailsJob, type: :job do
   let(:account) { create(:account) }
   let(:imap_email_channel) do
-    create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_email: 'imap@gmail.com',
+    create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com', imap_port: 993, imap_login: 'imap@gmail.com',
                            imap_password: 'password', imap_inbox_synced_at: Time.now.utc - 10, account: account)
   end
   let(:email_inbox) { create(:inbox, channel: imap_email_channel, account: account) }
diff --git a/spec/mailboxes/imap/imap_mailbox_spec.rb b/spec/mailboxes/imap/imap_mailbox_spec.rb
index 0f44e2a40..a78c4fcf1 100644
--- a/spec/mailboxes/imap/imap_mailbox_spec.rb
+++ b/spec/mailboxes/imap/imap_mailbox_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe Imap::ImapMailbox, type: :mailbox do
     let(:agent) { create(:user, email: 'agent@example.com', account: account) }
     let(:channel) do
       create(:channel_email, imap_enabled: true, imap_address: 'imap.gmail.com',
-                             imap_port: 993, imap_email: 'imap@gmail.com', imap_password: 'password',
+                             imap_port: 993, imap_login: 'imap@gmail.com', imap_password: 'password',
                              account: account)
     end
     let(:inbox) { create(:inbox, channel: channel, account: account) }
diff --git a/spec/mailers/conversation_reply_mailer_spec.rb b/spec/mailers/conversation_reply_mailer_spec.rb
index c1d6d18dd..c64b2a28a 100644
--- a/spec/mailers/conversation_reply_mailer_spec.rb
+++ b/spec/mailers/conversation_reply_mailer_spec.rb
@@ -156,7 +156,7 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
 
     context 'when smtp enabled for email channel' do
       let(:smtp_email_channel) do
-        create(:channel_email, smtp_enabled: true, smtp_address: 'smtp.gmail.com', smtp_port: 587, smtp_email: 'smtp@gmail.com',
+        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: account)
       end
       let(:conversation) { create(:conversation, assignee: agent, inbox: smtp_email_channel.inbox, account: account).reload }
@@ -251,5 +251,24 @@ RSpec.describe ConversationReplyMailer, type: :mailer do
         expect(mail.in_reply_to).to eq("account/#{conversation.account.id}/conversation/#{conversation.uuid}@#{conversation.account.domain}")
       end
     end
+
+    context 'when inbound email domain is not enabled' do
+      let(:new_account) { create(:account, domain: nil) }
+      let!(:email_channel) { create(:channel_email, account: new_account) }
+      let!(:inbox) { create(:inbox, channel: email_channel, account: new_account) }
+      let(:inbox_member) { create(:inbox_member, user: agent, inbox: inbox) }
+      let(:conversation) { create(:conversation, assignee: agent, inbox: inbox_member.inbox, account: new_account) }
+      let!(:message) { create(:message, conversation: conversation, account: new_account) }
+      let(:mail) { described_class.reply_with_summary(message.conversation, message.id).deliver_now }
+      let(:domain) { inbox.channel.email.split('@').last }
+
+      it 'sets the correct custom message id' do
+        expect(mail.message_id).to eq("conversation/#{conversation.uuid}/messages/#{message.id}@#{domain}")
+      end
+
+      it 'sets the correct in reply to id' do
+        expect(mail.in_reply_to).to eq("account/#{conversation.account.id}/conversation/#{conversation.uuid}@#{domain}")
+      end
+    end
   end
 end

From c64e2e3bc5e4b6579366e8ae9b0fca19ed3932ae Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 11 Apr 2022 20:57:22 +0530
Subject: [PATCH 043/177] chore: Report improvements (#4392)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/report.json      | 32 +++++++++-----
 .../mixins/specs/reportMixin.spec.js          |  2 +-
 .../dashboard/settings/reports/Index.vue      | 24 +++++++++-
 .../reports/components/ReportFilters.vue      |  6 +--
 .../reports/components/WootReports.vue        | 23 +++++++++-
 .../dashboard/settings/reports/constants.js   | 44 +++++--------------
 .../dashboard/store/modules/reports.js        | 10 -----
 package.json                                  |  2 +-
 yarn.lock                                     |  8 ++--
 9 files changed, 86 insertions(+), 65 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index a14704007..1574b1cca 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -20,12 +20,14 @@
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
         "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:"
+        "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:"
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
@@ -103,12 +105,14 @@
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
         "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:"
+        "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:"
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
@@ -168,12 +172,14 @@
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
         "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:"
+        "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:"
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
@@ -233,12 +239,14 @@
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
         "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:"
+        "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:"
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
@@ -298,12 +306,14 @@
       "FIRST_RESPONSE_TIME": {
         "NAME": "First Response Time",
         "DESC": "( Avg )",
-        "INFO_TEXT": "Total number of conversations used for computation:"
+        "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:"
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Resolution Count",
@@ -372,4 +382,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/mixins/specs/reportMixin.spec.js b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
index ca1c45751..aa3c451d9 100644
--- a/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
+++ b/app/javascript/dashboard/mixins/specs/reportMixin.spec.js
@@ -25,7 +25,7 @@ describe('reportMixin', () => {
     const wrapper = shallowMount(Component, { store, localVue });
     expect(wrapper.vm.displayMetric('conversations_count')).toEqual(5);
     expect(wrapper.vm.displayMetric('avg_first_response_time')).toEqual(
-      '3 Min'
+      '3 Min 18 Sec'
     );
   });
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
index f9a9256f4..bc6ac48de 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/Index.vue
@@ -57,6 +57,7 @@ import format from 'date-fns/format';
 import ReportFilterSelector from './components/FilterSelector';
 import { GROUP_BY_FILTER, METRIC_CHART } from './constants';
 import reportMixin from '../../../../mixins/reportMixin';
+import { formatTime } from '@chatwoot/utils';
 
 const REPORTS_KEYS = {
   CONVERSATIONS: 'conversations_count',
@@ -145,8 +146,22 @@ export default {
       };
     },
     chartOptions() {
+      let tooltips = {};
+      if (this.isAverageMetricType(this.metrics[this.currentSelection].KEY)) {
+        tooltips.callbacks = {
+          label: tooltipItem => {
+            return this.$t(this.metrics[this.currentSelection].TOOLTIP_TEXT, {
+              metricValue: formatTime(tooltipItem.yLabel),
+              conversationCount: this.accountReport.data[tooltipItem.index]
+                .count,
+            });
+          },
+        };
+      }
+
       return {
         scales: METRIC_CHART[this.metrics[this.currentSelection].KEY].scales,
+        tooltips: tooltips,
       };
     },
     metrics() {
@@ -158,11 +173,18 @@ export default {
         'RESOLUTION_TIME',
         'RESOLUTION_COUNT',
       ];
+      const infoText = {
+        FIRST_RESPONSE_TIME: this.$t(
+          `REPORT.METRICS.FIRST_RESPONSE_TIME.INFO_TEXT`
+        ),
+        RESOLUTION_TIME: this.$t(`REPORT.METRICS.RESOLUTION_TIME.INFO_TEXT`),
+      };
       return reportKeys.map(key => ({
         NAME: this.$t(`REPORT.METRICS.${key}.NAME`),
         KEY: REPORTS_KEYS[key],
         DESC: this.$t(`REPORT.METRICS.${key}.DESC`),
-        INFO_TEXT: this.$t(`REPORT.METRICS.${key}.INFO_TEXT`),
+        INFO_TEXT: infoText[key],
+        TOOLTIP_TEXT: `REPORT.METRICS.${key}.TOOLTIP_TEXT`,
       }));
     },
   },
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 0bfeae8a1..c0b87e19b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -148,9 +148,9 @@
     <div class="small-12 medium-3 business-hours">
       <span class="business-hours-text margin-right-small">
         {{ $t('REPORT.BUSINESS_HOURS') }}
-        <span>
-          <woot-switch v-model="businessHoursSelected" />
-        </span>
+      </span>
+      <span>
+        <woot-switch v-model="businessHoursSelected" />
       </span>
     </div>
   </div>
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 7a54765b8..6d8b49c62 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -60,6 +60,7 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 import { GROUP_BY_FILTER, METRIC_CHART } from '../constants';
 import reportMixin from '../../../../../mixins/reportMixin';
+import { formatTime } from '@chatwoot/utils';
 
 const REPORTS_KEYS = {
   CONVERSATIONS: 'conversations_count',
@@ -171,8 +172,21 @@ export default {
       };
     },
     chartOptions() {
+      let tooltips = {};
+      if (this.isAverageMetricType(this.metrics[this.currentSelection].KEY)) {
+        tooltips.callbacks = {
+          label: tooltipItem => {
+            return this.$t(this.metrics[this.currentSelection].TOOLTIP_TEXT, {
+              metricValue: formatTime(tooltipItem.yLabel),
+              conversationCount: this.accountReport.data[tooltipItem.index]
+                .count,
+            });
+          },
+        };
+      }
       return {
         scales: METRIC_CHART[this.metrics[this.currentSelection].KEY].scales,
+        tooltips: tooltips,
       };
     },
     metrics() {
@@ -190,11 +204,18 @@ export default {
         'RESOLUTION_TIME',
         'RESOLUTION_COUNT',
       ];
+      const infoText = {
+        FIRST_RESPONSE_TIME: this.$t(
+          `REPORT.METRICS.FIRST_RESPONSE_TIME.INFO_TEXT`
+        ),
+        RESOLUTION_TIME: this.$t(`REPORT.METRICS.RESOLUTION_TIME.INFO_TEXT`),
+      };
       return reportKeys.map(key => ({
         NAME: this.$t(`REPORT.METRICS.${key}.NAME`),
         KEY: REPORTS_KEYS[key],
         DESC: this.$t(`REPORT.METRICS.${key}.DESC`),
-        INFO_TEXT: this.$t(`REPORT.METRICS.${key}.INFO_TEXT`),
+        INFO_TEXT: infoText[key],
+        TOOLTIP_TEXT: `REPORT.METRICS.${key}.TOOLTIP_TEXT`,
       }));
     },
   },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index 91348543e..c44f2bdef 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -1,3 +1,5 @@
+import { formatTime } from '@chatwoot/utils';
+
 export const GROUP_BY_FILTER = {
   1: { id: 1, period: 'day' },
   2: { id: 2, period: 'week' },
@@ -17,7 +19,7 @@ export const DEFAULT_LINE_CHART = {
 
 export const DEFAULT_BAR_CHART = {
   type: 'bar',
-  backgroundColor: 'rgb(31, 147, 255, 0.5)',
+  backgroundColor: 'rgb(31, 147, 255)',
 };
 
 export const DEFAULT_CHART = {
@@ -56,7 +58,7 @@ export const METRIC_CHART = {
   incoming_messages_count: DEFAULT_CHART,
   outgoing_messages_count: DEFAULT_CHART,
   avg_first_response_time: {
-    datasets: [DEFAULT_BAR_CHART, DEFAULT_LINE_CHART],
+    datasets: [DEFAULT_BAR_CHART],
     scales: {
       xAxes: [
         {
@@ -75,21 +77,9 @@ export const METRIC_CHART = {
           position: 'left',
           ticks: {
             fontFamily: CHART_FONT_FAMILY,
-            beginAtZero: true,
-            precision: 2,
-          },
-          gridLines: {
-            drawOnChartArea: false,
-          },
-        },
-        {
-          id: 'y-right',
-          type: 'linear',
-          position: 'right',
-          ticks: {
-            fontFamily: CHART_FONT_FAMILY,
-            beginAtZero: true,
-            stepSize: 1,
+            callback(value) {
+              return formatTime(value);
+            },
           },
           gridLines: {
             drawOnChartArea: false,
@@ -99,7 +89,7 @@ export const METRIC_CHART = {
     },
   },
   avg_resolution_time: {
-    datasets: [DEFAULT_BAR_CHART, DEFAULT_LINE_CHART],
+    datasets: [DEFAULT_BAR_CHART],
     scales: {
       xAxes: [
         {
@@ -118,21 +108,9 @@ export const METRIC_CHART = {
           position: 'left',
           ticks: {
             fontFamily: CHART_FONT_FAMILY,
-            beginAtZero: true,
-            precision: 2,
-          },
-          gridLines: {
-            drawOnChartArea: false,
-          },
-        },
-        {
-          id: 'y-right',
-          type: 'linear',
-          position: 'right',
-          ticks: {
-            fontFamily: CHART_FONT_FAMILY,
-            beginAtZero: true,
-            stepSize: 1,
+            callback(value) {
+              return formatTime(value);
+            },
           },
           gridLines: {
             drawOnChartArea: false,
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 67f468add..0b31883bf 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -50,16 +50,6 @@ export const actions = {
         el =>
           reportObj.to - el.timestamp > 0 && el.timestamp - reportObj.from >= 0
       );
-      if (
-        reportObj.metric === 'avg_first_response_time' ||
-        reportObj.metric === 'avg_resolution_time'
-      ) {
-        data = data.map(element => {
-          /* eslint-disable operator-assignment */
-          element.value = (element.value / 3600).toFixed(2);
-          return element;
-        });
-      }
       commit(types.default.SET_ACCOUNT_REPORTS, data);
       commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
     });
diff --git a/package.json b/package.json
index 7371322b6..1b55668b3 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@braid/vue-formulate": "^2.5.2",
     "@chatwoot/prosemirror-schema": "https://github.com/chatwoot/prosemirror-schema.git#7e8acadd10d7b932c0dc0bd0a18f804434f83517",
-    "@chatwoot/utils": "^0.0.5",
+    "@chatwoot/utils": "^0.0.6",
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@rails/actioncable": "6.1.3",
     "@rails/webpacker": "5.3.0",
diff --git a/yarn.lock b/yarn.lock
index b4c4e505c..a95d08798 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1111,10 +1111,10 @@
     prosemirror-state "^1.3.3"
     prosemirror-view "^1.17.2"
 
-"@chatwoot/utils@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.npmjs.org/@chatwoot/utils/-/utils-0.0.5.tgz#907cdae747abc17cf2e5c31a378aba66a2f31c6f"
-  integrity sha512-gTQMpQuYVF5EaF4+xSmaoJKXPtbwDPjNLi5cwg44FaQSfmzFxD0fjDsDUPrxzZfURLsR8eU7Z1ulVKnZdHN4yg==
+"@chatwoot/utils@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@chatwoot/utils/-/utils-0.0.6.tgz#76d7b17d692b5b656c565b9b714b98e0f2bc1324"
+  integrity sha512-fCvULfJSFSylDAiGh1cPAX5nQkVsmG5ASGm/E6YBYg8cox/2JU179JFstdtTxrIJg/YeHukcaq85Gc+/16ShPQ==
   dependencies:
     date-fns "^2.22.1"
 

From 14503b5fe0940d90219a27d5c3ba1a04b3de9588 Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 12 Apr 2022 11:08:12 +0530
Subject: [PATCH 044/177] feat: Add missing password validation at signup
 (#4441)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/i18n/locale/en/signup.json      |  3 ++-
 .../dashboard/routes/auth/Signup.vue          | 22 ++++++++++++++-----
 app/javascript/shared/helpers/Validators.js   | 14 ++++++++++++
 .../helpers/specs/ValidatorsHelper.spec.js    | 17 ++++++++++++++
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/signup.json b/app/javascript/dashboard/i18n/locale/en/signup.json
index 6eaa5d646..8dd5c0d4e 100644
--- a/app/javascript/dashboard/i18n/locale/en/signup.json
+++ b/app/javascript/dashboard/i18n/locale/en/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index 4f5aab8bd..2ea4e443a 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -54,14 +54,9 @@
             :class="{ error: $v.credentials.password.$error }"
             :label="$t('LOGIN.PASSWORD.LABEL')"
             :placeholder="$t('SET_NEW_PASSWORD.PASSWORD.PLACEHOLDER')"
-            :error="
-              $v.credentials.password.$error
-                ? $t('SET_NEW_PASSWORD.PASSWORD.ERROR')
-                : ''
-            "
+            :error="passwordErrorText"
             @blur="$v.credentials.password.$touch"
           />
-
           <woot-input
             v-model.trim="credentials.confirmPassword"
             type="password"
@@ -122,6 +117,7 @@ import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 import alertMixin from 'shared/mixins/alertMixin';
 import { DEFAULT_REDIRECT_URL } from '../../constants';
 import VueHcaptcha from '@hcaptcha/vue-hcaptcha';
+import { isValidPassword } from 'shared/helpers/Validators';
 export default {
   components: {
     VueHcaptcha,
@@ -158,6 +154,7 @@ export default {
       },
       password: {
         required,
+        isValidPassword,
         minLength: minLength(6),
       },
       confirmPassword: {
@@ -187,6 +184,19 @@ export default {
       }
       return true;
     },
+    passwordErrorText() {
+      const { password } = this.$v.credentials;
+      if (!password.$error) {
+        return '';
+      }
+      if (!password.minLength) {
+        return this.$t('REGISTER.PASSWORD.ERROR');
+      }
+      if (!password.isValidPassword) {
+        return this.$t('REGISTER.PASSWORD.IS_INVALID_PASSWORD');
+      }
+      return '';
+    },
   },
   methods: {
     async submit() {
diff --git a/app/javascript/shared/helpers/Validators.js b/app/javascript/shared/helpers/Validators.js
index d6b802de8..993524fc9 100644
--- a/app/javascript/shared/helpers/Validators.js
+++ b/app/javascript/shared/helpers/Validators.js
@@ -2,3 +2,17 @@ export const isPhoneE164 = value => !!value.match(/^\+[1-9]\d{1,14}$/);
 export const isPhoneE164OrEmpty = value => isPhoneE164(value) || value === '';
 export const shouldBeUrl = (value = '') =>
   value ? value.startsWith('http') : true;
+export const isValidPassword = value => {
+  const containsUppercase = /[A-Z]/.test(value);
+  const containsLowercase = /[a-z]/.test(value);
+  const containsNumber = /[0-9]/.test(value);
+  const containsSpecialCharacter = /[!@#$%^&*()_+\-=[\]{}|'"/\\.,`<>:;?~]/.test(
+    value
+  );
+  return (
+    containsUppercase &&
+    containsLowercase &&
+    containsNumber &&
+    containsSpecialCharacter
+  );
+};
diff --git a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
index ba393a7a3..0abc12c84 100644
--- a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
@@ -1,7 +1,24 @@
 import { shouldBeUrl } from '../Validators';
+import { isValidPassword } from '../Validators';
 
 describe('#shouldBeUrl', () => {
   it('should return correct url', () => {
     expect(shouldBeUrl('http')).toEqual(true);
   });
 });
+
+describe('#isValidPassword', () => {
+  it('should return correct password', () => {
+    expect(isValidPassword('testPass4!')).toEqual(true);
+    expect(isValidPassword('testPass4-')).toEqual(true);
+    expect(isValidPassword('testPass4\\')).toEqual(true);
+    expect(isValidPassword("testPass4'")).toEqual(true);
+  });
+
+  it('should return wrong password', () => {
+    expect(isValidPassword('testpass4')).toEqual(false);
+    expect(isValidPassword('testPass4')).toEqual(false);
+    expect(isValidPassword('testpass4!')).toEqual(false);
+    expect(isValidPassword('testPass!')).toEqual(false);
+  });
+});

From b6ad468eb442ed36b92e892f0bc00a5176492dbd Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 12 Apr 2022 11:30:54 +0530
Subject: [PATCH 045/177] fix: Nokogiri bundle update (#4448)

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 Gemfile.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4b128f424..2789f09da 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -378,14 +378,14 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.4.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
+    nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.3-arm64-darwin)
+    nokogiri (1.13.4-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-darwin)
+    nokogiri (1.13.4-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    nokogiri (1.13.4-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.8)
     orm_adapter (0.5.0)

From 923b4637db3d255da9607b0b60206c23d4cee02c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 12 Apr 2022 20:23:34 +0530
Subject: [PATCH 046/177] chore: Automation bug fix (#4442)

---
 .../settings/automation/AddAutomationRule.vue |   2 +-
 .../automation/EditAutomationRule.vue         |   2 +-
 .../settings/automation/constants.js          |   8 +-
 app/listeners/automation_rule_listener.rb     |  22 ++--
 .../automation_notification_mailer.rb         |  12 +-
 app/models/conversation.rb                    |   5 +-
 app/models/message.rb                         |  10 +-
 .../automation_rules/action_service.rb        |   2 +-
 .../conversation_creation.liquid              |   3 +-
 .../automation_rules_controller_spec.rb       |  16 ++-
 .../automation_rule_listener_spec.rb          | 119 ------------------
 spec/models/conversation_spec.rb              |  10 +-
 12 files changed, 47 insertions(+), 164 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index 68d2c687c..73a02fd1a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -194,7 +194,7 @@ export default {
             required: requiredIf(prop => {
               return !(
                 prop.action_name === 'mute_conversation' ||
-                prop.action_name === 'snooze_convresation' ||
+                prop.action_name === 'snooze_conversation' ||
                 prop.action_name === 'resolve_convresation'
               );
             }),
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index cf70a35bb..14a8e84bb 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -198,7 +198,7 @@ export default {
             required: requiredIf(prop => {
               return !(
                 prop.action_name === 'mute_conversation' ||
-                prop.action_name === 'snooze_convresation' ||
+                prop.action_name === 'snooze_conversation' ||
                 prop.action_name === 'resolve_convresation'
               );
             }),
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index dd11700bd..cd306007a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -92,7 +92,7 @@ export const AUTOMATIONS = {
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
       {
-        key: 'snooze_convresation',
+        key: 'snooze_conversation',
         name: 'Snooze conversation',
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
@@ -166,7 +166,7 @@ export const AUTOMATIONS = {
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
       {
-        key: 'snooze_convresation',
+        key: 'snooze_conversation',
         name: 'Snooze conversation',
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
@@ -254,7 +254,7 @@ export const AUTOMATIONS = {
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
       {
-        key: 'snooze_convresation',
+        key: 'snooze_conversation',
         name: 'Snooze conversation',
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
@@ -314,7 +314,7 @@ export const AUTOMATION_ACTION_TYPES = [
     inputType: null,
   },
   {
-    key: 'snooze_convresation',
+    key: 'snooze_conversation',
     label: 'Snooze conversation',
     inputType: null,
   },
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 19fb56287..c8c021a4e 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -1,5 +1,7 @@
 class AutomationRuleListener < BaseListener
   def conversation_updated(event_obj)
+    return if performed_by_automation?(event_obj)
+
     conversation = event_obj.data[:conversation]
     account = conversation.account
 
@@ -11,19 +13,9 @@ class AutomationRuleListener < BaseListener
     end
   end
 
-  def conversation_status_changed(event_obj)
-    conversation = event_obj.data[:conversation]
-    account = conversation.account
-
-    return unless rule_present?('conversation_status_changed', account)
-
-    @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).perform
-      AutomationRules::ActionService.new(rule, account, conversation).perform if conditions_match.present?
-    end
-  end
-
   def conversation_created(event_obj)
+    return if performed_by_automation?(event_obj)
+
     conversation = event_obj.data[:conversation]
     account = conversation.account
 
@@ -36,6 +28,8 @@ class AutomationRuleListener < BaseListener
   end
 
   def message_created(event_obj)
+    return if performed_by_automation?(event_obj)
+
     message = event_obj.data[:message]
     account = message.try(:account)
 
@@ -57,4 +51,8 @@ class AutomationRuleListener < BaseListener
     )
     @rules.any?
   end
+
+  def performed_by_automation?(event_obj)
+    event_obj.data[:performed_by].present? && event_obj.data[:performed_by].instance_of?(AutomationRule)
+  end
 end
diff --git a/app/mailers/team_notifications/automation_notification_mailer.rb b/app/mailers/team_notifications/automation_notification_mailer.rb
index fd96cdd1d..d6ca47f81 100644
--- a/app/mailers/team_notifications/automation_notification_mailer.rb
+++ b/app/mailers/team_notifications/automation_notification_mailer.rb
@@ -35,18 +35,14 @@ class TeamNotifications::AutomationNotificationMailer < ApplicationMailer
   private
 
   def send_an_email_to_team
-    @agents.each do |agent|
-      subject = "#{agent.user.available_name}, This email has been sent via automation rule actions."
-      @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
-      @agent = agent
-
-      send_mail_with_liquid(to: @agent.user.email, subject: subject)
-    end
+    subject = 'This email has been sent via automation rule actions.'
+    @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
+    @agent_emails = @agents.collect(&:user).pluck(:email)
+    send_mail_with_liquid(to: @agent_emails, subject: subject) and return
   end
 
   def liquid_droppables
     super.merge!({
-                   user: @agent.user,
                    conversation: @conversation,
                    inbox: @conversation.inbox
                  })
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 75433f7fe..409efab6d 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -214,10 +214,9 @@ class Conversation < ApplicationRecord
   end
 
   def dispatcher_dispatch(event_name, changed_attributes = nil)
-    return if Current.executed_by.present? && Current.executed_by.instance_of?(AutomationRule)
-
     Rails.configuration.dispatcher.dispatch(event_name, Time.zone.now, conversation: self, notifiable_assignee_change: notifiable_assignee_change?,
-                                                                       changed_attributes: changed_attributes)
+                                                                       changed_attributes: changed_attributes,
+                                                                       performed_by: Current.executed_by)
   end
 
   def conversation_status_changed_to_open?
diff --git a/app/models/message.rb b/app/models/message.rb
index adfc914b6..13d58db6b 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -166,19 +166,15 @@ class Message < ApplicationRecord
   end
 
   def dispatch_create_events
-    return if Current.executed_by.present? && Current.executed_by.instance_of?(AutomationRule)
-
-    Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self)
+    Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
 
     if outgoing? && conversation.messages.outgoing.count == 1
-      Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self)
+      Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
     end
   end
 
   def dispatch_update_event
-    return if Current.executed_by.present? && Current.executed_by.instance_of?(AutomationRule)
-
-    Rails.configuration.dispatcher.dispatch(MESSAGE_UPDATED, Time.zone.now, message: self)
+    Rails.configuration.dispatcher.dispatch(MESSAGE_UPDATED, Time.zone.now, message: self, performed_by: Current.executed_by)
   end
 
   def send_reply
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 75b1f0474..1249bd9c5 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -41,7 +41,7 @@ class AutomationRules::ActionService
   end
 
   def snooze_conversation(_params)
-    @conversation.ensure_snooze_until_reset
+    @conversation.snoozed!
   end
 
   def change_status(status)
diff --git a/app/views/mailers/team_notifications/automation_notification_mailer/conversation_creation.liquid b/app/views/mailers/team_notifications/automation_notification_mailer/conversation_creation.liquid
index 8edefcc07..036e96603 100644
--- a/app/views/mailers/team_notifications/automation_notification_mailer/conversation_creation.liquid
+++ b/app/views/mailers/team_notifications/automation_notification_mailer/conversation_creation.liquid
@@ -1,5 +1,4 @@
-<p>Hi {{user.available_name}}</p>
-
+<p>This is the mail from Automation System</p>
 
 <p>{{ custom_message }}</p>
 
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index 0d3b3e784..0b921bc07 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -259,7 +259,7 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      it 'returns for cloned automation_rule for account' do
+      it 'returns for updated automation_rule for account' do
         params = { name: 'Update name' }
         expect(account.automation_rules.count).to eq(1)
 
@@ -271,6 +271,20 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
         body = JSON.parse(response.body, symbolize_names: true)
         expect(body[:payload][:name]).to eq('Update name')
       end
+
+      it 'returns for updated active flag for automation_rule' do
+        expect(automation_rule.active).to eq(true)
+        params = { active: false }
+
+        patch "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}",
+              headers: administrator.create_new_auth_token,
+              params: params
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body, symbolize_names: true)
+        expect(body[:payload][:active]).to eq(false)
+        expect(automation_rule.reload.active).to eq(false)
+      end
     end
   end
 
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 6c4fc0c2a..b0ed4d0bd 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -50,125 +50,6 @@ describe AutomationRuleListener do
     automation_rule.save
   end
 
-  describe '#conversation_status_changed' do
-    context 'when rule matches' do
-      it 'triggers automation rule send webhook events' do
-        payload = conversation.webhook_data.merge(event: "automation_event: #{automation_rule.event_name}")
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        expect(WebhookJob).to receive(:perform_later).with('https://www.example.com', payload).once
-
-        listener.conversation_status_changed(event)
-      end
-
-      it 'triggers automation rule to assign team' do
-        expect(conversation.team_id).not_to eq(team.id)
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-        expect(conversation.team_id).to eq(team.id)
-      end
-
-      it 'triggers automation rule to add label' do
-        expect(conversation.labels).to eq([])
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
-      end
-
-      it 'triggers automation rule to assign best agents' do
-        expect(conversation.assignee).to be_nil
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        expect(conversation.assignee).to eq(user_1)
-      end
-
-      it 'triggers automation rule send message to the contacts' do
-        expect(conversation.messages).to be_empty
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        expect(conversation.messages.first.content).to eq('Send this message.')
-      end
-
-      it 'triggers automation rule changes status to snoozed' do
-        expect(conversation.status).to eq('resolved')
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        expect(conversation.status).to eq('snoozed')
-      end
-
-      it 'triggers automation rule send email transcript to the mentioned email' do
-        mailer = double
-
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        allow(mailer).to receive(:conversation_transcript)
-      end
-
-      it 'triggers automation rule send email to the team' do
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-      end
-
-      it 'triggers automation rule send attachments in messages' do
-        automation_rule
-
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
-        listener.conversation_status_changed(event)
-
-        conversation.reload
-
-        expect(conversation.messages.last.attachments.count).to eq(1)
-      end
-    end
-  end
-
   describe '#conversation_updated with contacts attributes' do
     before do
       conversation.contact.update!(custom_attributes: { customer_type: 'platinum', signed_in_at: '2022-01-19' },
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 6a9002795..d5295e340 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -55,7 +55,7 @@ RSpec.describe Conversation, type: :model do
       # send_events
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_CREATED, kind_of(Time), conversation: conversation, notifiable_assignee_change: false,
-                                                                    changed_attributes: nil)
+                                                                    changed_attributes: nil, performed_by: nil)
     end
   end
 
@@ -121,16 +121,16 @@ RSpec.describe Conversation, type: :model do
 
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_RESOLVED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
-                                                                     changed_attributes: status_change)
+                                                                     changed_attributes: status_change, performed_by: nil)
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_READ, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
-                                                                 changed_attributes: nil)
+                                                                 changed_attributes: nil, performed_by: nil)
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::ASSIGNEE_CHANGED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
-                                                                changed_attributes: nil)
+                                                                changed_attributes: nil, performed_by: nil)
       expect(Rails.configuration.dispatcher).to have_received(:dispatch)
         .with(described_class::CONVERSATION_UPDATED, kind_of(Time), conversation: conversation, notifiable_assignee_change: true,
-                                                                    changed_attributes: changed_attributes)
+                                                                    changed_attributes: changed_attributes, performed_by: nil)
     end
 
     it 'will not run conversation_updated event for empty updates' do

From a6b119d1876b09a54675c04371c9d0a7323fccad Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 13 Apr 2022 01:29:51 +0530
Subject: [PATCH 047/177] Feat: twitter image support (#4429)

---
 .../twitter/direct_message_parser_service.rb  | 52 ++++++++++++-
 .../twitter/webhook_subscribe_service.rb      |  2 +-
 .../twitter/twitter_dm_image_event.rb         | 75 +++++++++++++++++++
 spec/lib/webhooks/twitter_spec.rb             | 16 ++++
 4 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 spec/factories/twitter/twitter_dm_image_event.rb

diff --git a/app/services/twitter/direct_message_parser_service.rb b/app/services/twitter/direct_message_parser_service.rb
index 04e68e590..e3679f278 100644
--- a/app/services/twitter/direct_message_parser_service.rb
+++ b/app/services/twitter/direct_message_parser_service.rb
@@ -7,7 +7,7 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
     set_inbox
     ensure_contacts
     set_conversation
-    @conversation.messages.create(
+    @message = @conversation.messages.create(
       content: message_create_data['message_data']['text'],
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
@@ -15,10 +15,24 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
       sender: @contact,
       source_id: direct_message_data['id']
     )
+    attach_files
   end
 
   private
 
+  def attach_files
+    return if message_create_data['message_data']['attachment'].blank?
+
+    save_media
+    @message
+  end
+
+  def save_media_urls(file)
+    @message.content_attributes[:media_url] = file['media_url']
+    @message.content_attributes[:display_url] = file['display_url']
+    @message.save
+  end
+
   def direct_message_events_params
     payload['direct_message_events']
   end
@@ -39,6 +53,10 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
     ENV.fetch('TWITTER_APP_ID', '')
   end
 
+  def media
+    message_create_data['message_data']['attachment']['media']
+  end
+
   def users
     payload[:users]
   end
@@ -73,4 +91,36 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
   def outgoing_message?
     message_create_data['sender_id'] == @inbox.channel.profile_id
   end
+
+  def api_client
+    @api_client ||= begin
+      consumer = OAuth::Consumer.new(ENV.fetch('TWITTER_CONSUMER_KEY', nil), ENV.fetch('TWITTER_CONSUMER_SECRET', nil),
+                                     { site: 'https://api.twitter.com' })
+      token = { oauth_token: @inbox.channel.twitter_access_token, oauth_token_secret: @inbox.channel.twitter_access_token_secret }
+      OAuth::AccessToken.from_hash(consumer, token)
+    end
+  end
+
+  def save_media
+    save_media_urls(media)
+    response = api_client.get(media['media_url'], [])
+
+    temp_file = Tempfile.new('twitter_attachment')
+    temp_file.binmode
+    temp_file << response.body
+    temp_file.rewind
+
+    return unless media['type'] == 'photo'
+
+    @message.attachments.new(
+      account_id: @inbox.account_id,
+      file_type: 'image',
+      file: {
+        io: temp_file,
+        filename: 'twitter_attachment',
+        content_type: media['type']
+      }
+    )
+    @message.save
+  end
 end
diff --git a/app/services/twitter/webhook_subscribe_service.rb b/app/services/twitter/webhook_subscribe_service.rb
index 7d7734231..f052bf551 100644
--- a/app/services/twitter/webhook_subscribe_service.rb
+++ b/app/services/twitter/webhook_subscribe_service.rb
@@ -43,7 +43,7 @@ class Twitter::WebhookSubscribeService
 
   def register_webhook
     register_response = twitter_client.register_webhook(url: twitter_url)
-    Rails.logger.info "TWITTER_UNREGISTER_WEBHOOK: #{register_response.body}"
+    Rails.logger.info "TWITTER_REGISTER_WEBHOOK: #{register_response.body}"
   end
 
   def subscription?
diff --git a/spec/factories/twitter/twitter_dm_image_event.rb b/spec/factories/twitter/twitter_dm_image_event.rb
new file mode 100644
index 000000000..dded4fc2d
--- /dev/null
+++ b/spec/factories/twitter/twitter_dm_image_event.rb
@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :twitter_dm_image_event, class: Hash do
+    for_user_id { '1' }
+    direct_message_events do
+      [{
+        'type' => 'message_create',
+        'id' => '123',
+        'message_create' => {
+          'target' => { 'recipient_id' => '1' },
+          'sender_id' => '2',
+          'source_app_id' => '268278',
+          'message_data' => {
+            'text' => 'Blue Bird',
+            'attachment' => {
+              'media' => {
+                'display_url' => 'pic.twitter.com/5J1WJSRCy9',
+                'expanded_url' => 'https://twitter.com/nolan_test/status/930077847535812610/photo/1',
+                'id' => 9.300778475358126e17,
+                'id_str' => '930077847535812610',
+                'indices' => [
+                  13,
+                  36
+                ],
+                'media_url' => 'http://pbs.twimg.com/media/DOhM30VVwAEpIHq.jpg',
+                'media_url_https' => 'https://pbs.twimg.com/media/DOhM30VVwAEpIHq.jpg',
+                'sizes' => {
+                  'thumb' => {
+                    'h' => 150,
+                    'resize' => 'crop',
+                    'w' => 150
+                  },
+                  'large' => {
+                    'h' => 1366,
+                    'resize' => 'fit',
+                    'w' => 2048
+                  },
+                  'medium' => {
+                    'h' => 800,
+                    'resize' => 'fit',
+                    'w' => 1200
+                  },
+                  'small' => {
+                    'h' => 454,
+                    'resize' => 'fit',
+                    'w' => 680
+                  }
+                },
+                'type' => 'photo',
+                'url' => 'https://t.co/5J1WJSRCy9'
+              }
+            }.with_indifferent_access
+          }
+        }
+      }.with_indifferent_access]
+    end
+    users do
+      {
+        '1' => {
+          id: '1',
+          name: 'person 1',
+          profile_image_url: 'https://chatwoot-assets.local/sample.png'
+        },
+        '2' => {
+          id: '1',
+          name: 'person 1',
+          profile_image_url: 'https://chatwoot-assets.local/sample.png'
+        }
+      }
+    end
+
+    initialize_with { attributes }
+  end
+end
diff --git a/spec/lib/webhooks/twitter_spec.rb b/spec/lib/webhooks/twitter_spec.rb
index 74820c609..598ef4295 100644
--- a/spec/lib/webhooks/twitter_spec.rb
+++ b/spec/lib/webhooks/twitter_spec.rb
@@ -9,6 +9,7 @@ describe Webhooks::Twitter do
   let!(:twitter_channel) { create(:channel_twitter_profile, account: account, profile_id: '1', tweets_enabled: true) }
   let!(:twitter_inbox) { create(:inbox, channel: twitter_channel, account: account, greeting_enabled: false) }
   let!(:dm_params) { build(:twitter_message_create_event).with_indifferent_access }
+  let!(:dm_image_params) { build(:twitter_dm_image_event).with_indifferent_access }
   let!(:tweet_params) { build(:tweet_create_event).with_indifferent_access }
   let!(:tweet_params_from_blocked_user) { build(:tweet_create_event, user_has_blocked: true).with_indifferent_access }
 
@@ -22,6 +23,21 @@ describe Webhooks::Twitter do
       end
     end
 
+    context 'with direct_message attachment params' do
+      before do
+        stub_request(:get, 'http://pbs.twimg.com/media/DOhM30VVwAEpIHq.jpg')
+          .to_return(status: 200, body: '', headers: {})
+      end
+
+      it 'creates incoming message with attachments in the twitter inbox' do
+        twitter_webhook.new(dm_image_params).consume
+        expect(twitter_inbox.contacts.count).to be 1
+        expect(twitter_inbox.conversations.count).to be 1
+        expect(twitter_inbox.messages.count).to be 1
+        expect(twitter_inbox.messages.last.attachments.count).to be 1
+      end
+    end
+
     context 'with tweet_params params' do
       it 'does not create incoming message in the twitter inbox if it is a blocked user' do
         twitter_webhook.new(tweet_params_from_blocked_user).consume

From d4be268cc36b0dd0d971625297e9d19c8e22dd2a Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Wed, 13 Apr 2022 12:04:34 +0530
Subject: [PATCH 048/177] enhancement: Remove clickaway for expanded reply box
 (#4414)

* enhancement: Remove clickaway for expanded reply box

* Removes unused imports

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
---
 .../components/widgets/conversation/MessagesView.vue          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index edd4e818d..280ddc158 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -83,7 +83,6 @@
         </div>
       </div>
       <reply-box
-        v-on-clickaway="closePopoutReplyBox"
         :conversation-id="currentChat.id"
         :is-a-tweet="isATweet"
         :selected-tweet="selectedTweet"
@@ -109,7 +108,6 @@ import inboxMixin from 'shared/mixins/inboxMixin';
 import { calculateScrollTop } from './helpers/scrollTopCalculationHelper';
 import { isEscape } from 'shared/helpers/KeyboardHelpers';
 import eventListenerMixins from 'shared/mixins/eventListenerMixins';
-import { mixin as clickaway } from 'vue-clickaway';
 
 export default {
   components: {
@@ -117,7 +115,7 @@ export default {
     ReplyBox,
     Banner,
   },
-  mixins: [conversationMixin, inboxMixin, eventListenerMixins, clickaway],
+  mixins: [conversationMixin, inboxMixin, eventListenerMixins],
   props: {
     isContactPanelOpen: {
       type: Boolean,

From 337a74a10ca1a2b4a4127c81c3339d5e591e721d Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 14 Apr 2022 13:36:55 +0530
Subject: [PATCH 049/177] feat: Add send message, fix issues with message
 conditions (#4423)

Co-authored-by: Tejaswini <tejaswini@chatwoot.com>
---
 .../accounts/automation_rules_controller.rb   | 13 ++-
 .../widgets/AutomationActionInput.vue         | 21 ++++-
 .../AutomationActionTeamMessageInput.vue      | 62 +++++++++++++
 .../dashboard/i18n/locale/en/automation.json  |  4 +-
 .../settings/automation/AddAutomationRule.vue |  6 +-
 .../automation/EditAutomationRule.vue         | 14 ++-
 .../dashboard/settings/automation/Index.vue   |  2 +-
 .../settings/automation/constants.js          | 91 ++++++++++++++-----
 app/listeners/automation_rule_listener.rb     |  2 +-
 .../automation_notification_mailer.rb         | 24 +----
 app/models/automation_rule.rb                 |  2 +-
 .../automation_rules/action_service.rb        | 19 ++--
 .../conditions_filter_service.rb              |  5 +-
 .../automation_rules_controller_spec.rb       | 30 +++++-
 .../automation_rule_listener_spec.rb          | 22 ++---
 15 files changed, 231 insertions(+), 86 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index dc4f7b6c8..41296db62 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -20,9 +20,15 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
   def show; end
 
   def update
-    @automation_rule.update(automation_rules_permit)
-    process_attachments
-    @automation_rule
+    ActiveRecord::Base.transaction do
+      @automation_rule.update!(automation_rules_permit)
+      @automation_rule.actions = params[:actions] if params[:actions]
+      @automation_rule.save!
+      process_attachments
+    rescue StandardError => e
+      Rails.logger.error e
+      render json: { error: @automation_rule.errors.messages }.to_json, status: :unprocessable_entity
+    end
   end
 
   def destroy
@@ -45,6 +51,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     params[:attachments].each do |uploaded_attachment|
       @automation_rule.files.attach(uploaded_attachment)
     end
+    @automation_rule
   end
 
   def automation_rules_permit
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index dc3a31c08..baa66afb4 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -7,7 +7,7 @@
       <select
         v-model="action_name"
         class="action__question"
-        :class="{ 'full-width': !inputType }"
+        :class="{ 'full-width': !showActionInput }"
         @change="resetAction()"
       >
         <option
@@ -61,6 +61,18 @@
         @click="removeAction"
       />
     </div>
+    <automation-action-team-message-input
+      v-if="inputType === 'team_message'"
+      v-model="action_params"
+      :teams="dropdownValues"
+    />
+    <textarea
+      v-if="inputType === 'textarea'"
+      v-model="action_params"
+      rows="4"
+      :placeholder="$t('AUTOMATION.ACTION.TEAM_MESSAGE_INPUT_PLACEHOLDER')"
+      class="action-message"
+    ></textarea>
     <p
       v-if="v.action_params.$dirty && v.action_params.$error"
       class="filter-error"
@@ -71,7 +83,11 @@
 </template>
 
 <script>
+import AutomationActionTeamMessageInput from './AutomationActionTeamMessageInput.vue';
 export default {
+  components: {
+    AutomationActionTeamMessageInput,
+  },
   props: {
     value: {
       type: Object,
@@ -211,4 +227,7 @@ export default {
 .multiselect {
   margin-bottom: var(--space-zero);
 }
+.action-message {
+  margin: var(--space-small) 0 0;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
new file mode 100644
index 000000000..cddaab713
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <div class="multiselect-wrap--small">
+      <multiselect
+        v-model="selectedTeams"
+        track-by="id"
+        label="name"
+        :placeholder="$t('AUTOMATION.ACTION.TEAM_DROPDOWN_PLACEHOLDER')"
+        :multiple="true"
+        selected-label
+        :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
+        deselect-label=""
+        :max-height="160"
+        :options="teams"
+        :allow-empty="false"
+        @input="updateValue"
+      />
+      <textarea
+        v-model="message"
+        rows="4"
+        :placeholder="$t('AUTOMATION.ACTION.TEAM_MESSAGE_INPUT_PLACEHOLDER')"
+        @input="updateValue"
+      ></textarea>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  // The value types are dynamic, hence prop validation removed to work with our action schema
+  // eslint-disable-next-line vue/require-prop-types
+  props: ['teams', 'value'],
+  data() {
+    return {
+      selectedTeams: [],
+      message: '',
+    };
+  },
+  mounted() {
+    const { team_ids: teamIds } = this.value;
+    this.selectedTeams = teamIds;
+    this.message = this.value.message;
+  },
+  methods: {
+    updateValue() {
+      this.$emit('input', {
+        team_ids: this.selectedTeams.map(team => team.id),
+        message: this.message,
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+.multiselect {
+  margin: var(--space-smaller) var(--space-zero);
+}
+textarea {
+  margin-bottom: var(--space-zero);
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index 8c92467bd..0d2076b65 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
index 73a02fd1a..66239b623 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/AddAutomationRule.vue
@@ -192,10 +192,11 @@ export default {
         $each: {
           action_params: {
             required: requiredIf(prop => {
+              if (prop.action_name === 'send_email_to_team') return true;
               return !(
                 prop.action_name === 'mute_conversation' ||
                 prop.action_name === 'snooze_conversation' ||
-                prop.action_name === 'resolve_convresation'
+                prop.action_name === 'resolve_conversation'
               );
             }),
           },
@@ -361,6 +362,7 @@ export default {
     getActionDropdownValues(type) {
       switch (type) {
         case 'assign_team':
+        case 'send_email_to_team':
           return this.$store.getters['teams/getTeams'];
         case 'add_label':
           return this.$store.getters['labels/getLabels'].map(i => {
@@ -443,6 +445,8 @@ export default {
       return true;
     },
     showActionInput(actionName) {
+      if (actionName === 'send_email_to_team' || actionName === 'send_message')
+        return false;
       const type = AUTOMATION_ACTION_TYPES.find(
         action => action.key === actionName
       ).inputType;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 14a8e84bb..6c5d03962 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -199,7 +199,7 @@ export default {
               return !(
                 prop.action_name === 'mute_conversation' ||
                 prop.action_name === 'snooze_conversation' ||
-                prop.action_name === 'resolve_convresation'
+                prop.action_name === 'resolve_conversation'
               );
             }),
           },
@@ -360,6 +360,7 @@ export default {
     getActionDropdownValues(type) {
       switch (type) {
         case 'assign_team':
+        case 'send_email_to_team':
           return this.$store.getters['teams/getTeams'];
         case 'add_label':
           return this.$store.getters['labels/getLabels'].map(i => {
@@ -475,6 +476,15 @@ export default {
             actionParams = [
               ...this.getActionDropdownValues(action.action_name),
             ].filter(item => [...action.action_params].includes(item.id));
+          } else if (inputType === 'team_message') {
+            actionParams = {
+              team_ids: [
+                ...this.getActionDropdownValues(action.action_name),
+              ].filter(item =>
+                [...action.action_params[0].team_ids].includes(item.id)
+              ),
+              message: action.action_params[0].message,
+            };
           } else actionParams = [...action.action_params];
         }
         return {
@@ -489,6 +499,8 @@ export default {
       };
     },
     showActionInput(actionName) {
+      if (actionName === 'send_email_to_team' || actionName === 'send_message')
+        return false;
       const type = AUTOMATION_ACTION_TYPES.find(
         action => action.key === actionName
       ).inputType;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index f028933cb..28b8c982f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -253,7 +253,7 @@ export default {
           : this.$t('AUTOMATION.TOGGLE.ACTIVATION_DESCRIPTION', {
               automationName: automation.name,
             });
-        // Check if uses confirms to proceed
+        // Check if user confirms to proceed
         const ok = await this.$refs.confirmDialog.showConfirmation();
         if (ok) {
           await await this.$store.dispatch('automations/update', {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index cd306007a..bdec6ebc0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -76,11 +76,16 @@ export const AUTOMATIONS = {
         name: 'Add a label',
         attributeI18nKey: 'ADD_LABEL',
       },
-      // {
-      //   key: 'send_email_to_team',
-      //   name: 'Send an email to team',
-      //   attributeI18nKey: 'SEND_MESSAGE',
-      // },
+      {
+        key: 'send_email_to_team',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_EMAIL_TO_TEAM',
+      },
+      {
+        key: 'send_message',
+        name: 'Send a message',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
       {
         key: 'send_email_transcript',
         name: 'Send an email transcript',
@@ -96,8 +101,9 @@ export const AUTOMATIONS = {
         name: 'Snooze conversation',
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
+
       {
-        key: 'resolve_convresation',
+        key: 'resolve_conversation',
         name: 'Resolve conversation',
         attributeI18nKey: 'RESOLVE_CONVERSATION',
       },
@@ -106,6 +112,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
+      // {
+      //   key: 'send_attachment',
+      //   name: 'Send Attachment',
+      //   attributeI18nKey: 'SEND_ATTACHMENT',
+      // },
     ],
   },
   conversation_created: {
@@ -132,7 +143,7 @@ export const AUTOMATIONS = {
         filterOperators: OPERATOR_TYPES_1,
       },
       {
-        key: 'referrer',
+        key: 'referer',
         name: 'Referrer Link',
         attributeI18nKey: 'REFERER_LINK',
         inputType: 'plain_text',
@@ -150,11 +161,16 @@ export const AUTOMATIONS = {
         name: 'Assign an agent',
         attributeI18nKey: 'ASSIGN_AGENT',
       },
-      // {
-      //   key: 'send_email_to_team',
-      //   name: 'Send an email to team',
-      //   attributeI18nKey: 'SEND_MESSAGE',
-      // },
+      {
+        key: 'send_email_to_team',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_EMAIL_TO_TEAM',
+      },
+      {
+        key: 'send_message',
+        name: 'Send a message',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
       {
         key: 'send_email_transcript',
         name: 'Send an email transcript',
@@ -171,7 +187,7 @@ export const AUTOMATIONS = {
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
       {
-        key: 'resolve_convresation',
+        key: 'resolve_conversation',
         name: 'Resolve conversation',
         attributeI18nKey: 'RESOLVE_CONVERSATION',
       },
@@ -180,6 +196,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
+      // {
+      //   key: 'send_attachment',
+      //   name: 'Send Attachment',
+      //   attributeI18nKey: 'SEND_ATTACHMENT',
+      // },
     ],
   },
   conversation_updated: {
@@ -238,11 +259,16 @@ export const AUTOMATIONS = {
         name: 'Assign an agent',
         attributeI18nKey: 'ASSIGN_AGENT',
       },
-      // {
-      //   key: 'send_email_to_team',
-      //   name: 'Send an email to team',
-      //   attributeI18nKey: 'SEND_MESSAGE',
-      // },
+      {
+        key: 'send_email_to_team',
+        name: 'Send an email to team',
+        attributeI18nKey: 'SEND_EMAIL_TO_TEAM',
+      },
+      {
+        key: 'send_message',
+        name: 'Send a message',
+        attributeI18nKey: 'SEND_MESSAGE',
+      },
       {
         key: 'send_email_transcript',
         name: 'Send an email transcript',
@@ -259,7 +285,7 @@ export const AUTOMATIONS = {
         attributeI18nKey: 'MUTE_CONVERSATION',
       },
       {
-        key: 'resolve_convresation',
+        key: 'resolve_conversation',
         name: 'Resolve conversation',
         attributeI18nKey: 'RESOLVE_CONVERSATION',
       },
@@ -268,6 +294,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
+      // {
+      //   key: 'send_attachment',
+      //   name: 'Send Attachment',
+      //   attributeI18nKey: 'SEND_ATTACHMENT',
+      // },
     ],
   },
 };
@@ -298,11 +329,11 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Add a label',
     inputType: 'multi_select',
   },
-  // {
-  //   key: 'send_email_to_team',
-  //   label: 'Send an email to team',
-  //   inputType: 'multi_select',
-  // },
+  {
+    key: 'send_email_to_team',
+    label: 'Send an email to team',
+    inputType: 'team_message',
+  },
   {
     key: 'send_email_transcript',
     label: 'Send an email transcript',
@@ -319,7 +350,7 @@ export const AUTOMATION_ACTION_TYPES = [
     inputType: null,
   },
   {
-    key: 'resolve_convresation',
+    key: 'resolve_conversation',
     label: 'Resolve conversation',
     inputType: null,
   },
@@ -328,4 +359,14 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Send Webhook Event',
     inputType: 'url',
   },
+  // {
+  //   key: 'send_attachment',
+  //   label: 'Send Attachment',
+  //   inputType: 'file',
+  // },
+  {
+    key: 'send_message',
+    label: 'Send a message',
+    inputType: 'textarea',
+  },
 ];
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index c8c021a4e..6ebc46666 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -36,7 +36,7 @@ class AutomationRuleListener < BaseListener
     return unless rule_present?('message_created', account)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation).message_conditions
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation, { message: message }).message_conditions
       ::AutomationRules::ActionService.new(rule, account, message.conversation).perform if conditions_match.present?
     end
   end
diff --git a/app/mailers/team_notifications/automation_notification_mailer.rb b/app/mailers/team_notifications/automation_notification_mailer.rb
index d6ca47f81..f1bf1ab40 100644
--- a/app/mailers/team_notifications/automation_notification_mailer.rb
+++ b/app/mailers/team_notifications/automation_notification_mailer.rb
@@ -7,29 +7,7 @@ class TeamNotifications::AutomationNotificationMailer < ApplicationMailer
     @custom_message = message
     @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
 
-    send_an_email_to_team and return
-  end
-
-  def conversation_updated(conversation, team, message)
-    return unless smtp_config_set_or_development?
-
-    @agents = team.team_members
-    @conversation = conversation
-    @custom_message = message
-    @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
-
-    send_an_email_to_team and return
-  end
-
-  def message_created(conversation, team, message)
-    return unless smtp_config_set_or_development?
-
-    @agents = team.team_members
-    @conversation = conversation
-    @custom_message = message
-    @action_url = app_account_conversation_url(account_id: @conversation.account_id, id: @conversation.display_id)
-
-    send_an_email_to_team and return
+    send_an_email_to_team
   end
 
   private
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 95cd9543e..1dcc2583d 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -27,7 +27,7 @@ class AutomationRule < ApplicationRecord
 
   scope :active, -> { where(active: true) }
 
-  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referrer city company].freeze
+  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company].freeze
   ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachments].freeze
 
   private
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 1249bd9c5..0771f817d 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -22,8 +22,6 @@ class AutomationRules::ActionService
   private
 
   def send_attachments(_file_params)
-    return if @rule.event_name == 'message_created'
-
     blobs = @rule.files.map { |file, _| file.blob }
     params = { content: nil, private: false, attachments: blobs }
     mb = Messages::MessageBuilder.new(nil, @conversation, params)
@@ -44,6 +42,10 @@ class AutomationRules::ActionService
     @conversation.snoozed!
   end
 
+  def resolve_conversation(_params)
+    @conversation.resolved!
+  end
+
   def change_status(status)
     @conversation.update!(status: status[0])
   end
@@ -54,8 +56,6 @@ class AutomationRules::ActionService
   end
 
   def send_message(message)
-    return if @rule.event_name == 'message_created'
-
     params = { content: message[0], private: false }
     mb = Messages::MessageBuilder.new(nil, @conversation, params)
     mb.perform
@@ -82,15 +82,10 @@ class AutomationRules::ActionService
   end
 
   def send_email_to_team(params)
-    team = Team.find(params[:team_ids][0])
+    teams = Team.where(id: params[0][:team_ids])
 
-    case @rule.event_name
-    when 'conversation_created', 'conversation_status_changed'
-      TeamNotifications::AutomationNotificationMailer.conversation_creation(@conversation, team, params[:message])&.deliver_now
-    when 'conversation_updated'
-      TeamNotifications::AutomationNotificationMailer.conversation_updated(@conversation, team, params[:message])&.deliver_now
-    when 'message_created'
-      TeamNotifications::AutomationNotificationMailer.message_created(@conversation, team, params[:message])&.deliver_now
+    teams.each do |team|
+      TeamNotifications::AutomationNotificationMailer.conversation_creation(@conversation, team, params[0][:message])&.deliver_now
     end
   end
 
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 46988771d..2ac011fbd 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -3,13 +3,14 @@ require 'json'
 class AutomationRules::ConditionsFilterService < FilterService
   ATTRIBUTE_MODEL = 'contact_attribute'.freeze
 
-  def initialize(rule, conversation = nil)
+  def initialize(rule, conversation = nil, options = {})
     super([], nil)
     @rule = rule
     @conversation = conversation
     @account = conversation.account
     file = File.read('./lib/filters/filter_keys.json')
     @filters = JSON.parse(file)
+    @options = options
   end
 
   def perform
@@ -41,7 +42,7 @@ class AutomationRules::ConditionsFilterService < FilterService
       current_filter = message_filters[query_hash['attribute_key']]
       @query_string += message_query_string(current_filter, query_hash.with_indifferent_access, current_index)
     end
-    records = Message.where(conversation: @conversation).where(@query_string, @filter_values.with_indifferent_access)
+    records = Message.where(id: @options[:message].id).where(@query_string, @filter_values.with_indifferent_access)
     records.any?
   end
 
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index 0b921bc07..2039daf15 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -259,17 +259,41 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      it 'returns for updated automation_rule for account' do
-        params = { name: 'Update name' }
+      let(:update_params) do
+        {
+          description: 'Update description',
+          name: 'Update name',
+          conditions: [
+            {
+              attribute_key: 'browser_language',
+              filter_operator: 'equal_to',
+              values: ['en'],
+              query_operator: 'AND'
+            }
+          ],
+          actions: [
+            {
+              action_name: :update_additional_attributes,
+              action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
+            }
+          ]
+        }.with_indifferent_access
+      end
+
+      it 'returns for cloned automation_rule for account' do
         expect(account.automation_rules.count).to eq(1)
+        expect(account.automation_rules.first.actions.size).to eq(4)
 
         patch "/api/v1/accounts/#{account.id}/automation_rules/#{automation_rule.id}",
               headers: administrator.create_new_auth_token,
-              params: params
+              params: update_params
 
         expect(response).to have_http_status(:success)
         body = JSON.parse(response.body, symbolize_names: true)
         expect(body[:payload][:name]).to eq('Update name')
+        expect(body[:payload][:description]).to eq('Update description')
+        expect(body[:payload][:conditions].size).to eq(1)
+        expect(body[:payload][:actions].size).to eq(1)
       end
 
       it 'returns for updated active flag for automation_rule' do
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index b0ed4d0bd..6bbffe077 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -30,10 +30,10 @@ describe AutomationRuleListener do
     automation_rule.update!(actions:
                                       [
                                         {
-                                          'action_name' => 'send_email_to_team', 'action_params' => {
+                                          'action_name' => 'send_email_to_team', 'action_params' => [{
                                             'message' => 'Please pay attention to this conversation, its from high priority customer',
                                             'team_ids' => [team.id]
-                                          }
+                                          }]
                                         },
                                         { 'action_name' => 'assign_team', 'action_params' => [team.id] },
                                         { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] },
@@ -104,7 +104,7 @@ describe AutomationRuleListener do
       it 'triggers automation rule send email transcript to the mentioned email' do
         mailer = double
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_updated)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
 
@@ -116,7 +116,7 @@ describe AutomationRuleListener do
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages).to be_empty
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_updated)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
 
@@ -202,7 +202,7 @@ describe AutomationRuleListener do
 
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_updated)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
 
@@ -214,7 +214,7 @@ describe AutomationRuleListener do
       it 'triggers automation rule send email to the team' do
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_updated)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
       end
@@ -224,7 +224,7 @@ describe AutomationRuleListener do
 
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_updated)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
 
@@ -256,7 +256,7 @@ describe AutomationRuleListener do
 
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:message_created)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.message_created(event)
 
@@ -269,7 +269,7 @@ describe AutomationRuleListener do
 
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:message_created)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.message_created(event)
 
@@ -281,7 +281,7 @@ describe AutomationRuleListener do
         expect(conversation.assignee).to be_nil
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:message_created)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.message_created(event)
 
@@ -295,7 +295,7 @@ describe AutomationRuleListener do
 
         automation_rule
 
-        expect(TeamNotifications::AutomationNotificationMailer).to receive(:message_created)
+        expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.message_created(event)
 

From 80e5d6d7a0fdf03b3a313b3ea679d42aac06ce7e Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 14 Apr 2022 17:15:57 +0530
Subject: [PATCH 050/177] feat: add chatwoot_edition variable for CE docker
 images (#4462)

* chore: add chatwoot_edition variable for CE docker images

* fix cw_edition variable

* chore: update comment

* feat: include cw_edition data in payload to hub

* refactor cw_edition to edition
---
 .github/workflows/publish_foss_docker.yml | 13 ++++++++++---
 lib/chatwoot_hub.rb                       |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish_foss_docker.yml b/.github/workflows/publish_foss_docker.yml
index f56d67f99..37f0f3e6e 100644
--- a/.github/workflows/publish_foss_docker.yml
+++ b/.github/workflows/publish_foss_docker.yml
@@ -1,7 +1,7 @@
 # #
 # # This action will publish Chatwoot CE docker image.
 # # This is set to run against merges to develop, master
-# # when tags are created.
+# # and when tags are created.
 # #
 
 name: Publish Chatwoot CE docker images
@@ -20,8 +20,10 @@ jobs:
     env:
       GIT_REF: ${{ github.head_ref || github.ref_name }} # ref_name to get tags/branches
     steps:
-      -
-        name: Set up QEMU
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
       - name: Set up Docker Buildx
@@ -32,6 +34,10 @@ jobs:
           rm -rf enterprise
           rm -rf spec/enterprise
 
+      - name: Set Chatwoot edition
+        run: |
+          echo -en '\nENV CW_EDITION="ce"' >> docker/Dockerfile
+
       - name: set docker tag
         run: |
           echo "DOCKER_TAG=chatwoot/chatwoot:$GIT_REF-ce" >> $GITHUB_ENV
@@ -50,6 +56,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v2
         with:
+          context: .
           file: docker/Dockerfile
           push: true
           tags: ${{ env.DOCKER_TAG }}
diff --git a/lib/chatwoot_hub.rb b/lib/chatwoot_hub.rb
index 655060c7e..86f296f79 100644
--- a/lib/chatwoot_hub.rb
+++ b/lib/chatwoot_hub.rb
@@ -16,7 +16,8 @@ class ChatwootHub
       installation_identifier: installation_identifier,
       installation_version: Chatwoot.config[:version],
       installation_host: URI.parse(ENV.fetch('FRONTEND_URL', '')).host,
-      installation_env: ENV.fetch('INSTALLATION_ENV', '')
+      installation_env: ENV.fetch('INSTALLATION_ENV', ''),
+      edition: ENV.fetch('CW_EDITION', '')
     }
   end
 

From 0319b78eacce64ffa0d6751b530475ad8ab4c503 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 14 Apr 2022 20:54:26 +0530
Subject: [PATCH 051/177] fix: Allow users to login even if they have access to
 more than 15 accounts (#4475)

---
 app/javascript/dashboard/App.vue              |  57 +++++---
 app/javascript/dashboard/api/auth.js          |  36 +----
 .../components/layout/AvailabilityStatus.vue  |   5 +-
 app/javascript/dashboard/helper/APIHelper.js  |   3 +-
 app/javascript/dashboard/helper/URLHelper.js  |  12 +-
 .../dashboard/helper/actionCable.js           |  11 +-
 app/javascript/dashboard/helper/pushHelper.js |   2 +-
 .../dashboard/helper/specs/URLHelper.spec.js  |  15 +-
 .../dashboard/routes/dashboard/Dashboard.vue  |   1 -
 app/javascript/dashboard/routes/index.js      |  84 ++++++-----
 app/javascript/dashboard/routes/index.spec.js | 131 ++++++++++-------
 .../dashboard/store/modules/auth.js           | 134 +++++++-----------
 .../store/modules/conversations/getters.js    |   5 +-
 .../store/modules/specs/auth/actions.spec.js  |  42 ++++--
 .../store/modules/specs/auth/getters.spec.js  | 119 ++++++++++------
 .../modules/specs/auth/mutations.spec.js      |  24 ++++
 .../dashboard/store/mutation-types.js         |   2 +-
 app/javascript/dashboard/store/utils/api.js   |  19 +--
 app/javascript/packs/application.js           |  16 +--
 19 files changed, 368 insertions(+), 350 deletions(-)

diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 2c91de16f..1e262f1ff 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="app" class="app-wrapper app-root">
+  <div v-if="!authUIFlags.isFetching" id="app" class="app-wrapper app-root">
     <update-banner :latest-chatwoot-version="latestChatwootVersion" />
     <transition name="fade" mode="out-in">
       <router-view></router-view>
@@ -11,21 +11,28 @@
     <woot-snackbar-box />
     <network-notification />
   </div>
+  <loading-state v-else />
 </template>
 
 <script>
-import { accountIdFromPathname } from './helper/URLHelper';
 import { mapGetters } from 'vuex';
 import AddAccountModal from '../dashboard/components/layout/sidebarComponents/AddAccountModal';
+import LoadingState from './components/widgets/LoadingState.vue';
 import NetworkNotification from './components/NetworkNotification';
 import UpdateBanner from './components/app/UpdateBanner.vue';
+import vueActionCable from './helper/actionCable';
 import WootSnackbarBox from './components/SnackbarContainer';
+import {
+  registerSubscription,
+  verifyServiceWorkerExistence,
+} from './helper/pushHelper';
 
 export default {
   name: 'App',
 
   components: {
     AddAccountModal,
+    LoadingState,
     NetworkNotification,
     UpdateBanner,
     WootSnackbarBox,
@@ -43,13 +50,12 @@ export default {
       getAccount: 'accounts/getAccount',
       currentUser: 'getCurrentUser',
       globalConfig: 'globalConfig/get',
+      authUIFlags: 'getAuthUIFlags',
+      currentAccountId: 'getCurrentAccountId',
     }),
     hasAccounts() {
-      return (
-        this.currentUser &&
-        this.currentUser.accounts &&
-        this.currentUser.accounts.length !== 0
-      );
+      const { accounts = [] } = this.currentUser || {};
+      return accounts.length > 0;
     },
   },
 
@@ -58,32 +64,37 @@ export default {
       if (!this.hasAccounts) {
         this.showAddAccountModal = true;
       }
+      verifyServiceWorkerExistence(registration =>
+        registration.pushManager.getSubscription().then(subscription => {
+          if (subscription) {
+            registerSubscription();
+          }
+        })
+      );
+    },
+    currentAccountId() {
+      if (this.currentAccountId) {
+        this.initializeAccount();
+      }
     },
   },
   mounted() {
-    this.$store.dispatch('setUser');
     this.setLocale(window.chatwootConfig.selectedLocale);
-    this.initializeAccount();
   },
-
   methods: {
     setLocale(locale) {
       this.$root.$i18n.locale = locale;
     },
-
     async initializeAccount() {
-      const { pathname } = window.location;
-      const accountId = accountIdFromPathname(pathname);
-
-      if (accountId) {
-        await this.$store.dispatch('accounts/get');
-        const {
-          locale,
-          latest_chatwoot_version: latestChatwootVersion,
-        } = this.getAccount(accountId);
-        this.setLocale(locale);
-        this.latestChatwootVersion = latestChatwootVersion;
-      }
+      await this.$store.dispatch('accounts/get');
+      const {
+        locale,
+        latest_chatwoot_version: latestChatwootVersion,
+      } = this.getAccount(this.currentAccountId);
+      const { pubsub_token: pubsubToken } = this.currentUser || {};
+      this.setLocale(locale);
+      this.latestChatwootVersion = latestChatwootVersion;
+      vueActionCable.init(pubsubToken);
     },
   },
 };
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index a8806f7fd..76042103f 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -1,6 +1,4 @@
-/* eslint no-console: 0 */
 /* global axios */
-/* eslint no-undef: "error" */
 
 import Cookies from 'js-cookie';
 import endPoints from './endPoints';
@@ -61,41 +59,15 @@ export default {
     });
     return fetchPromise;
   },
-
-  isLoggedIn() {
-    const hasAuthCookie = !!Cookies.getJSON('auth_data');
-    const hasUserCookie = !!Cookies.getJSON('user');
-    return hasAuthCookie && hasUserCookie;
+  hasAuthCookie() {
+    return !!Cookies.getJSON('cw_d_session_info');
   },
-
-  isAdmin() {
-    if (this.isLoggedIn()) {
-      return Cookies.getJSON('user').role === 'administrator';
-    }
-    return false;
-  },
-
   getAuthData() {
-    if (this.isLoggedIn()) {
-      return Cookies.getJSON('auth_data');
+    if (this.hasAuthCookie()) {
+      return Cookies.getJSON('cw_d_session_info');
     }
     return false;
   },
-  getPubSubToken() {
-    if (this.isLoggedIn()) {
-      const user = Cookies.getJSON('user') || {};
-      const { pubsub_token: pubsubToken } = user;
-      return pubsubToken;
-    }
-    return null;
-  },
-  getCurrentUser() {
-    if (this.isLoggedIn()) {
-      return Cookies.getJSON('user');
-    }
-    return null;
-  },
-
   verifyPasswordToken({ confirmationToken }) {
     return new Promise((resolve, reject) => {
       axios
diff --git a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
index 1ad4a9be3..1c70e6755 100644
--- a/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
+++ b/app/javascript/dashboard/components/layout/AvailabilityStatus.vue
@@ -53,7 +53,7 @@ export default {
   computed: {
     ...mapGetters({
       getCurrentUserAvailability: 'getCurrentUserAvailability',
-      getCurrentAccountId: 'getCurrentAccountId',
+      currentAccountId: 'getCurrentAccountId',
     }),
     availabilityDisplayLabel() {
       const availabilityIndex = AVAILABILITY_STATUS_KEYS.findIndex(
@@ -63,9 +63,6 @@ export default {
         availabilityIndex
       ];
     },
-    currentAccountId() {
-      return this.getCurrentAccountId;
-    },
     currentUserAvailability() {
       return this.getCurrentUserAvailability;
     },
diff --git a/app/javascript/dashboard/helper/APIHelper.js b/app/javascript/dashboard/helper/APIHelper.js
index 5dcb34f97..8119d1218 100644
--- a/app/javascript/dashboard/helper/APIHelper.js
+++ b/app/javascript/dashboard/helper/APIHelper.js
@@ -1,4 +1,3 @@
-/* eslint no-console: 0 */
 import Auth from '../api/auth';
 
 const parseErrorCode = error => Promise.reject(error);
@@ -7,7 +6,7 @@ export default axios => {
   const { apiHost = '' } = window.chatwootConfig || {};
   const wootApi = axios.create({ baseURL: `${apiHost}/` });
   // Add Auth Headers to requests if logged in
-  if (Auth.isLoggedIn()) {
+  if (Auth.hasAuthCookie()) {
     const {
       'access-token': accessToken,
       'token-type': tokenType,
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 583a99c7c..4c1a6f718 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -14,6 +14,9 @@ export const getLoginRedirectURL = (ssoAccountId, user) => {
   if (ssoAccount) {
     return frontendURL(`accounts/${ssoAccountId}/dashboard`);
   }
+  if (accounts.length) {
+    return frontendURL(`accounts/${accounts[0].id}/dashboard`);
+  }
   return DEFAULT_REDIRECT_URL;
 };
 
@@ -41,15 +44,6 @@ export const conversationUrl = ({
   return url;
 };
 
-export const accountIdFromPathname = pathname => {
-  const isInsideAccountScopedURLs = pathname.includes('/app/accounts');
-  const urlParam = pathname.split('/')[3];
-  // eslint-disable-next-line no-restricted-globals
-  const isScoped = isInsideAccountScopedURLs && !isNaN(urlParam);
-  const accountId = isScoped ? Number(urlParam) : '';
-  return accountId;
-};
-
 export const isValidURL = value => {
   /* eslint-disable no-useless-escape */
   const URL_REGEX = /^https?:\/\/(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)$/gm;
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index bbbbe8a8a..ee272643c 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -142,14 +142,7 @@ class ActionCableConnector extends BaseActionCableConnector {
 }
 
 export default {
-  init() {
-    if (AuthAPI.isLoggedIn()) {
-      const actionCable = new ActionCableConnector(
-        window.WOOT,
-        AuthAPI.getPubSubToken()
-      );
-      return actionCable;
-    }
-    return null;
+  init(pubsubToken) {
+    return new ActionCableConnector(window.WOOT, pubsubToken);
   },
 };
diff --git a/app/javascript/dashboard/helper/pushHelper.js b/app/javascript/dashboard/helper/pushHelper.js
index 17bc5c56e..e62d51ca2 100644
--- a/app/javascript/dashboard/helper/pushHelper.js
+++ b/app/javascript/dashboard/helper/pushHelper.js
@@ -44,7 +44,7 @@ export const getPushSubscriptionPayload = subscription => ({
 });
 
 export const sendRegistrationToServer = subscription => {
-  if (auth.isLoggedIn()) {
+  if (auth.hasAuthCookie()) {
     return NotificationSubscriptions.create(
       getPushSubscriptionPayload(subscription)
     );
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 832d90577..96c9a8156 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -1,7 +1,6 @@
 import {
   frontendURL,
   conversationUrl,
-  accountIdFromPathname,
   isValidURL,
   getLoginRedirectURL,
 } from '../URLHelper';
@@ -39,18 +38,6 @@ describe('#URL Helpers', () => {
     });
   });
 
-  describe('accountIdFromPathname', () => {
-    it('should return account id if accont scoped url is passed', () => {
-      expect(accountIdFromPathname('/app/accounts/1/settings/general')).toBe(1);
-    });
-    it('should return empty string if accont scoped url not is passed', () => {
-      expect(accountIdFromPathname('/app/accounts/settings/general')).toBe('');
-    });
-    it('should return empty string if empty string is passed', () => {
-      expect(accountIdFromPathname('')).toBe('');
-    });
-  });
-
   describe('isValidURL', () => {
     it('should return true if valid url is passed', () => {
       expect(isValidURL('https://chatwoot.com')).toBe(true);
@@ -75,7 +62,7 @@ describe('#URL Helpers', () => {
         getLoginRedirectURL('7500', {
           accounts: [{ id: '7501', name: 'Test Account 7501' }],
         })
-      ).toBe('/app/');
+      ).toBe('/app/accounts/7501/dashboard');
       expect(getLoginRedirectURL('7500', null)).toBe('/app/');
     });
   });
diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index b3dcdfe10..cfcaccfe5 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -92,7 +92,6 @@ export default {
     },
   },
   mounted() {
-    this.$store.dispatch('setCurrentAccountId', this.$route.params.accountId);
     window.addEventListener('resize', this.handleResize);
     this.handleResize();
     bus.$on(BUS_EVENTS.TOGGLE_SIDEMENU, this.toggleSidebar);
diff --git a/app/javascript/dashboard/routes/index.js b/app/javascript/dashboard/routes/index.js
index 14ef77bc3..2557538ec 100644
--- a/app/javascript/dashboard/routes/index.js
+++ b/app/javascript/dashboard/routes/index.js
@@ -1,21 +1,13 @@
 import VueRouter from 'vue-router';
 
-import auth from '../api/auth';
-import login from './login/login.routes';
-import dashboard from './dashboard/dashboard.routes';
-import authRoute from './auth/auth.routes';
 import { frontendURL } from '../helper/URLHelper';
 import { clearBrowserSessionCookies } from '../store/utils/api';
+import authRoute from './auth/auth.routes';
+import dashboard from './dashboard/dashboard.routes';
+import login from './login/login.routes';
+import store from '../store';
 
-const routes = [
-  ...login.routes,
-  ...dashboard.routes,
-  ...authRoute.routes,
-  {
-    path: '/',
-    redirect: '/app',
-  },
-];
+const routes = [...login.routes, ...dashboard.routes, ...authRoute.routes];
 
 window.roleWiseRoutes = {
   agent: [],
@@ -63,8 +55,8 @@ const routeValidators = [
   {
     protected: false,
     loggedIn: true,
-    handler: () => {
-      const user = auth.getCurrentUser();
+    handler: (_, getters) => {
+      const user = getters.getCurrentUser;
       return `accounts/${user.account_id}/dashboard`;
     },
   },
@@ -76,8 +68,8 @@ const routeValidators = [
   {
     protected: true,
     loggedIn: true,
-    handler: to => {
-      const user = auth.getCurrentUser();
+    handler: (to, getters) => {
+      const user = getters.getCurrentUser;
       const userRole = getUserRole(user, Number(to.params.accountId));
       const isAccessible = routeIsAccessibleFor(to.name, userRole);
       return isAccessible ? null : `accounts/${to.params.accountId}/dashboard`;
@@ -90,15 +82,20 @@ const routeValidators = [
   },
 ];
 
-export const validateAuthenticateRoutePermission = (to, from, next) => {
-  const isLoggedIn = auth.isLoggedIn();
+export const validateAuthenticateRoutePermission = (
+  to,
+  from,
+  next,
+  { getters }
+) => {
+  const isLoggedIn = getters.isLoggedIn;
   const isProtectedRoute = !unProtectedRoutes.includes(to.name);
   const strategy = routeValidators.find(
     validator =>
       validator.protected === isProtectedRoute &&
       validator.loggedIn === isLoggedIn
   );
-  const nextRoute = strategy.handler(to);
+  const nextRoute = strategy.handler(to, getters);
   return nextRoute ? next(frontendURL(nextRoute)) : next();
 };
 
@@ -109,38 +106,47 @@ const validateSSOLoginParams = to => {
   return isLoginRoute && hasValidSSOParams;
 };
 
-const validateRouteAccess = (to, from, next) => {
+export const validateRouteAccess = (to, from, next, { getters }) => {
+  // Disable navigation to signup page if signups are disabled
+  // Signup route has an attribute (requireSignupEnabled)
+  // defined in it's route definition
   if (
     window.chatwootConfig.signupEnabled !== 'true' &&
     to.meta &&
     to.meta.requireSignupEnabled
   ) {
-    const user = auth.getCurrentUser();
-    next(frontendURL(`accounts/${user.account_id}/dashboard`));
-  }
-
-  if (validateSSOLoginParams(to)) {
-    clearBrowserSessionCookies();
-    return next();
+    return next(frontendURL('login'));
   }
 
+  // For routes which doesn't care about authentication, skip validation
   if (authIgnoreRoutes.includes(to.name)) {
     return next();
   }
-  return validateAuthenticateRoutePermission(to, from, next);
+
+  return validateAuthenticateRoutePermission(to, from, next, { getters });
 };
 
-// protecting routes
-router.beforeEach((to, from, next) => {
-  if (!to.name) {
-    const user = auth.getCurrentUser();
-    if (user) {
-      return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+export const initalizeRouter = () => {
+  const userAuthentication = store.dispatch('setUser');
+  router.beforeEach((to, from, next) => {
+    if (validateSSOLoginParams(to)) {
+      clearBrowserSessionCookies();
+      next();
+      return;
     }
-    return next('/app/login');
-  }
 
-  return validateRouteAccess(to, from, next);
-});
+    userAuthentication.then(() => {
+      if (!to.name) {
+        const { isLoggedIn, getCurrentUser: user } = store.getters;
+        if (isLoggedIn) {
+          return next(frontendURL(`accounts/${user.account_id}/dashboard`));
+        }
+        return next('/app/login');
+      }
+
+      return validateRouteAccess(to, from, next, store);
+    });
+  });
+};
 
 export default router;
diff --git a/app/javascript/dashboard/routes/index.spec.js b/app/javascript/dashboard/routes/index.spec.js
index ef917af38..ae8b21d46 100644
--- a/app/javascript/dashboard/routes/index.spec.js
+++ b/app/javascript/dashboard/routes/index.spec.js
@@ -1,6 +1,8 @@
 import 'expect-more-jest';
-import { validateAuthenticateRoutePermission } from './index';
-import auth from '../api/auth';
+import {
+  validateAuthenticateRoutePermission,
+  validateRouteAccess,
+} from './index';
 
 jest.mock('./dashboard/dashboard.routes', () => ({
   routes: [],
@@ -11,94 +13,119 @@ jest.mock('./auth/auth.routes', () => ({
 jest.mock('./login/login.routes', () => ({
   routes: [],
 }));
-jest.mock('../constants', () => {
-  return {
-    GRAVATAR_URL: 'https://www.gravatar.com/avatar',
-    CHANNELS: {
-      FACEBOOK: 'facebook',
-    },
-    ASSIGNEE_TYPE: {
-      ME: 'me',
-      UNASSIGNED: 'unassigned',
-      ALL: 'all',
-    },
-    STATUS_TYPE: {
-      OPEN: 'open',
-      RESOLVED: 'resolved',
-    },
-  };
-});
-
 window.roleWiseRoutes = {};
 
-describe(`behavior`, () => {
+describe('#validateAuthenticateRoutePermission', () => {
   describe(`when route is not protected`, () => {
     it(`should go to the dashboard when user is logged in`, () => {
-      // Arrange
-      spyOn(auth, 'isLoggedIn').and.returnValue(true);
-      spyOn(auth, 'getCurrentUser').and.returnValue({
-        account_id: 1,
-        accounts: [{ id: 1, role: 'agent' }],
-      });
-      const to = { name: 'login' };
+      const to = { name: 'login', params: { accountId: 1 } };
       const from = { name: '', params: { accountId: 1 } };
       const next = jest.fn();
-      // Act
-      validateAuthenticateRoutePermission(to, from, next);
-      // Assert
+      const getters = {
+        isLoggedIn: true,
+        getCurrentUser: {
+          account_id: 1,
+          id: 1,
+          accounts: [{ id: 1, role: 'admin' }],
+        },
+      };
+      validateAuthenticateRoutePermission(to, from, next, { getters });
       expect(next).toHaveBeenCalledWith('/app/accounts/1/dashboard');
     });
+    it(`should go there when user is not logged in`, () => {
+      const to = { name: 'login', params: {} };
+      const from = { name: '', params: {} };
+      const next = jest.fn();
+      const getters = { isLoggedIn: false };
+      validateAuthenticateRoutePermission(to, from, next, { getters });
+      expect(next).toHaveBeenCalledWith();
+    });
   });
   describe(`when route is protected`, () => {
     describe(`when user not logged in`, () => {
       it(`should redirect to login`, () => {
         // Arrange
-        spyOn(auth, 'isLoggedIn').and.returnValue(false);
-        spyOn(auth, 'getCurrentUser').and.returnValue(null);
         const to = { name: 'some-protected-route', params: { accountId: 1 } };
         const from = { name: '' };
         const next = jest.fn();
-        // Act
-        validateAuthenticateRoutePermission(to, from, next);
-        // Assert
+        const getters = {
+          isLoggedIn: false,
+          getCurrentUser: {
+            account_id: null,
+            id: null,
+            accounts: [],
+          },
+        };
+        validateAuthenticateRoutePermission(to, from, next, { getters });
         expect(next).toHaveBeenCalledWith('/app/login');
       });
     });
     describe(`when user is logged in`, () => {
       describe(`when route is not accessible to current user`, () => {
         it(`should redirect to dashboard`, () => {
-          // Arrange
-          spyOn(auth, 'isLoggedIn').and.returnValue(true);
-          spyOn(auth, 'getCurrentUser').and.returnValue({
-            accounts: [{ id: 1, role: 'agent' }],
-          });
           window.roleWiseRoutes.agent = ['dashboard'];
           const to = { name: 'admin', params: { accountId: 1 } };
           const from = { name: '' };
           const next = jest.fn();
-          // Act
-          validateAuthenticateRoutePermission(to, from, next);
-          // Assert
+          const getters = {
+            isLoggedIn: true,
+            getCurrentUser: {
+              account_id: 1,
+              id: 1,
+              accounts: [{ id: 1, role: 'agent' }],
+            },
+          };
+          validateAuthenticateRoutePermission(to, from, next, { getters });
           expect(next).toHaveBeenCalledWith('/app/accounts/1/dashboard');
         });
       });
       describe(`when route is accessible to current user`, () => {
         it(`should go there`, () => {
-          // Arrange
-          spyOn(auth, 'isLoggedIn').and.returnValue(true);
-          spyOn(auth, 'getCurrentUser').and.returnValue({
-            accounts: [{ id: 1, role: 'agent' }],
-          });
           window.roleWiseRoutes.agent = ['dashboard', 'admin'];
           const to = { name: 'admin', params: { accountId: 1 } };
           const from = { name: '' };
           const next = jest.fn();
-          // Act
-          validateAuthenticateRoutePermission(to, from, next);
-          // Assert
+          const getters = {
+            isLoggedIn: true,
+            getCurrentUser: {
+              account_id: 1,
+              id: 1,
+              accounts: [{ id: 1, role: 'agent' }],
+            },
+          };
+          validateAuthenticateRoutePermission(to, from, next, { getters });
           expect(next).toHaveBeenCalledWith();
         });
       });
     });
   });
 });
+
+describe('#validateRouteAccess', () => {
+  it('returns to login if signup is disabled', () => {
+    window.chatwootConfig = { signupEnabled: 'false' };
+    const to = { name: 'auth_signup', meta: { requireSignupEnabled: true } };
+    const from = { name: '' };
+    const next = jest.fn();
+    validateRouteAccess(to, from, next, {});
+    expect(next).toHaveBeenCalledWith('/app/login');
+  });
+
+  it('returns next for an auth ignore route ', () => {
+    const to = { name: 'auth_confirmation' };
+    const from = { name: '' };
+    const next = jest.fn();
+
+    validateRouteAccess(to, from, next, {});
+    expect(next).toHaveBeenCalledWith();
+  });
+
+  it('returns route validation for everything else ', () => {
+    const to = { name: 'login' };
+    const from = { name: '' };
+    const next = jest.fn();
+
+    validateRouteAccess(to, from, next, { getters: { isLoggedIn: false } });
+    expect(next).toHaveBeenCalledWith();
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index 5b2feef11..cb28f0d01 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -1,28 +1,20 @@
-/* eslint no-param-reassign: 0 */
-import axios from 'axios';
 import Vue from 'vue';
-import * as types from '../mutation-types';
+import types from '../mutation-types';
 import authAPI from '../../api/auth';
-import createAxios from '../../helper/APIHelper';
-import actionCable from '../../helper/actionCable';
-import { setUser, getHeaderExpiry, clearCookiesOnLogout } from '../utils/api';
+import { setUser, clearCookiesOnLogout } from '../utils/api';
 import { getLoginRedirectURL } from '../../helper/URLHelper';
 
-const state = {
+const initialState = {
   currentUser: {
     id: null,
     account_id: null,
-    channel: null,
+    accounts: [],
     email: null,
     name: null,
-    provider: null,
-    uid: null,
-    subscription: {
-      state: null,
-      expiry: null,
-    },
   },
-  currentAccountId: null,
+  uiFlags: {
+    isFetching: true,
+  },
 };
 
 // getters
@@ -31,18 +23,22 @@ export const getters = {
     return !!$state.currentUser.id;
   },
 
-  getCurrentUserID(_state) {
-    return _state.currentUser.id;
+  getCurrentUserID($state) {
+    return $state.currentUser.id;
   },
 
-  getUISettings(_state) {
-    return _state.currentUser.ui_settings || {};
+  getUISettings($state) {
+    return $state.currentUser.ui_settings || {};
   },
 
-  getCurrentUserAvailability(_state) {
-    const { accounts = [] } = _state.currentUser;
+  getAuthUIFlags($state) {
+    return $state.uiFlags;
+  },
+
+  getCurrentUserAvailability($state, $getters) {
+    const { accounts = [] } = $state.currentUser;
     const [currentAccount = {}] = accounts.filter(
-      account => account.id === _state.currentAccountId
+      account => account.id === $getters.getCurrentAccountId
     );
     return currentAccount.availability;
   },
@@ -54,49 +50,45 @@ export const getters = {
     return null;
   },
 
-  getCurrentRole(_state) {
-    const { accounts = [] } = _state.currentUser;
+  getCurrentRole($state, $getters) {
+    const { accounts = [] } = $state.currentUser;
     const [currentAccount = {}] = accounts.filter(
-      account => account.id === _state.currentAccountId
+      account => account.id === $getters.getCurrentAccountId
     );
     return currentAccount.role;
   },
 
-  getCurrentUser(_state) {
-    return _state.currentUser;
+  getCurrentUser($state) {
+    return $state.currentUser;
   },
 
-  getMessageSignature(_state) {
-    const { message_signature: messageSignature } = _state.currentUser;
+  getMessageSignature($state) {
+    const { message_signature: messageSignature } = $state.currentUser;
 
     return messageSignature || '';
   },
 
-  getCurrentAccount(_state) {
-    const { accounts = [] } = _state.currentUser;
+  getCurrentAccount($state, $getters) {
+    const { accounts = [] } = $state.currentUser;
     const [currentAccount = {}] = accounts.filter(
-      account => account.id === _state.currentAccountId
+      account => account.id === $getters.getCurrentAccountId
     );
     return currentAccount || {};
   },
 
-  getUserAccounts(_state) {
-    const { accounts = [] } = _state.currentUser;
+  getUserAccounts($state) {
+    const { accounts = [] } = $state.currentUser;
     return accounts;
   },
 };
 
 // actions
 export const actions = {
-  login({ commit }, { ssoAccountId, ...credentials }) {
+  login(_, { ssoAccountId, ...credentials }) {
     return new Promise((resolve, reject) => {
       authAPI
         .login(credentials)
         .then(response => {
-          commit(types.default.SET_CURRENT_USER);
-          window.axios = createAxios(axios);
-          actionCable.init(Vue);
-
           window.location = getLoginRedirectURL(ssoAccountId, response.data);
           resolve();
         })
@@ -108,43 +100,40 @@ export const actions = {
   async validityCheck(context) {
     try {
       const response = await authAPI.validityCheck();
-      setUser(response.data.payload.data, getHeaderExpiry(response), {
-        setUserInSDK: true,
-      });
-      context.commit(types.default.SET_CURRENT_USER);
+      const currentUser = response.data.payload.data;
+      setUser(currentUser);
+      context.commit(types.SET_CURRENT_USER, currentUser);
     } catch (error) {
       if (error?.response?.status === 401) {
         clearCookiesOnLogout();
       }
     }
   },
-  setUser({ commit, dispatch }) {
-    if (authAPI.isLoggedIn()) {
-      commit(types.default.SET_CURRENT_USER);
-      dispatch('validityCheck');
+  async setUser({ commit, dispatch }) {
+    if (authAPI.hasAuthCookie()) {
+      await dispatch('validityCheck');
     } else {
-      commit(types.default.CLEAR_USER);
+      commit(types.CLEAR_USER);
     }
+    commit(types.SET_CURRENT_USER_UI_FLAGS, { isFetching: false });
   },
   logout({ commit }) {
-    commit(types.default.CLEAR_USER);
+    commit(types.CLEAR_USER);
   },
 
   updateProfile: async ({ commit }, params) => {
     // eslint-disable-next-line no-useless-catch
     try {
       const response = await authAPI.profileUpdate(params);
-      setUser(response.data, getHeaderExpiry(response));
-      commit(types.default.SET_CURRENT_USER);
+      commit(types.SET_CURRENT_USER, response.data);
     } catch (error) {
       throw error;
     }
   },
 
-  deleteAvatar: async ({ commit }) => {
+  deleteAvatar: async () => {
     try {
       await authAPI.deleteAvatar();
-      commit(types.default.SET_CURRENT_USER);
     } catch (error) {
       // Ignore error
     }
@@ -152,10 +141,9 @@ export const actions = {
 
   updateUISettings: async ({ commit }, params) => {
     try {
-      commit(types.default.SET_CURRENT_USER_UI_SETTINGS, params);
+      commit(types.SET_CURRENT_USER_UI_SETTINGS, params);
       const response = await authAPI.updateUISettings(params);
-      setUser(response.data, getHeaderExpiry(response));
-      commit(types.default.SET_CURRENT_USER);
+      commit(types.SET_CURRENT_USER, response.data);
     } catch (error) {
       // Ignore error
     }
@@ -166,45 +154,32 @@ export const actions = {
       const response = await authAPI.updateAvailability(params);
       const userData = response.data;
       const { id } = userData;
-      setUser(userData, getHeaderExpiry(response));
-      commit(types.default.SET_CURRENT_USER);
+      commit(types.SET_CURRENT_USER, response.data);
       dispatch('agents/updatePresence', { [id]: params.availability });
     } catch (error) {
       // Ignore error
     }
   },
 
-  setCurrentAccountId({ commit }, accountId) {
-    commit(types.default.SET_CURRENT_ACCOUNT_ID, accountId);
-  },
-
   setCurrentUserAvailability({ commit, state: $state }, data) {
     if (data[$state.currentUser.id]) {
-      commit(
-        types.default.SET_CURRENT_USER_AVAILABILITY,
-        data[$state.currentUser.id]
-      );
+      commit(types.SET_CURRENT_USER_AVAILABILITY, data[$state.currentUser.id]);
     }
   },
 };
 
 // mutations
 export const mutations = {
-  [types.default.SET_CURRENT_USER_AVAILABILITY](_state, availability) {
+  [types.SET_CURRENT_USER_AVAILABILITY](_state, availability) {
     Vue.set(_state.currentUser, 'availability', availability);
   },
-  [types.default.CLEAR_USER](_state) {
-    _state.currentUser.id = null;
+  [types.CLEAR_USER](_state) {
+    _state.currentUser = initialState.currentUser;
   },
-  [types.default.SET_CURRENT_USER](_state) {
-    const currentUser = {
-      ...authAPI.getAuthData(),
-      ...authAPI.getCurrentUser(),
-    };
-
+  [types.SET_CURRENT_USER](_state, currentUser) {
     Vue.set(_state, 'currentUser', currentUser);
   },
-  [types.default.SET_CURRENT_USER_UI_SETTINGS](_state, { uiSettings }) {
+  [types.SET_CURRENT_USER_UI_SETTINGS](_state, { uiSettings }) {
     Vue.set(_state, 'currentUser', {
       ..._state.currentUser,
       ui_settings: {
@@ -213,13 +188,14 @@ export const mutations = {
       },
     });
   },
-  [types.default.SET_CURRENT_ACCOUNT_ID](_state, accountId) {
-    Vue.set(_state, 'currentAccountId', Number(accountId));
+
+  [types.SET_CURRENT_USER_UI_FLAGS](_state, { isFetching }) {
+    Vue.set(_state, 'uiFlags', { isFetching });
   },
 };
 
 export default {
-  state,
+  state: initialState,
   getters,
   actions,
   mutations,
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index 60ca0d590..75d9aef44 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -1,4 +1,3 @@
-import authAPI from '../../../api/auth';
 import { MESSAGE_TYPE } from 'shared/constants/messages';
 import { applyPageFilters } from './helpers';
 
@@ -40,8 +39,8 @@ const getters = {
 
     return lastEmail;
   },
-  getMineChats: _state => activeFilters => {
-    const currentUserID = authAPI.getCurrentUser().id;
+  getMineChats: (_state, _, __, rootGetters) => activeFilters => {
+    const currentUserID = rootGetters.getCurrentUser?.id;
 
     return _state.allConversations.filter(conversation => {
       const { assignee } = conversation.meta;
diff --git a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
index 2a09ae576..3490d0d29 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
@@ -29,7 +29,9 @@ describe('#actions', () => {
       });
       await actions.validityCheck({ commit });
       expect(setUser).toHaveBeenCalledTimes(1);
-      expect(commit.mock.calls).toEqual([[types.default.SET_CURRENT_USER]]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CURRENT_USER, { id: 1, name: 'John' }],
+      ]);
     });
     it('sends correct actions if API is error', async () => {
       axios.get.mockRejectedValue({
@@ -47,8 +49,9 @@ describe('#actions', () => {
         headers: { expiry: 581842904 },
       });
       await actions.updateProfile({ commit }, { name: 'Pranav' });
-      expect(setUser).toHaveBeenCalledTimes(1);
-      expect(commit.mock.calls).toEqual([[types.default.SET_CURRENT_USER]]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CURRENT_USER, { id: 1, name: 'John' }],
+      ]);
     });
   });
 
@@ -57,7 +60,8 @@ describe('#actions', () => {
       axios.post.mockResolvedValue({
         data: {
           id: 1,
-          account_users: [{ account_id: 1, availability_status: 'offline' }],
+          name: 'John',
+          accounts: [{ account_id: 1, availability_status: 'offline' }],
         },
         headers: { expiry: 581842904 },
       });
@@ -65,8 +69,16 @@ describe('#actions', () => {
         { commit, dispatch },
         { availability: 'offline', account_id: 1 }
       );
-      expect(setUser).toHaveBeenCalledTimes(1);
-      expect(commit.mock.calls).toEqual([[types.default.SET_CURRENT_USER]]);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.SET_CURRENT_USER,
+          {
+            id: 1,
+            name: 'John',
+            accounts: [{ account_id: 1, availability_status: 'offline' }],
+          },
+        ],
+      ]);
       expect(dispatch.mock.calls).toEqual([
         ['agents/updatePresence', { 1: 'offline' }],
       ]);
@@ -88,13 +100,20 @@ describe('#actions', () => {
         { commit, dispatch },
         { uiSettings: { is_contact_sidebar_open: false } }
       );
-      expect(setUser).toHaveBeenCalledTimes(1);
       expect(commit.mock.calls).toEqual([
         [
           types.default.SET_CURRENT_USER_UI_SETTINGS,
           { uiSettings: { is_contact_sidebar_open: false } },
         ],
-        [types.default.SET_CURRENT_USER],
+        [
+          types.default.SET_CURRENT_USER,
+          {
+            id: 1,
+            name: 'John',
+            availability_status: 'offline',
+            ui_settings: { is_contact_sidebar_open: true },
+          },
+        ],
       ]);
     });
   });
@@ -103,14 +122,17 @@ describe('#actions', () => {
     it('sends correct actions if user is logged in', async () => {
       Cookies.getJSON.mockImplementation(() => true);
       actions.setUser({ commit, dispatch });
-      expect(commit.mock.calls).toEqual([[types.default.SET_CURRENT_USER]]);
+      expect(commit.mock.calls).toEqual([]);
       expect(dispatch.mock.calls).toEqual([['validityCheck']]);
     });
 
     it('sends correct actions if user is not logged in', async () => {
       Cookies.getJSON.mockImplementation(() => false);
       actions.setUser({ commit, dispatch });
-      expect(commit.mock.calls).toEqual([[types.default.CLEAR_USER]]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.CLEAR_USER],
+        [types.default.SET_CURRENT_USER_UI_FLAGS, { isFetching: false }],
+      ]);
       expect(dispatch).toHaveBeenCalledTimes(0);
     });
   });
diff --git a/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js b/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
index 61b738115..6032189c9 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
@@ -4,39 +4,74 @@ import '../../../../routes';
 
 jest.mock('../../../../routes', () => {});
 describe('#getters', () => {
-  it('isLoggedIn', () => {
-    expect(getters.isLoggedIn({ currentUser: { id: null } })).toEqual(false);
-    expect(getters.isLoggedIn({ currentUser: { id: 1 } })).toEqual(true);
+  describe('#isLoggedIn', () => {
+    it('return correct value if user data is available', () => {
+      expect(getters.isLoggedIn({ currentUser: { id: null } })).toEqual(false);
+      expect(getters.isLoggedIn({ currentUser: { id: 1 } })).toEqual(true);
+    });
   });
 
-  it('getCurrentUserID', () => {
-    expect(getters.getCurrentUserID({ currentUser: { id: 1 } })).toEqual(1);
-  });
-  it('getCurrentUser', () => {
-    expect(
-      getters.getCurrentUser({ currentUser: { id: 1, name: 'Pranav' } })
-    ).toEqual({ id: 1, name: 'Pranav' });
+  describe('#getCurrentUser', () => {
+    it('returns current user id', () => {
+      expect(getters.getCurrentUserID({ currentUser: { id: 1 } })).toEqual(1);
+    });
   });
 
-  it('get', () => {
-    expect(
-      getters.getCurrentUserAvailability({
-        currentAccountId: 1,
-        currentUser: {
-          id: 1,
-          accounts: [{ id: 1, availability: 'busy' }],
-        },
-      })
-    ).toEqual('busy');
+  describe('#getCurrentUser', () => {
+    it('returns current user object', () => {
+      expect(
+        getters.getCurrentUser({ currentUser: { id: 1, name: 'Pranav' } })
+      ).toEqual({ id: 1, name: 'Pranav' });
+    });
   });
 
-  it('getUISettings', () => {
-    expect(
-      getters.getUISettings({
-        currentUser: { ui_settings: { is_contact_sidebar_open: true } },
-      })
-    ).toEqual({ is_contact_sidebar_open: true });
+  describe('#getCurrentRole', () => {
+    it('returns current role if account is available', () => {
+      expect(
+        getters.getCurrentRole(
+          { currentUser: { accounts: [{ id: 1, role: 'admin' }] } },
+          { getCurrentAccountId: 1 }
+        )
+      ).toEqual('admin');
+    });
+
+    it('returns undefined if account is not available', () => {
+      expect(
+        getters.getCurrentRole(
+          { currentUser: { accounts: [{ id: 1, role: 'admin' }] } },
+          { getCurrentAccountId: 2 }
+        )
+      ).toEqual(undefined);
+    });
   });
+
+  describe('#getCurrentUserAvailability', () => {
+    it('returns correct availability status', () => {
+      expect(
+        getters.getCurrentUserAvailability(
+          {
+            currentAccountId: 1,
+            currentUser: {
+              id: 1,
+              accounts: [{ id: 1, availability: 'busy' }],
+            },
+          },
+          { getCurrentAccountId: 1 }
+        )
+      ).toEqual('busy');
+    });
+  });
+
+  describe('#getUISettings', () => {
+    it('return correct UI Settings', () => {
+      expect(
+        getters.getUISettings({
+          currentUser: { ui_settings: { is_contact_sidebar_open: true } },
+        })
+      ).toEqual({ is_contact_sidebar_open: true });
+    });
+  });
+
   describe('#getMessageSignature', () => {
     it('Return signature when signature is present', () => {
       expect(
@@ -46,11 +81,7 @@ describe('#getters', () => {
       ).toEqual('Thanks');
     });
     it('Return empty string when signature is not present', () => {
-      expect(
-        getters.getMessageSignature({
-          currentUser: {},
-        })
-      ).toEqual('');
+      expect(getters.getMessageSignature({ currentUser: {} })).toEqual('');
     });
   });
 
@@ -59,22 +90,23 @@ describe('#getters', () => {
       expect(
         getters.getCurrentAccount({
           currentUser: {},
-          currentAccountId: 1,
         })
       ).toEqual({});
-
       expect(
-        getters.getCurrentAccount({
-          currentUser: {
-            accounts: [
-              {
-                name: 'Chatwoot',
-                id: 1,
-              },
-            ],
+        getters.getCurrentAccount(
+          {
+            currentUser: {
+              accounts: [
+                {
+                  name: 'Chatwoot',
+                  id: 1,
+                },
+              ],
+            },
+            currentAccountId: 1,
           },
-          currentAccountId: 1,
-        })
+          { getCurrentAccountId: 1 }
+        )
       ).toEqual({
         name: 'Chatwoot',
         id: 1,
@@ -89,7 +121,6 @@ describe('#getters', () => {
           currentUser: {},
         })
       ).toEqual([]);
-
       expect(
         getters.getUserAccounts({
           currentUser: {
diff --git a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
index 98e7530fa..43b5d0e3e 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/mutations.spec.js
@@ -18,4 +18,28 @@ describe('#mutations', () => {
       });
     });
   });
+  describe('#SET_CURRENT_USER_UI_FLAGS', () => {
+    it('set auth ui flags', () => {
+      const state = {
+        uiFlags: { isFetching: false },
+      };
+      mutations[types.SET_CURRENT_USER_UI_FLAGS](state, { isFetching: true });
+      expect(state.uiFlags.isFetching).toEqual(true);
+    });
+  });
+  describe('#CLEAR_USER', () => {
+    it('set auth ui flags', () => {
+      const state = {
+        currentUser: { id: 1 },
+      };
+      mutations[types.CLEAR_USER](state);
+      expect(state.currentUser).toEqual({
+        id: null,
+        account_id: null,
+        accounts: [],
+        email: null,
+        name: null,
+      });
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 9a24fa3b4..1c99f97d3 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -2,9 +2,9 @@ export default {
   AUTHENTICATE: 'AUTHENTICATE',
   CLEAR_USER: 'LOGOUT',
   SET_CURRENT_USER: 'SET_CURRENT_USER',
-  SET_CURRENT_ACCOUNT_ID: 'SET_CURRENT_ACCOUNT_ID',
   SET_CURRENT_USER_AVAILABILITY: 'SET_CURRENT_USER_AVAILABILITY',
   SET_CURRENT_USER_UI_SETTINGS: 'SET_CURRENT_USER_UI_SETTINGS',
+  SET_CURRENT_USER_UI_FLAGS: 'SET_CURRENT_USER_UI_FLAGS',
 
   // Chat List
   RECEIVE_CHAT_LIST: 'RECEIVE_CHAT_LIST',
diff --git a/app/javascript/dashboard/store/utils/api.js b/app/javascript/dashboard/store/utils/api.js
index 37fd68c7b..54974e233 100644
--- a/app/javascript/dashboard/store/utils/api.js
+++ b/app/javascript/dashboard/store/utils/api.js
@@ -1,8 +1,6 @@
-/* eslint no-param-reassign: 0 */
 import fromUnixTime from 'date-fns/fromUnixTime';
 import differenceInDays from 'date-fns/differenceInDays';
 import Cookies from 'js-cookie';
-import { frontendURL } from '../../helper/URLHelper';
 import {
   ANALYTICS_IDENTITY,
   ANALYTICS_RESET,
@@ -17,14 +15,9 @@ export const setLoadingStatus = (state, status) => {
   state.fetchAPIloadingStatus = status;
 };
 
-export const setUser = (user, expiryDate, options = {}) => {
-  if (options && options.setUserInSDK) {
-    window.bus.$emit(CHATWOOT_SET_USER, { user });
-    window.bus.$emit(ANALYTICS_IDENTITY, { user });
-  }
-  Cookies.set('user', user, {
-    expires: differenceInDays(expiryDate, new Date()),
-  });
+export const setUser = user => {
+  window.bus.$emit(CHATWOOT_SET_USER, { user });
+  window.bus.$emit(ANALYTICS_IDENTITY, { user });
 };
 
 export const getHeaderExpiry = response =>
@@ -32,13 +25,14 @@ export const getHeaderExpiry = response =>
 
 export const setAuthCredentials = response => {
   const expiryDate = getHeaderExpiry(response);
-  Cookies.set('auth_data', response.headers, {
+  Cookies.set('cw_d_session_info', response.headers, {
     expires: differenceInDays(expiryDate, new Date()),
   });
   setUser(response.data.data, expiryDate);
 };
 
 export const clearBrowserSessionCookies = () => {
+  Cookies.remove('cw_d_session_info');
   Cookies.remove('auth_data');
   Cookies.remove('user');
 };
@@ -48,7 +42,6 @@ export const clearCookiesOnLogout = () => {
   window.bus.$emit(ANALYTICS_RESET);
   clearBrowserSessionCookies();
   const globalConfig = window.globalConfig || {};
-  const logoutRedirectLink =
-    globalConfig.LOGOUT_REDIRECT_LINK || frontendURL('login');
+  const logoutRedirectLink = globalConfig.LOGOUT_REDIRECT_LINK || '/';
   window.location = logoutRedirectLink;
 };
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 79b9e927e..0f99970c0 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -26,14 +26,9 @@ import {
   initOnEvents,
 } from '../shared/helpers/AudioNotificationHelper';
 import { initFaviconSwitcher } from '../shared/helpers/faviconHelper';
-import router from '../dashboard/routes';
+import router, { initalizeRouter } from '../dashboard/routes';
 import store from '../dashboard/store';
-import vueActionCable from '../dashboard/helper/actionCable';
 import constants from '../dashboard/constants';
-import {
-  verifyServiceWorkerExistence,
-  registerSubscription,
-} from '../dashboard/helper/pushHelper';
 import * as Sentry from '@sentry/vue';
 import 'vue-easytable/libs/theme-default/index.css';
 import { Integrations } from '@sentry/tracing';
@@ -93,6 +88,7 @@ window.axios = createAxios(axios);
 window.bus = new Vue();
 initializeChatwootEvents();
 initializeAnalyticsEvents();
+initalizeRouter();
 
 window.onload = () => {
   window.WOOT = new Vue({
@@ -102,7 +98,6 @@ window.onload = () => {
     components: { App },
     template: '<App/>',
   }).$mount('#app');
-  vueActionCable.init();
 };
 
 const setupAudioListeners = () => {
@@ -113,13 +108,6 @@ const setupAudioListeners = () => {
   });
 };
 window.addEventListener('load', () => {
-  verifyServiceWorkerExistence(registration =>
-    registration.pushManager.getSubscription().then(subscription => {
-      if (subscription) {
-        registerSubscription();
-      }
-    })
-  );
   window.playAudioAlert = () => {};
   initOnEvents.forEach(e => {
     document.addEventListener(e, setupAudioListeners, false);

From 04e890070dde3c89d54831a8e19f0c21b637a190 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Mon, 18 Apr 2022 11:38:22 +0530
Subject: [PATCH 052/177] fix: Change report_type to type in report API docs
 (#4492)

---
 swagger/parameters/report_type.yml | 2 +-
 swagger/swagger.json               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/swagger/parameters/report_type.yml b/swagger/parameters/report_type.yml
index 5def952c6..9f5fbf363 100644
--- a/swagger/parameters/report_type.yml
+++ b/swagger/parameters/report_type.yml
@@ -1,5 +1,5 @@
 in: query
-name: report_type
+name: type
 type: string
 enum:
   - account
diff --git a/swagger/swagger.json b/swagger/swagger.json
index c1266fcff..7ec216f9a 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5755,7 +5755,7 @@
     },
     "report_type": {
       "in": "query",
-      "name": "report_type",
+      "name": "type",
       "type": "string",
       "enum": [
         "account",

From e010f0c6f033eb9153b07e01ce5cd5c5dd484aba Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 18 Apr 2022 14:06:27 +0530
Subject: [PATCH 053/177] chore: Sync pre-chat fields after custom attribute
 destroy (#4456)

---
 .../sync_widget_pre_chat_custom_fields_job.rb | 11 ++++++++
 app/models/custom_attribute_definition.rb     |  7 +++++
 ..._widget_pre_chat_custom_fields_job_spec.rb | 26 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 app/jobs/inboxes/sync_widget_pre_chat_custom_fields_job.rb
 create mode 100644 spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb

diff --git a/app/jobs/inboxes/sync_widget_pre_chat_custom_fields_job.rb b/app/jobs/inboxes/sync_widget_pre_chat_custom_fields_job.rb
new file mode 100644
index 000000000..d4192a665
--- /dev/null
+++ b/app/jobs/inboxes/sync_widget_pre_chat_custom_fields_job.rb
@@ -0,0 +1,11 @@
+class Inboxes::SyncWidgetPreChatCustomFieldsJob < ApplicationJob
+  queue_as :default
+
+  def perform(account, field_name)
+    account.web_widgets.all.find_each do |web_widget|
+      pre_chat_fields = web_widget.pre_chat_form_options['pre_chat_fields']
+      web_widget.pre_chat_form_options['pre_chat_fields'] = pre_chat_fields.reject { |field| field['name'] == field_name }
+      web_widget.save!
+    end
+  end
+end
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 72b67ce06..9feca3994 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -34,4 +34,11 @@ class CustomAttributeDefinition < ApplicationRecord
   enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
 
   belongs_to :account
+  after_destroy :sync_widget_pre_chat_custom_fields
+
+  private
+
+  def sync_widget_pre_chat_custom_fields
+    ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_later(attribute_key)
+  end
 end
diff --git a/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
new file mode 100644
index 000000000..e6b23dccc
--- /dev/null
+++ b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+RSpec.describe Inboxes::SyncWidgetPreChatCustomFieldsJob, type: :job do
+  pre_chat_fields = [{
+    'label' => 'Developer Id',
+    'name' => 'developer_id'
+  }, {
+    'label' => 'Full Name',
+    'name' => 'full_name'
+  }]
+  pre_chat_message = 'Share your queries here.'
+  let!(:account) { create(:account) }
+  let!(:web_widget) do
+    create(:channel_widget, account: account, pre_chat_form_options: { pre_chat_message: pre_chat_message, pre_chat_fields: pre_chat_fields })
+  end
+
+  context 'when called' do
+    it 'reopens snoozed conversations whose snooze until has passed' do
+      described_class.perform_now(account, 'developer_id')
+      expect(web_widget.reload.pre_chat_form_options['pre_chat_fields']).to eq [{
+        'label' => 'Full Name',
+        'name' => 'full_name'
+      }]
+    end
+  end
+end

From 17fb6b8d550b0e3fccb8b6ec6bbd7595628b449c Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 18 Apr 2022 18:15:20 +0530
Subject: [PATCH 054/177] fix: Update business hour calculation (#4496)

---
 app/javascript/shared/helpers/DateHelper.js   | 17 +++---
 .../shared/helpers/specs/DateHelper.spec.js   | 38 +++++-------
 .../widget/components/TeamAvailability.vue    |  1 +
 app/javascript/widget/mixins/availability.js  | 49 +++++++++------
 .../mixins/specs/availabilityMixin.spec.js    | 60 +++++++++++++++++++
 package.json                                  |  1 +
 yarn.lock                                     |  5 ++
 7 files changed, 125 insertions(+), 46 deletions(-)
 create mode 100644 app/javascript/widget/mixins/specs/availabilityMixin.spec.js

diff --git a/app/javascript/shared/helpers/DateHelper.js b/app/javascript/shared/helpers/DateHelper.js
index 6adc36951..15638c5a8 100644
--- a/app/javascript/shared/helpers/DateHelper.js
+++ b/app/javascript/shared/helpers/DateHelper.js
@@ -2,7 +2,6 @@ import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 import isToday from 'date-fns/isToday';
 import isYesterday from 'date-fns/isYesterday';
-import parseISO from 'date-fns/parseISO';
 
 export const formatUnixDate = (date, dateFormat = 'MMM dd, yyyy') => {
   const unixDate = fromUnixTime(date);
@@ -20,10 +19,14 @@ export const formatDigitToString = val => {
   return val > 9 ? `${val}` : `0${val}`;
 };
 
-export const buildDateFromTime = (hr, min, utcOffset, date = new Date()) => {
-  const today = format(date, 'yyyy-MM-dd');
-  const hour = formatDigitToString(hr);
-  const minute = formatDigitToString(min);
-  const timeString = `${today}T${hour}:${minute}:00${utcOffset}`;
-  return parseISO(timeString);
+export const isTimeAfter = (h1, m1, h2, m2) => {
+  if (h1 < h2) {
+    return false;
+  }
+
+  if (h1 === h2) {
+    return m1 >= m2;
+  }
+
+  return true;
 };
diff --git a/app/javascript/shared/helpers/specs/DateHelper.spec.js b/app/javascript/shared/helpers/specs/DateHelper.spec.js
index 283950ed1..c67c1a27b 100644
--- a/app/javascript/shared/helpers/specs/DateHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/DateHelper.spec.js
@@ -1,8 +1,8 @@
 import {
   formatDate,
   formatUnixDate,
-  buildDateFromTime,
   formatDigitToString,
+  isTimeAfter,
 } from '../DateHelper';
 
 describe('#DateHelper', () => {
@@ -44,27 +44,21 @@ describe('#DateHelper', () => {
       })
     ).toEqual('Yesterday');
   });
-
-  describe('#buildDate', () => {
-    it('returns correctly parsed date', () => {
-      const date = new Date();
-      date.setFullYear(2021);
-      date.setMonth(2);
-      date.setDate(5);
-
-      const result = buildDateFromTime(12, 15, '.465Z', date);
-      expect(result + '').toEqual(
-        'Fri Mar 05 2021 12:15:00 GMT+0000 (Coordinated Universal Time)'
-      );
-    });
+});
+describe('#formatDigitToString', () => {
+  it('returns date compatabile string from number is less than 9', () => {
+    expect(formatDigitToString(8)).toEqual('08');
   });
-
-  describe('#formatDigitToString', () => {
-    it('returns date compatabile string from number is less than 9', () => {
-      expect(formatDigitToString(8)).toEqual('08');
-    });
-    it('returns date compatabile string from number is greater than 9', () => {
-      expect(formatDigitToString(11)).toEqual('11');
-    });
+  it('returns date compatabile string from number is greater than 9', () => {
+    expect(formatDigitToString(11)).toEqual('11');
+  });
+});
+
+describe('#isTimeAfter', () => {
+  it('return correct values', () => {
+    expect(isTimeAfter(5, 30, 9, 30)).toEqual(false);
+    expect(isTimeAfter(9, 30, 9, 30)).toEqual(true);
+    expect(isTimeAfter(9, 29, 9, 30)).toEqual(false);
+    expect(isTimeAfter(11, 59, 12, 0)).toEqual(false);
   });
 });
diff --git a/app/javascript/widget/components/TeamAvailability.vue b/app/javascript/widget/components/TeamAvailability.vue
index 35cb7eebc..1f4c5d046 100644
--- a/app/javascript/widget/components/TeamAvailability.vue
+++ b/app/javascript/widget/components/TeamAvailability.vue
@@ -58,6 +58,7 @@ export default {
       default: false,
     },
   },
+
   computed: {
     ...mapGetters({
       widgetColor: 'appConfig/getWidgetColor',
diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js
index c797f79e4..1c5cbc37f 100644
--- a/app/javascript/widget/mixins/availability.js
+++ b/app/javascript/widget/mixins/availability.js
@@ -1,5 +1,5 @@
-import compareAsc from 'date-fns/compareAsc';
-import { buildDateFromTime } from 'shared/helpers/DateHelper';
+import { utcToZonedTime } from 'date-fns-tz';
+import { isTimeAfter } from 'shared/helpers/DateHelper';
 
 export default {
   computed: {
@@ -33,23 +33,32 @@ export default {
         closedAllDay,
         openAllDay,
       } = this.currentDayAvailability;
+
+      if (openAllDay || closedAllDay) {
+        return true;
+      }
+
       const { utcOffset } = this.channelConfig;
-
-      if (openAllDay) return true;
-
-      if (closedAllDay) return false;
-
-      const startTime = buildDateFromTime(openHour, openMinute, utcOffset);
-      const endTime = buildDateFromTime(closeHour, closeMinute, utcOffset);
-      const isBetween =
-        compareAsc(new Date(), startTime) === 1 &&
-        compareAsc(endTime, new Date()) === 1;
-
-      if (isBetween) return true;
-      return false;
+      const today = this.getDateWithOffset(utcOffset);
+      const currentHours = today.getHours();
+      const currentMinutes = today.getMinutes();
+      const isAfterStartTime = isTimeAfter(
+        currentHours,
+        currentMinutes,
+        openHour,
+        openMinute
+      );
+      const isBeforeEndTime = isTimeAfter(
+        closeHour,
+        closeMinute,
+        currentHours,
+        currentMinutes
+      );
+      return isAfterStartTime && isBeforeEndTime;
     },
     currentDayAvailability() {
-      const dayOfTheWeek = new Date().getDay();
+      const { utcOffset } = this.channelConfig;
+      const dayOfTheWeek = this.getDateWithOffset(utcOffset).getDay();
       const [workingHourConfig = {}] = this.channelConfig.workingHours.filter(
         workingHour => workingHour.day_of_week === dayOfTheWeek
       );
@@ -63,8 +72,14 @@ export default {
       };
     },
     isInBusinessHours() {
-      const { workingHoursEnabled } = window.chatwootWebChannel;
+      const { workingHoursEnabled } = this.channelConfig;
       return workingHoursEnabled ? this.isInBetweenTheWorkingHours : true;
     },
   },
+
+  methods: {
+    getDateWithOffset(utcOffset) {
+      return utcToZonedTime(new Date().toISOString(), utcOffset);
+    },
+  },
 };
diff --git a/app/javascript/widget/mixins/specs/availabilityMixin.spec.js b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js
new file mode 100644
index 000000000..5b9e28caa
--- /dev/null
+++ b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js
@@ -0,0 +1,60 @@
+import { createWrapper } from '@vue/test-utils';
+import availabilityMixin from '../availability';
+import Vue from 'vue';
+
+global.chatwootWebChannel = {
+  workingHoursEnabled: true,
+  workingHours: [
+    {
+      day_of_week: 3,
+      closed_all_day: false,
+      open_hour: 8,
+      open_minutes: 30,
+      close_hour: 17,
+      close_minutes: 35,
+      open_all_day: false,
+    },
+    {
+      day_of_week: 4,
+      closed_all_day: false,
+      open_hour: 8,
+      open_minutes: 30,
+      close_hour: 17,
+      close_minutes: 30,
+      open_all_day: false,
+    },
+  ],
+  utcOffset: '-07:00',
+};
+
+describe('availabilityMixin', () => {
+  it('returns valid isInBetweenWorkingHours if in different timezone', () => {
+    const Component = {
+      render() {},
+      mixins: [availabilityMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 06:04:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true);
+    jest.useRealTimers();
+  });
+
+  it('returns valid isInBetweenWorkingHours if in same timezone', () => {
+    global.chatwootWebChannel.utcOffset = '+05:30';
+    const Component = {
+      render() {},
+      mixins: [availabilityMixin],
+    };
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 09:01:46 GMT+0530'));
+    const Constructor = Vue.extend(Component);
+    const wrapper = createWrapper(new Constructor().$mount());
+    expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true);
+    jest.useRealTimers();
+  });
+});
diff --git a/package.json b/package.json
index 1b55668b3..b88346415 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "core-js": "3.11.0",
     "country-code-emoji": "^1.0.0",
     "date-fns": "2.21.1",
+    "date-fns-tz": "^1.3.3",
     "dompurify": "2.2.7",
     "dotenv": "^8.0.0",
     "foundation-sites": "~6.5.3",
diff --git a/yarn.lock b/yarn.lock
index a95d08798..8f0bd9067 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5454,6 +5454,11 @@ data-urls@^2.0.0:
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
+date-fns-tz@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.3.tgz#7884a4b3ed6cd95bfd81831d608e5ef8be500c86"
+  integrity sha512-Gks46gwbSauBQnV3Oofluj1wTm8J0tM7sbSJ9P+cJq/ZnTCpMohTKmmO5Tn+jQ7dyn0+b8G7cY4O2DZ5P/LXcA==
+
 date-fns@2.21.1:
   version "2.21.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.1.tgz#679a4ccaa584c0706ea70b3fa92262ac3009d2b0"

From 615a575bdd3eeb346169d0c432107380dc140a24 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 18 Apr 2022 19:05:45 +0530
Subject: [PATCH 055/177] fix: Agent typing indicator for website widget
 (#4495)

When we migrated the pubsub tokens from contact to contact inboxes, we missed out on doing this update for the typing indicator events. Hence the agent typing events weren't visible on the widget side. This change fixes that and removes the necessary column contact pubsub token from the model.

fixes: #4476
---
 app/jobs/data_import_job.rb                   |  3 ---
 app/listeners/action_cable_listener.rb        |  3 ++-
 app/models/contact.rb                         |  4 ----
 ...20418094715_remove_contact_pubsub_token.rb |  5 ++++
 db/schema.rb                                  |  4 +---
 spec/jobs/data_import_job_spec.rb             |  3 ---
 spec/listeners/action_cable_listener_spec.rb  | 24 +++++++++++++++++--
 7 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 db/migrate/20220418094715_remove_contact_pubsub_token.rb

diff --git a/app/jobs/data_import_job.rb b/app/jobs/data_import_job.rb
index 7c285eb8c..24610acec 100644
--- a/app/jobs/data_import_job.rb
+++ b/app/jobs/data_import_job.rb
@@ -21,9 +21,6 @@ class DataImportJob < ApplicationJob
 
     contact.name = params[:name] if params[:name].present?
     contact.assign_attributes(custom_attributes: contact.custom_attributes.merge(params.except(:identifier, :email, :name)))
-
-    # since callbacks aren't triggered lets ensure a pubsub token
-    contact.pubsub_token ||= SecureRandom.base58(24)
     contact
   end
 
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index 815103c33..d9099eda8 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -135,7 +135,8 @@ class ActionCableListener < BaseListener
   private
 
   def typing_event_listener_tokens(account, conversation, user)
-    (user_tokens(account, conversation.inbox.members) + [conversation.contact.pubsub_token]) - [user&.pubsub_token]
+    current_user_token = user.is_a?(Contact) ? conversation.contact_inbox.pubsub_token : user.pubsub_token
+    (user_tokens(account, conversation.inbox.members) + [conversation.contact_inbox.pubsub_token]) - [current_user_token]
   end
 
   def user_tokens(account, agents)
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 106930db4..2261d4230 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -10,7 +10,6 @@
 #  last_activity_at      :datetime
 #  name                  :string
 #  phone_number          :string
-#  pubsub_token          :string
 #  created_at            :datetime         not null
 #  updated_at            :datetime         not null
 #  account_id            :integer          not null
@@ -19,13 +18,11 @@
 #
 #  index_contacts_on_account_id                   (account_id)
 #  index_contacts_on_phone_number_and_account_id  (phone_number,account_id)
-#  index_contacts_on_pubsub_token                 (pubsub_token) UNIQUE
 #  uniq_email_per_account_contact                 (email,account_id) UNIQUE
 #  uniq_identifier_per_account_contact            (identifier,account_id) UNIQUE
 #
 
 class Contact < ApplicationRecord
-  # TODO: remove the pubsub_token attribute from this model in future.
   include Avatarable
   include AvailabilityStatusable
   include Labelable
@@ -117,7 +114,6 @@ class Contact < ApplicationRecord
       identifier: identifier,
       name: name,
       phone_number: phone_number,
-      pubsub_token: pubsub_token,
       thumbnail: avatar_url,
       type: 'contact'
     }
diff --git a/db/migrate/20220418094715_remove_contact_pubsub_token.rb b/db/migrate/20220418094715_remove_contact_pubsub_token.rb
new file mode 100644
index 000000000..e625b9046
--- /dev/null
+++ b/db/migrate/20220418094715_remove_contact_pubsub_token.rb
@@ -0,0 +1,5 @@
+class RemoveContactPubsubToken < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :contacts, :pubsub_token, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 93b96cec7..8373fe31f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_09_044943) do
+ActiveRecord::Schema.define(version: 2022_04_18_094715) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -325,7 +325,6 @@ ActiveRecord::Schema.define(version: 2022_04_09_044943) do
     t.integer "account_id", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.string "pubsub_token"
     t.jsonb "additional_attributes", default: {}
     t.string "identifier"
     t.jsonb "custom_attributes", default: {}
@@ -334,7 +333,6 @@ ActiveRecord::Schema.define(version: 2022_04_09_044943) do
     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 ["phone_number", "account_id"], name: "index_contacts_on_phone_number_and_account_id"
-    t.index ["pubsub_token"], name: "index_contacts_on_pubsub_token", unique: true
   end
 
   create_table "conversations", id: :serial, force: :cascade do |t|
diff --git a/spec/jobs/data_import_job_spec.rb b/spec/jobs/data_import_job_spec.rb
index ad5e7b597..712f3283d 100644
--- a/spec/jobs/data_import_job_spec.rb
+++ b/spec/jobs/data_import_job_spec.rb
@@ -17,8 +17,5 @@ RSpec.describe DataImportJob, type: :job do
     expect(data_import.account.contacts.count).to eq(csv_length)
     expect(data_import.reload.total_records).to eq(csv_length)
     expect(data_import.reload.processed_records).to eq(csv_length)
-
-    # should generate pubsub tokens for contacts
-    expect(data_import.account.contacts.last.pubsub_token).present?
   end
 end
diff --git a/spec/listeners/action_cable_listener_spec.rb b/spec/listeners/action_cable_listener_spec.rb
index b3266abc8..d1bad487f 100644
--- a/spec/listeners/action_cable_listener_spec.rb
+++ b/spec/listeners/action_cable_listener_spec.rb
@@ -61,7 +61,7 @@ describe ActionCableListener do
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
         a_collection_containing_exactly(
-          admin.pubsub_token, conversation.contact.pubsub_token
+          admin.pubsub_token, conversation.contact_inbox.pubsub_token
         ),
         'conversation.typing_on', conversation: conversation.push_event_data,
                                   user: agent.push_event_data,
@@ -72,6 +72,26 @@ describe ActionCableListener do
     end
   end
 
+  describe '#typing_on with contact' do
+    let(:event_name) { :'conversation.typing_on' }
+    let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: conversation.contact, is_private: false) }
+
+    it 'sends message to account admins, inbox agents and the contact' do
+      # HACK: to reload conversation inbox members
+      expect(conversation.inbox.reload.inbox_members.count).to eq(1)
+      expect(ActionCableBroadcastJob).to receive(:perform_later).with(
+        a_collection_containing_exactly(
+          admin.pubsub_token, agent.pubsub_token
+        ),
+        'conversation.typing_on', conversation: conversation.push_event_data,
+                                  user: conversation.contact.push_event_data,
+                                  account_id: account.id,
+                                  is_private: false
+      )
+      listener.conversation_typing_on(event)
+    end
+  end
+
   describe '#typing_off' do
     let(:event_name) { :'conversation.typing_off' }
     let!(:event) { Events::Base.new(event_name, Time.zone.now, conversation: conversation, user: agent, is_private: false) }
@@ -81,7 +101,7 @@ describe ActionCableListener do
       expect(conversation.inbox.reload.inbox_members.count).to eq(1)
       expect(ActionCableBroadcastJob).to receive(:perform_later).with(
         a_collection_containing_exactly(
-          admin.pubsub_token, conversation.contact.pubsub_token
+          admin.pubsub_token, conversation.contact_inbox.pubsub_token
         ),
         'conversation.typing_off', conversation: conversation.push_event_data,
                                    user: agent.push_event_data,

From 569ae24d8a05fc60a66d5132923a816ccbd2a259 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Mon, 18 Apr 2022 23:23:17 +0530
Subject: [PATCH 056/177] Bump version to 2.4.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 bb73f9a2e..bcbe685e8 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.3.2'
+  version: '2.4.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index b88346415..da44aecb2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.3.2",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue} --fix",

From 1ccd29140dc67f8b2d52d8479d5929d4af47ee5c Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 19 Apr 2022 12:21:20 +0530
Subject: [PATCH 057/177] Feat: send fb message outside of standard messaging
 window (#4439)

---
 app/models/channel/facebook_page.rb                  |  2 +-
 app/models/conversation.rb                           | 12 +++++++++++-
 app/services/facebook/send_on_facebook_service.rb    |  8 ++++++--
 spec/jobs/webhooks/instagram_events_job_spec.rb      |  1 -
 spec/models/conversation_spec.rb                     |  4 ++--
 .../facebook/send_on_facebook_service_spec.rb        |  8 ++++++--
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/models/channel/facebook_page.rb b/app/models/channel/facebook_page.rb
index bed88e575..6b36a3a54 100644
--- a/app/models/channel/facebook_page.rb
+++ b/app/models/channel/facebook_page.rb
@@ -33,7 +33,7 @@ class Channel::FacebookPage < ApplicationRecord
   end
 
   def has_24_hour_messaging_window?
-    true
+    false
   end
 
   def create_contact_inbox(instagram_id, name)
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 409efab6d..cf3a4c256 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -90,10 +90,20 @@ class Conversation < ApplicationRecord
   delegate :auto_resolve_duration, to: :account
 
   def can_reply?
+    return last_message_less_than_24_hrs? if additional_attributes['type'] == 'instagram_direct_message'
+
     return true unless inbox&.channel&.has_24_hour_messaging_window?
 
-    last_incoming_message = messages.incoming.last
+    return false if last_incoming_message.nil?
 
+    last_message_less_than_24_hrs?
+  end
+
+  def last_incoming_message
+    messages&.incoming&.last
+  end
+
+  def last_message_less_than_24_hrs?
     return false if last_incoming_message.nil?
 
     Time.current < last_incoming_message.created_at + 24.hours
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 12e416ef7..52c259edb 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -22,7 +22,9 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
   def fb_text_message_params
     {
       recipient: { id: contact.get_source_id(inbox.id) },
-      message: { text: message.content }
+      message: { text: message.content },
+      messaging_type: 'MESSAGE_TAG',
+      tag: 'ACCOUNT_UPDATE'
     }
   end
 
@@ -37,7 +39,9 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
             url: attachment.file_url
           }
         }
-      }
+      },
+      messaging_type: 'MESSAGE_TAG',
+      tag: 'ACCOUNT_UPDATE'
     }
   end
 
diff --git a/spec/jobs/webhooks/instagram_events_job_spec.rb b/spec/jobs/webhooks/instagram_events_job_spec.rb
index bf3b43e14..69952920a 100644
--- a/spec/jobs/webhooks/instagram_events_job_spec.rb
+++ b/spec/jobs/webhooks/instagram_events_job_spec.rb
@@ -57,7 +57,6 @@ describe Webhooks::InstagramEventsJob do
         instagram_webhook.perform_now(test_params[:entry])
 
         instagram_inbox.reload
-
         expect(instagram_inbox.messages.count).to be 1
         expect(instagram_inbox.messages.last.content).to eq('This is a test message from facebook.')
       end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index d5295e340..8c278a81b 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -489,7 +489,7 @@ RSpec.describe Conversation, type: :model do
       let!(:conversation) { create(:conversation, inbox: facebook_inbox, account: facebook_channel.account) }
 
       it 'returns false if there are no incoming messages' do
-        expect(conversation.can_reply?).to eq false
+        expect(conversation.can_reply?).to eq true
       end
 
       it 'return false if last incoming message is outside of 24 hour window' do
@@ -500,7 +500,7 @@ RSpec.describe Conversation, type: :model do
           conversation: conversation,
           created_at: Time.now - 25.hours
         )
-        expect(conversation.can_reply?).to eq false
+        expect(conversation.can_reply?).to eq true
       end
 
       it 'return true if last incoming message is inside 24 hour window' do
diff --git a/spec/services/facebook/send_on_facebook_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
index 8ff842591..e0a39ba75 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -60,7 +60,9 @@ describe Facebook::SendOnFacebookService do
         ::Facebook::SendOnFacebookService.new(message: message).perform
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
-                                                      message: { text: message.content }
+                                                      message: { text: message.content },
+                                                      messaging_type: 'MESSAGE_TAG',
+                                                      tag: 'ACCOUNT_UPDATE'
                                                     }, { page_id: facebook_channel.page_id })
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
@@ -71,7 +73,9 @@ describe Facebook::SendOnFacebookService do
                                                             url: attachment.file_url
                                                           }
                                                         }
-                                                      }
+                                                      },
+                                                      messaging_type: 'MESSAGE_TAG',
+                                                      tag: 'ACCOUNT_UPDATE'
                                                     }, { page_id: facebook_channel.page_id })
       end
     end

From 26f23a6e214c74b5b6abaa7b3d3a5282bfd03b97 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 19 Apr 2022 12:47:29 +0530
Subject: [PATCH 058/177] feat: Custom fields in pre-chat form (#4189)

---
 .../dashboard/components/ui/Switch.vue        |   8 +-
 app/javascript/dashboard/helper/preChat.js    | 100 ++++++
 .../dashboard/helper/specs/inboxFixture.js    |  47 +++
 .../dashboard/helper/specs/preChat.spec.js    |  76 +++++
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  16 +-
 .../inbox/PreChatForm/PreChatFields.vue       |  91 ++++++
 .../settings/inbox/PreChatForm/Settings.vue   | 130 +++++---
 .../dashboard/store/modules/attributes.js     |   3 +
 .../modules/specs/attributes/getters.spec.js  |  20 ++
 app/javascript/packs/widget.js                |  13 +-
 .../FluentIcon/dashboard-icons.json           |   3 +-
 app/javascript/widget/App.vue                 |   5 +-
 .../widget/components/PreChat/Form.vue        | 308 +++++++++++++-----
 app/javascript/widget/i18n/locale/en.json     |  14 +-
 app/javascript/widget/mixins/configMixin.js   |  12 +-
 .../widget/mixins/specs/configMixin.spec.js   |  30 +-
 app/javascript/widget/views/Home.vue          |   8 +-
 app/javascript/widget/views/PreChatForm.vue   |  20 +-
 app/models/channel/web_widget.rb              |  25 +-
 app/models/custom_attribute_definition.rb     |   2 +-
 .../api/v1/widget/contacts/show.json.jbuilder |   1 +
 .../v1/widget/contacts/update.json.jbuilder   |   1 +
 ...4933_add_custom_fields_to_pre_chat_form.rb |  29 ++
 spec/models/channel/web_widget_spec.rb        |  15 +
 spec/models/channel/widget_test.rb            |   7 -
 25 files changed, 824 insertions(+), 160 deletions(-)
 create mode 100644 app/javascript/dashboard/helper/preChat.js
 create mode 100644 app/javascript/dashboard/helper/specs/inboxFixture.js
 create mode 100644 app/javascript/dashboard/helper/specs/preChat.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
 create mode 100644 db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb
 create mode 100644 spec/models/channel/web_widget_spec.rb
 delete mode 100644 spec/models/channel/widget_test.rb

diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index b0bc32881..7dc4bcbfb 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -17,8 +17,12 @@ export default {
     value: { type: Boolean, default: false },
   },
   methods: {
-    onClick() {
-      this.$emit('input', !this.value);
+    onClick(event) {
+      if (event.pointerId === -1) {
+        event.preventDefault();
+      } else {
+        this.$emit('input', !this.value);
+      }
     },
   },
 };
diff --git a/app/javascript/dashboard/helper/preChat.js b/app/javascript/dashboard/helper/preChat.js
new file mode 100644
index 000000000..bc5502e5b
--- /dev/null
+++ b/app/javascript/dashboard/helper/preChat.js
@@ -0,0 +1,100 @@
+import i18n from 'widget/i18n/index';
+const defaultTranslations = Object.fromEntries(
+  Object.entries(i18n).filter(([key]) => key.includes('en'))
+).en;
+
+export const standardFieldKeys = {
+  emailAddress: {
+    key: 'EMAIL_ADDRESS',
+    label: 'Email Id',
+    placeholder: 'Please enter your email address',
+  },
+  fullName: {
+    key: 'FULL_NAME',
+    label: 'Full Name',
+    placeholder: 'Please enter your full name',
+  },
+  phoneNumber: {
+    key: 'PHONE_NUMBER',
+    label: 'Phone Number',
+    placeholder: 'Please enter your phone number',
+  },
+};
+
+export const getLabel = ({ key, label }) => {
+  return defaultTranslations.PRE_CHAT_FORM.FIELDS[key]
+    ? defaultTranslations.PRE_CHAT_FORM.FIELDS[key].LABEL
+    : label;
+};
+export const getPlaceHolder = ({ key, placeholder }) => {
+  return defaultTranslations.PRE_CHAT_FORM.FIELDS[key]
+    ? defaultTranslations.PRE_CHAT_FORM.FIELDS[key].PLACEHOLDER
+    : placeholder;
+};
+
+export const getCustomFields = ({ standardFields, customAttributes }) => {
+  let customFields = [];
+  const { pre_chat_fields: preChatFields } = standardFields;
+  customAttributes.forEach(attribute => {
+    const itemExist = preChatFields.find(
+      item => item.name === attribute.attribute_key
+    );
+    if (!itemExist) {
+      customFields.push({
+        label: attribute.attribute_display_name,
+        placeholder: attribute.attribute_display_name,
+        name: attribute.attribute_key,
+        type: attribute.attribute_display_type,
+        values: attribute.attribute_values,
+        field_type: attribute.attribute_model,
+        required: false,
+        enabled: false,
+      });
+    }
+  });
+  return customFields;
+};
+
+export const getFormattedPreChatFields = ({ preChatFields }) => {
+  return preChatFields.map(item => {
+    return {
+      ...item,
+      label: getLabel({
+        key: standardFieldKeys[item.name]
+          ? standardFieldKeys[item.name].key
+          : item.name,
+        label: item.label ? item.label : item.name,
+      }),
+      placeholder: getPlaceHolder({
+        key: standardFieldKeys[item.name]
+          ? standardFieldKeys[item.name].key
+          : item.name,
+        placeholder: item.placeholder ? item.placeholder : item.name,
+      }),
+    };
+  });
+};
+
+export const getPreChatFields = ({
+  preChatFormOptions = {},
+  customAttributes = [],
+}) => {
+  const { pre_chat_message, pre_chat_fields } = preChatFormOptions;
+  let customFields = {};
+  let preChatFields = {};
+
+  const formattedPreChatFields = getFormattedPreChatFields({
+    preChatFields: pre_chat_fields,
+  });
+
+  customFields = getCustomFields({
+    standardFields: { pre_chat_fields: formattedPreChatFields },
+    customAttributes,
+  });
+  preChatFields = [...formattedPreChatFields, ...customFields];
+
+  return {
+    pre_chat_message,
+    pre_chat_fields: preChatFields,
+  };
+};
diff --git a/app/javascript/dashboard/helper/specs/inboxFixture.js b/app/javascript/dashboard/helper/specs/inboxFixture.js
new file mode 100644
index 000000000..6622a6de2
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/inboxFixture.js
@@ -0,0 +1,47 @@
+export default {
+  customFields: {
+    pre_chat_message: 'Share your queries or comments here.',
+    pre_chat_fields: [
+      {
+        label: 'Email Address',
+        name: 'emailAddress',
+        type: 'email',
+        field_type: 'standard',
+        required: false,
+        enabled: false,
+
+        placeholder: 'Please enter your email address',
+      },
+      {
+        label: 'Full Name',
+        name: 'fullName',
+        type: 'text',
+        field_type: 'standard',
+        required: false,
+        enabled: false,
+        placeholder: 'Please enter your full name',
+      },
+      {
+        label: 'Phone Number',
+        name: 'phoneNumber',
+        type: 'text',
+        field_type: 'standard',
+        required: false,
+        enabled: false,
+        placeholder: 'Please enter your phone number',
+      },
+    ],
+  },
+  customAttributes: [
+    {
+      id: 101,
+      attribute_description: 'Order Identifier',
+      attribute_display_name: 'Order Id',
+      attribute_display_type: 'number',
+      attribute_key: 'order_id',
+      attribute_model: 'conversation_attribute',
+      attribute_values: Array(0),
+      created_at: '2021-11-29T10:20:04.563Z',
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/helper/specs/preChat.spec.js b/app/javascript/dashboard/helper/specs/preChat.spec.js
new file mode 100644
index 000000000..74f3e72f5
--- /dev/null
+++ b/app/javascript/dashboard/helper/specs/preChat.spec.js
@@ -0,0 +1,76 @@
+import {
+  getPreChatFields,
+  getFormattedPreChatFields,
+  getCustomFields,
+} from '../preChat';
+import inboxFixture from './inboxFixture';
+
+const { customFields, customAttributes } = inboxFixture;
+describe('#Pre chat Helpers', () => {
+  describe('getPreChatFields', () => {
+    it('should return correct pre-chat fields form options passed', () => {
+      expect(getPreChatFields({ preChatFormOptions: customFields })).toEqual(
+        customFields
+      );
+    });
+  });
+  describe('getFormattedPreChatFields', () => {
+    it('should return correct custom fields', () => {
+      expect(
+        getFormattedPreChatFields({
+          preChatFields: customFields.pre_chat_fields,
+        })
+      ).toEqual([
+        {
+          label: 'Email Address',
+          name: 'emailAddress',
+          placeholder: 'Please enter your email address',
+          type: 'email',
+          field_type: 'standard',
+
+          required: false,
+          enabled: false,
+        },
+        {
+          label: 'Full Name',
+          name: 'fullName',
+          placeholder: 'Please enter your full name',
+          type: 'text',
+          field_type: 'standard',
+          required: false,
+          enabled: false,
+        },
+        {
+          label: 'Phone Number',
+          name: 'phoneNumber',
+          placeholder: 'Please enter your phone number',
+          type: 'text',
+          field_type: 'standard',
+          required: false,
+          enabled: false,
+        },
+      ]);
+    });
+  });
+  describe('getCustomFields', () => {
+    it('should return correct custom fields', () => {
+      expect(
+        getCustomFields({
+          standardFields: { pre_chat_fields: customFields.pre_chat_fields },
+          customAttributes,
+        })
+      ).toEqual([
+        {
+          enabled: false,
+          label: 'Order Id',
+          placeholder: 'Order Id',
+          name: 'order_id',
+          required: false,
+          field_type: 'conversation_attribute',
+          type: 'number',
+          values: [],
+        },
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 365fd92f9..218d1cf95 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -187,7 +187,7 @@
           }
         }
       },
-			"WHATSAPP": {
+      "WHATSAPP": {
         "TITLE": "WhatsApp Channel",
         "DESC": "Start supporting your customers via WhatsApp.",
         "PROVIDERS": {
@@ -211,7 +211,6 @@
           "PLACEHOLDER": "API key",
           "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
           "ERROR": "Please enter a valid value."
-
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
         "API": {
@@ -433,6 +432,15 @@
     },
     "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": {
@@ -441,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -465,7 +473,7 @@
         "VALIDATION_ERROR": "Starting time should be before closing time.",
         "CHOOSE": "Choose"
       },
-      "ALL_DAY":"All-Day"
+      "ALL_DAY": "All-Day"
     },
     "IMAP": {
       "TITLE": "IMAP",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
new file mode 100644
index 000000000..9d2691036
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
@@ -0,0 +1,91 @@
+<template>
+  <draggable v-model="preChatFields" tag="tbody">
+    <tr v-for="(item, index) in preChatFields" :key="index">
+      <td class="pre-chat-field"><fluent-icon icon="drag" /></td>
+      <td class="pre-chat-field">
+        <woot-switch
+          :value="item['enabled']"
+          @input="handlePreChatFieldOptions($event, 'enabled', item)"
+        />
+      </td>
+      <td class="pre-chat-field" :class="{ 'disabled-text': !item['enabled'] }">
+        {{ item.name }}
+      </td>
+      <td class="pre-chat-field" :class="{ 'disabled-text': !item['enabled'] }">
+        {{ item.type }}
+      </td>
+      <td class="pre-chat-field">
+        <input
+          v-model="item['required']"
+          type="checkbox"
+          :value="`${item.name}-required`"
+          :disabled="!item['enabled']"
+          @click="handlePreChatFieldOptions($event, 'required', item)"
+        />
+      </td>
+      <td class="pre-chat-field" :class="{ 'disabled-text': !item['enabled'] }">
+        <input
+          v-model.trim="item.label"
+          type="text"
+          :disabled="isFieldEditable(item)"
+        />
+      </td>
+      <td class="pre-chat-field" :class="{ 'disabled-text': !item['enabled'] }">
+        <input
+          v-model.trim="item.placeholder"
+          type="text"
+          :disabled="isFieldEditable(item)"
+        />
+      </td>
+    </tr>
+  </draggable>
+</template>
+
+<script>
+import draggable from 'vuedraggable';
+import { standardFieldKeys } from 'dashboard/helper/preChat';
+export default {
+  components: { draggable },
+  props: {
+    preChatFields: {
+      type: Array,
+      default: () => [],
+    },
+    handlePreChatFieldOptions: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  methods: {
+    isFieldEditable(item) {
+      return !!standardFieldKeys[item.name] || !item.enabled;
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.pre-chat-field {
+  padding: var(--space-normal) var(--space-small);
+
+  svg {
+    display: flex;
+    align-items: center;
+  }
+}
+.disabled-text {
+  color: var(--s-500);
+}
+
+table {
+  thead th {
+    text-transform: none;
+  }
+  input {
+    font-size: var(--font-size-small);
+    margin-bottom: 0;
+  }
+}
+checkbox {
+  margin: 0;
+}
+</style>
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 6c01bc3dd..184e16e0f 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="settings--content">
-    <div class="prechat--title">
+    <div class="pre-chat--title">
       {{ $t('INBOX_MGMT.PRE_CHAT_FORM.DESCRIPTION') }}
     </div>
-    <form class="medium-6" @submit.prevent="updateInbox">
-      <label class="medium-9 columns">
+    <form @submit.prevent="updateInbox">
+      <label class="medium-3 columns">
         {{ $t('INBOX_MGMT.PRE_CHAT_FORM.ENABLE.LABEL') }}
         <select v-model="preChatFormEnabled">
           <option :value="true">
@@ -15,28 +15,55 @@
           </option>
         </select>
       </label>
-
-      <label class="medium-9">
-        {{ $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.LABEL') }}
-        <textarea
-          v-model.trim="preChatMessage"
-          type="text"
-          :placeholder="
-            $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.PLACEHOLDER')
-          "
-        />
-      </label>
-      <div>
-        <input
-          v-model="preChatFieldOptions"
-          type="checkbox"
-          value="requireEmail"
-          @input="handlePreChatFieldOptions"
-        />
-        <label for="requireEmail">
-          {{ $t('INBOX_MGMT.PRE_CHAT_FORM.REQUIRE_EMAIL.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"
+            :placeholder="
+              $t('INBOX_MGMT.PRE_CHAT_FORM.PRE_CHAT_MESSAGE.PLACEHOLDER')
+            "
+          />
+        </label>
+        <label class="medium-8 columns">
+          {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}
+          <table class="table table-striped w-full">
+            <thead class="thead-dark">
+              <tr>
+                <th scope="col"></th>
+                <th scope="col"></th>
+                <th scope="col">
+                  {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.KEY') }}
+                </th>
+                <th scope="col">
+                  {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.TYPE') }}
+                </th>
+                <th scope="col">
+                  {{
+                    $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.REQUIRED')
+                  }}
+                </th>
+                <th scope="col">
+                  {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.LABEL') }}
+                </th>
+                <th scope="col">
+                  {{
+                    $t(
+                      'INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.PLACE_HOLDER'
+                    )
+                  }}
+                </th>
+              </tr>
+            </thead>
+            <pre-chat-fields
+              :pre-chat-fields="preChatFields"
+              :handle-pre-chat-field-options="handlePreChatFieldOptions"
+            />
+          </table>
         </label>
       </div>
+
       <woot-submit-button
         :button-text="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
         :loading="uiFlags.isUpdatingInbox"
@@ -47,8 +74,13 @@
 <script>
 import { mapGetters } from 'vuex';
 import alertMixin from 'shared/mixins/alertMixin';
+import PreChatFields from './PreChatFields.vue';
+import { getPreChatFields, standardFieldKeys } from 'dashboard/helper/preChat';
 
 export default {
+  components: {
+    PreChatFields,
+  },
   mixins: [alertMixin],
   props: {
     inbox: {
@@ -60,11 +92,21 @@ export default {
     return {
       preChatFormEnabled: false,
       preChatMessage: '',
-      preChatFieldOptions: [],
+      preChatFields: [],
     };
   },
   computed: {
-    ...mapGetters({ uiFlags: 'inboxes/getUIFlags' }),
+    ...mapGetters({
+      uiFlags: 'inboxes/getUIFlags',
+      customAttributes: 'attributes/getAttributes',
+    }),
+    preChatFieldOptions() {
+      const { pre_chat_form_options: preChatFormOptions } = this.inbox;
+      return getPreChatFields({
+        preChatFormOptions,
+        customAttributes: this.customAttributes,
+      });
+    },
   },
   watch: {
     inbox() {
@@ -76,25 +118,26 @@ export default {
   },
   methods: {
     setDefaults() {
-      const {
-        pre_chat_form_enabled: preChatFormEnabled,
-        pre_chat_form_options: preChatFormOptions,
-      } = this.inbox;
+      const { pre_chat_form_enabled: preChatFormEnabled } = this.inbox;
       this.preChatFormEnabled = preChatFormEnabled;
-      const { pre_chat_message: preChatMessage, require_email: requireEmail } =
-        preChatFormOptions || {};
+      const {
+        pre_chat_message: preChatMessage,
+        pre_chat_fields: preChatFields,
+      } = this.preChatFieldOptions || {};
       this.preChatMessage = preChatMessage;
-      if (requireEmail) {
-        this.preChatFieldOptions = ['requireEmail'];
-      }
+      this.preChatFields = preChatFields;
     },
-    handlePreChatFieldOptions(event) {
-      if (this.preChatFieldOptions.includes(event.target.value)) {
-        this.preChatFieldOptions = [];
-      } else {
-        this.preChatFieldOptions = [event.target.value];
-      }
+    isFieldEditable(item) {
+      return !!standardFieldKeys[item.name] || !item.enabled;
     },
+    handlePreChatFieldOptions(event, type, item) {
+      this.preChatFields.forEach((field, index) => {
+        if (field.name === item.name) {
+          this.preChatFields[index][type] = !item[type];
+        }
+      });
+    },
+
     async updateInbox() {
       try {
         const payload = {
@@ -104,7 +147,7 @@ export default {
             pre_chat_form_enabled: this.preChatFormEnabled,
             pre_chat_form_options: {
               pre_chat_message: this.preChatMessage,
-              require_email: this.preChatFieldOptions.includes('requireEmail'),
+              pre_chat_fields: this.preChatFields,
             },
           },
         };
@@ -117,12 +160,11 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
 .settings--content {
   font-size: var(--font-size-default);
 }
-
-.prechat--title {
+.pre-chat--title {
   margin: var(--space-medium) 0 var(--space-slab);
 }
 </style>
diff --git a/app/javascript/dashboard/store/modules/attributes.js b/app/javascript/dashboard/store/modules/attributes.js
index 40cfc99d7..af6d3ce4f 100644
--- a/app/javascript/dashboard/store/modules/attributes.js
+++ b/app/javascript/dashboard/store/modules/attributes.js
@@ -16,6 +16,9 @@ export const getters = {
   getUIFlags(_state) {
     return _state.uiFlags;
   },
+  getAttributes: _state => {
+    return _state.records;
+  },
   getAttributesByModel: _state => attributeModel => {
     return _state.records.filter(
       record => record.attribute_model === attributeModel
diff --git a/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js b/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
index 0e29eb514..9d8f027f5 100644
--- a/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/attributes/getters.spec.js
@@ -2,6 +2,26 @@ import { getters } from '../../attributes';
 import attributesList from './fixtures';
 
 describe('#getters', () => {
+  it('getAttributes', () => {
+    const state = { records: attributesList };
+    expect(getters.getAttributes(state)).toEqual([
+      {
+        attribute_display_name: 'Language',
+        attribute_display_type: 1,
+        attribute_description: 'The conversation language',
+        attribute_key: 'language',
+        attribute_model: 0,
+      },
+      {
+        attribute_display_name: 'Language one',
+        attribute_display_type: 2,
+        attribute_description: 'The conversation language one',
+        attribute_key: 'language_one',
+        attribute_model: 1,
+      },
+    ]);
+  });
+
   it('getAttributesByModel', () => {
     const state = { records: attributesList };
     expect(getters.getAttributesByModel(state)(1)).toEqual([
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index 421e2f8b9..850645581 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -1,11 +1,12 @@
 import Vue from 'vue';
 import Vuelidate from 'vuelidate';
 import VueI18n from 'vue-i18n';
+import VueFormulate from '@braid/vue-formulate';
 import store from '../widget/store';
 import App from '../widget/App.vue';
 import ActionCableConnector from '../widget/helpers/actionCable';
 import i18n from '../widget/i18n';
-
+import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import router from '../widget/router';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
@@ -14,7 +15,15 @@ const i18nConfig = new VueI18n({
   locale: 'en',
   messages: i18n,
 });
-
+Vue.use(VueFormulate, {
+  rules: {
+    isPhoneE164OrEmpty: ({ value }) => isPhoneE164OrEmpty(value),
+  },
+  classes: {
+    outer: 'mb-4 wrapper',
+    error: 'text-red-400 mt-2 text-xs font-medium',
+  },
+});
 // Event Bus
 window.bus = new Vue();
 
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 0cbc85d22..9f19f8a9d 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -126,5 +126,6 @@
   "brand-whatsapp-outline": "M17.472 14.382c-.297-.149-1.758-.867-2.03-.967-.273-.099-.471-.148-.67.15-.197.297-.767.966-.94 1.164-.173.199-.347.223-.644.075-.297-.15-1.255-.463-2.39-1.475-.883-.788-1.48-1.761-1.653-2.059-.173-.297-.018-.458.13-.606.134-.133.298-.347.446-.52.149-.174.198-.298.298-.497.099-.198.05-.371-.025-.52-.075-.149-.669-1.612-.916-2.207-.242-.579-.487-.5-.669-.51-.173-.008-.371-.01-.57-.01-.198 0-.52.074-.792.372-.272.297-1.04 1.016-1.04 2.479 0 1.462 1.065 2.875 1.213 3.074.149.198 2.096 3.2 5.077 4.487.709.306 1.262.489 1.694.625.712.227 1.36.195 1.871.118.571-.085 1.758-.719 2.006-1.413.248-.694.248-1.289.173-1.413-.074-.124-.272-.198-.57-.347m-5.421 7.403h-.004a9.87 9.87 0 01-5.031-1.378l-.361-.214-3.741.982.998-3.648-.235-.374a9.86 9.86 0 01-1.51-5.26c.001-5.45 4.436-9.884 9.888-9.884 2.64 0 5.122 1.03 6.988 2.898a9.825 9.825 0 012.893 6.994c-.003 5.45-4.437 9.884-9.885 9.884m8.413-18.297A11.815 11.815 0 0012.05 0C5.495 0 .16 5.335.157 11.892c0 2.096.547 4.142 1.588 5.945L.057 24l6.305-1.654a11.882 11.882 0 005.683 1.448h.005c6.554 0 11.89-5.335 11.893-11.893a11.821 11.821 0 00-3.48-8.413Z",
   "brand-github-outline": "M12 0C5.37 0 0 5.37 0 12c0 5.31 3.435 9.795 8.205 11.385c.6.105.825-.255.825-.57c0-.285-.015-1.23-.015-2.235c-3.015.555-3.795-.735-4.035-1.41c-.135-.345-.72-1.41-1.23-1.695c-.42-.225-1.02-.78-.015-.795c.945-.015 1.62.87 1.845 1.23c1.08 1.815 2.805 1.305 3.495.99c.105-.78.42-1.305.765-1.605c-2.67-.3-5.46-1.335-5.46-5.925c0-1.305.465-2.385 1.23-3.225c-.12-.3-.54-1.53.12-3.18c0 0 1.005-.315 3.3 1.23c.96-.27 1.98-.405 3-.405s2.04.135 3 .405c2.295-1.56 3.3-1.23 3.3-1.23c.66 1.65.24 2.88.12 3.18c.765.84 1.23 1.905 1.23 3.225c0 4.605-2.805 5.625-5.475 5.925c.435.375.81 1.095.81 2.22c0 1.605-.015 2.895-.015 3.3c0 .315.225.69.825.57A12.02 12.02 0 0 0 24 12c0-6.63-5.37-12-12-12Z",
   "add-solid": "M11.883 3.007 12 3a1 1 0 0 1 .993.883L13 4v7h7a1 1 0 0 1 .993.883L21 12a1 1 0 0 1-.883.993L20 13h-7v7a1 1 0 0 1-.883.993L12 21a1 1 0 0 1-.993-.883L11 20v-7H4a1 1 0 0 1-.993-.883L3 12a1 1 0 0 1 .883-.993L4 11h7V4a1 1 0 0 1 .883-.993L12 3l-.117.007Z",
-  "subtract-solid": "M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z"
+  "subtract-solid": "M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z",
+  "drag-outline": "M15 3.707V8.5a.5.5 0 0 0 1 0V3.707l1.146 1.147a.5.5 0 0 0 .708-.708l-2-2a.499.499 0 0 0-.708 0l-2 2a.5.5 0 0 0 .708.708L15 3.707ZM2 4.5a.5.5 0 0 1 .5-.5h6a.5.5 0 0 1 0 1h-6a.5.5 0 0 1-.5-.5Zm0 5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5Zm.5 4.5a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1h-6ZM15 16.293V11.5a.5.5 0 0 1 1 0v4.793l1.146-1.147a.5.5 0 0 1 .708.708l-2 2a.5.5 0 0 1-.708 0l-2-2a.5.5 0 0 1 .708-.708L15 16.293Z"
 }
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 9d6600264..ec30064a7 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -151,10 +151,7 @@ export default {
     },
     registerCampaignEvents() {
       bus.$on(ON_CAMPAIGN_MESSAGE_CLICK, () => {
-        const showPreChatForm =
-          this.preChatFormEnabled && this.preChatFormOptions.requireEmail;
-        const isUserEmailAvailable = !!this.currentUser.email;
-        if (showPreChatForm && !isUserEmailAvailable) {
+        if (this.shouldShowPreChatForm) {
           this.replaceRoute('prechat-form');
         } else {
           this.replaceRoute('messages');
diff --git a/app/javascript/widget/components/PreChat/Form.vue b/app/javascript/widget/components/PreChat/Form.vue
index 793c59ecb..823440cc1 100644
--- a/app/javascript/widget/components/PreChat/Form.vue
+++ b/app/javascript/widget/components/PreChat/Form.vue
@@ -1,47 +1,44 @@
 <template>
-  <form
+  <FormulateForm
+    v-model="formValues"
     class="flex flex-1 flex-col p-6 overflow-y-auto"
-    @submit.prevent="onSubmit"
+    @submit="onSubmit"
   >
     <div
       v-if="shouldShowHeaderMessage"
-      class="text-sm leading-5"
+      class="mb-4 text-sm leading-5"
       :class="$dm('text-black-800', 'dark:text-slate-50')"
     >
       {{ headerMessage }}
     </div>
-    <form-input
-      v-if="areContactFieldsVisible"
-      v-model="fullName"
-      class="mt-5"
-      :label="$t('PRE_CHAT_FORM.FIELDS.FULL_NAME.LABEL')"
-      :placeholder="$t('PRE_CHAT_FORM.FIELDS.FULL_NAME.PLACEHOLDER')"
-      type="text"
-      :error="
-        $v.fullName.$error ? $t('PRE_CHAT_FORM.FIELDS.FULL_NAME.ERROR') : ''
-      "
+    <FormulateInput
+      v-for="item in enabledPreChatFields"
+      :key="item.name"
+      :name="item.name"
+      :type="item.type"
+      :label="getLabel(item)"
+      :placeholder="getPlaceHolder(item)"
+      :validation="getValidation(item)"
+      :options="getOptions(item)"
+      :label-class="context => labelClass(context)"
+      :input-class="context => inputClass(context)"
+      :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),
+      }"
     />
-    <form-input
-      v-if="areContactFieldsVisible"
-      v-model="emailAddress"
-      class="mt-5"
-      :label="$t('PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.LABEL')"
-      :placeholder="$t('PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.PLACEHOLDER')"
-      type="email"
-      :error="
-        $v.emailAddress.$error
-          ? $t('PRE_CHAT_FORM.FIELDS.EMAIL_ADDRESS.ERROR')
-          : ''
-      "
-    />
-    <form-text-area
+    <FormulateInput
       v-if="!hasActiveCampaign"
-      v-model="message"
-      class="my-5"
+      name="message"
+      type="textarea"
+      :label-class="context => labelClass(context)"
+      :input-class="context => inputClass(context)"
       :label="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.LABEL')"
       :placeholder="$t('PRE_CHAT_FORM.FIELDS.MESSAGE.PLACEHOLDER')"
-      :error="$v.message.$error ? $t('PRE_CHAT_FORM.FIELDS.MESSAGE.ERROR') : ''"
+      validation="required"
     />
+
     <custom-button
       class="font-medium my-5"
       block
@@ -52,24 +49,20 @@
       <spinner v-if="isCreating" class="p-0" />
       {{ $t('START_CONVERSATION') }}
     </custom-button>
-  </form>
+  </FormulateForm>
 </template>
 
 <script>
 import CustomButton from 'shared/components/Button';
-import FormInput from '../Form/Input';
-import FormTextArea from '../Form/TextArea';
 import Spinner from 'shared/components/Spinner';
 import { mapGetters } from 'vuex';
 import { getContrastingTextColor } from '@chatwoot/utils';
-import { required, minLength, email } from 'vuelidate/lib/validators';
+
 import { isEmptyObject } from 'widget/helpers/utils';
 import routerMixin from 'widget/mixins/routerMixin';
 import darkModeMixin from 'widget/mixins/darkModeMixin';
 export default {
   components: {
-    FormInput,
-    FormTextArea,
     CustomButton,
     Spinner,
   },
@@ -77,47 +70,23 @@ export default {
   props: {
     options: {
       type: Object,
-      default: () => ({}),
+      default: () => {},
     },
     disableContactFields: {
       type: Boolean,
       default: false,
     },
   },
-  validations() {
-    const identityValidations = {
-      fullName: {
-        required,
-      },
-      emailAddress: {
-        required,
-        email,
-      },
-    };
-
-    const messageValidation = {
-      message: {
-        required,
-        minLength: minLength(1),
-      },
-    };
-    // For campaign, message field is not required
-    if (this.hasActiveCampaign) {
-      return identityValidations;
-    }
-    if (this.areContactFieldsVisible) {
-      return {
-        ...identityValidations,
-        ...messageValidation,
-      };
-    }
-    return messageValidation;
-  },
   data() {
     return {
-      fullName: '',
-      emailAddress: '',
+      locale: this.$root.$i18n.locale,
       message: '',
+      formValues: {},
+      labels: {
+        emailAddress: 'EMAIL_ADDRESS',
+        fullName: 'FULL_NAME',
+        phoneNumber: 'PHONE_NUMBER',
+      },
     };
   },
   computed: {
@@ -125,6 +94,7 @@ export default {
       widgetColor: 'appConfig/getWidgetColor',
       isCreating: 'conversation/getIsCreating',
       activeCampaign: 'campaign/getActiveCampaign',
+      currentUser: 'contacts/getCurrentUser',
     }),
     textColor() {
       return getContrastingTextColor(this.widgetColor);
@@ -141,23 +111,207 @@ export default {
       }
       return this.options.preChatMessage;
     },
-    areContactFieldsVisible() {
-      return this.options.requireEmail && !this.disableContactFields;
+    preChatFields() {
+      return this.disableContactFields ? [] : this.options.preChatFields;
+    },
+    filteredPreChatFields() {
+      const isUserEmailAvailable = !!this.currentUser.email;
+      const isUserPhoneNumberAvailable = !!this.currentUser.phone_number;
+      return this.preChatFields.filter(field => {
+        if (
+          (isUserEmailAvailable && field.name === 'emailAddress') ||
+          (isUserPhoneNumberAvailable && field.name === 'phoneNumber')
+        ) {
+          return false;
+        }
+        return true;
+      });
+    },
+    enabledPreChatFields() {
+      return this.filteredPreChatFields
+        .filter(field => field.enabled)
+        .map(field => ({
+          ...field,
+          type: this.findFieldType(field.type),
+        }));
+    },
+    conversationCustomAttributes() {
+      let conversationAttributes = {};
+      this.enabledPreChatFields.forEach(field => {
+        if (field.field_type === 'conversation_attribute') {
+          conversationAttributes = {
+            ...conversationAttributes,
+            [field.name]: this.getValue(field),
+          };
+        }
+      });
+      return conversationAttributes;
+    },
+    contactCustomAttributes() {
+      let contactAttributes = {};
+      this.enabledPreChatFields.forEach(field => {
+        if (field.field_type === 'contact_attribute') {
+          contactAttributes = {
+            ...contactAttributes,
+            [field.name]: this.getValue(field),
+          };
+        }
+      });
+      return contactAttributes;
+    },
+    inputStyles() {
+      return `mt-2 border rounded w-full py-2 px-3 text-slate-700 outline-none`;
+    },
+    isInputDarkOrLightMode() {
+      return `${this.$dm('bg-white', 'dark:bg-slate-600')} ${this.$dm(
+        'text-slate-700',
+        'dark:text-slate-50'
+      )}`;
+    },
+    inputBorderColor() {
+      return `${this.$dm('border-black-200', 'dark:border-black-500')}`;
     },
   },
   methods: {
-    onSubmit() {
-      this.$v.$touch();
-      if (this.$v.$invalid) {
-        return;
+    labelClass(context) {
+      const { hasErrors } = context;
+      if (!hasErrors) {
+        return `text-xs font-medium ${this.$dm(
+          'text-black-800',
+          'dark:text-slate-50'
+        )}`;
       }
+      return `text-xs font-medium ${this.$dm(
+        'text-red-400',
+        'dark:text-red-400'
+      )}`;
+    },
+    inputClass(context) {
+      const { hasErrors, classification, type } = context;
+      if (classification === 'box' && type === 'checkbox') {
+        return '';
+      }
+      if (!hasErrors) {
+        return `${this.inputStyles} hover:border-black-300 focus:border-black-300 ${this.isInputDarkOrLightMode} ${this.inputBorderColor}`;
+      }
+      return `${this.inputStyles} border-red-200 hover:border-red-300 focus:border-red-300 ${this.isInputDarkOrLightMode}`;
+    },
+    isContactFieldRequired(field) {
+      return this.preChatFields.find(option => option.name === field).required;
+    },
+    getLabel({ name, label }) {
+      if (this.labels[name])
+        return this.$t(`PRE_CHAT_FORM.FIELDS.${this.labels[name]}.LABEL`);
+      return label;
+    },
+    getPlaceHolder({ name, placeholder }) {
+      if (this.labels[name])
+        return this.$t(`PRE_CHAT_FORM.FIELDS.${this.labels[name]}.PLACEHOLDER`);
+      return placeholder;
+    },
+    getValue({ name, type }) {
+      if (type === 'select') {
+        return this.enabledPreChatFields.find(option => option.name === name)
+          .values[this.formValues[name]];
+      }
+      return this.formValues[name] || null;
+    },
+
+    getRequiredErrorMessage({ name, label }) {
+      if (this.labels[name])
+        return this.$t(
+          `PRE_CHAT_FORM.FIELDS.${this.labels[name]}.REQUIRED_ERROR`
+        );
+      return `${label} ${this.$t('PRE_CHAT_FORM.IS_REQUIRED')}`;
+    },
+    getValidation({ type, name }) {
+      if (!this.isContactFieldRequired(name)) {
+        return '';
+      }
+      const validations = {
+        emailAddress: 'email',
+        phoneNumber: 'isPhoneE164OrEmpty',
+        url: 'url',
+        date: 'date',
+        text: null,
+        select: null,
+        number: null,
+      };
+      const validationKeys = Object.keys(validations);
+      const validation = 'bail|required';
+      if (validationKeys.includes(name) || validationKeys.includes(type)) {
+        const validationType = validations[type] || validations[name];
+        return validationType ? `${validation}|${validationType}` : validation;
+      }
+      return '';
+    },
+    findFieldType(type) {
+      if (type === 'link') {
+        return 'url';
+      }
+      if (type === 'list') {
+        return 'select';
+      }
+
+      return type;
+    },
+    getOptions(item) {
+      if (item.type === 'select') {
+        let values = {};
+        item.values.forEach((value, index) => {
+          values = {
+            ...values,
+            [index]: value,
+          };
+        });
+        return values;
+      }
+      return null;
+    },
+    onSubmit() {
+      const { emailAddress, fullName, phoneNumber, message } = this.formValues;
+      const { email } = this.currentUser;
       this.$emit('submit', {
-        fullName: this.fullName,
-        emailAddress: this.emailAddress,
-        message: this.message,
+        fullName,
+        phoneNumber,
+        emailAddress: emailAddress || email,
+        message,
         activeCampaignId: this.activeCampaign.id,
+        conversationCustomAttributes: this.conversationCustomAttributes,
+        contactCustomAttributes: this.contactCustomAttributes,
       });
     },
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep {
+  .wrapper[data-type='checkbox'] {
+    .formulate-input-wrapper {
+      display: flex;
+      align-items: center;
+
+      label {
+        margin-left: 0.2rem;
+      }
+    }
+  }
+  @media (prefers-color-scheme: dark) {
+    .wrapper {
+      .formulate-input-element--date,
+      .formulate-input-element--checkbox {
+        input {
+          color-scheme: dark;
+        }
+      }
+    }
+  }
+  .wrapper[data-type='textarea'] {
+    .formulate-input-element--textarea {
+      textarea {
+        min-height: 8rem;
+      }
+    }
+  }
+}
+</style>
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index 66bf83fe5..ef4149191 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Full Name",
         "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email Address",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid 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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/mixins/configMixin.js b/app/javascript/widget/mixins/configMixin.js
index 9cb09f062..70c2ac258 100644
--- a/app/javascript/widget/mixins/configMixin.js
+++ b/app/javascript/widget/mixins/configMixin.js
@@ -25,15 +25,21 @@ export default {
       return window.chatwootWebChannel.preChatFormEnabled;
     },
     preChatFormOptions() {
-      let requireEmail = false;
       let preChatMessage = '';
       const options = window.chatwootWebChannel.preChatFormOptions || {};
-      requireEmail = options.require_email;
       preChatMessage = options.pre_chat_message;
+      const { pre_chat_fields: preChatFields = [] } = options;
       return {
-        requireEmail,
         preChatMessage,
+        preChatFields,
       };
     },
+    shouldShowPreChatForm() {
+      const { preChatFields } = this.preChatFormOptions;
+      // Check if at least one enabled field in pre-chat fields
+      const hasEnabledFields =
+        preChatFields.filter(field => field.enabled).length > 0;
+      return this.preChatFormEnabled && hasEnabledFields;
+    },
   },
 };
diff --git a/app/javascript/widget/mixins/specs/configMixin.spec.js b/app/javascript/widget/mixins/specs/configMixin.spec.js
index 975001249..c81e5bab3 100644
--- a/app/javascript/widget/mixins/specs/configMixin.spec.js
+++ b/app/javascript/widget/mixins/specs/configMixin.spec.js
@@ -1,12 +1,30 @@
 import { createWrapper } from '@vue/test-utils';
 import configMixin from '../configMixin';
 import Vue from 'vue';
-
+const preChatFields = [
+  {
+    label: 'Email Id',
+    name: 'emailAddress',
+    type: 'email',
+    field_type: 'standard',
+    required: false,
+    enabled: false,
+  },
+  {
+    label: 'Full name',
+    name: 'fullName',
+    type: 'text',
+    field_type: 'standard',
+    required: true,
+    enabled: true,
+  },
+];
 global.chatwootWebChannel = {
   avatarUrl: 'https://test.url',
   hasAConnectedAgentBot: 'AgentBot',
   enabledFeatures: ['emoji_picker', 'attachments', 'end_conversation'],
-  preChatFormOptions: { require_email: false, pre_chat_message: '' },
+  preChatFormOptions: { pre_chat_fields: preChatFields, pre_chat_message: '' },
+  preChatFormEnabled: true,
 };
 
 global.chatwootWidgetDefaults = {
@@ -29,18 +47,22 @@ describe('configMixin', () => {
     expect(wrapper.vm.hasAConnectedAgentBot).toBe(true);
     expect(wrapper.vm.useInboxAvatarForBot).toBe(true);
     expect(wrapper.vm.inboxAvatarUrl).toBe('https://test.url');
+
     expect(wrapper.vm.channelConfig).toEqual({
       avatarUrl: 'https://test.url',
       hasAConnectedAgentBot: 'AgentBot',
       enabledFeatures: ['emoji_picker', 'attachments', 'end_conversation'],
       preChatFormOptions: {
         pre_chat_message: '',
-        require_email: false,
+        pre_chat_fields: preChatFields,
       },
+      preChatFormEnabled: true,
     });
     expect(wrapper.vm.preChatFormOptions).toEqual({
-      requireEmail: false,
       preChatMessage: '',
+      preChatFields: preChatFields,
     });
+    expect(wrapper.vm.preChatFormEnabled).toEqual(true);
+    expect(wrapper.vm.shouldShowPreChatForm).toEqual(true);
   });
 });
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index 0fbfa094f..10109b318 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-1 flex-col justify-end">
     <div class="flex flex-1 overflow-auto">
-      <!-- Load Converstion List Components Here -->
+      <!-- Load Conversation List Components Here -->
     </div>
     <team-availability
       :available-agents="availableAgents"
@@ -40,16 +40,12 @@ export default {
       availableAgents: 'agent/availableAgents',
       activeCampaign: 'campaign/getActiveCampaign',
       conversationSize: 'conversation/getConversationSize',
-      currentUser: 'contacts/getCurrentUser',
     }),
   },
   methods: {
     startConversation() {
-      const isUserEmailAvailable = !!this.currentUser.email;
       if (this.preChatFormEnabled && !this.conversationSize) {
-        return this.replaceRoute('prechat-form', {
-          disableContactFields: isUserEmailAvailable,
-        });
+        return this.replaceRoute('prechat-form');
       }
       return this.replaceRoute('messages');
     },
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
index cb0b4c217..f3c9d7fe4 100644
--- a/app/javascript/widget/views/PreChatForm.vue
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -12,6 +12,7 @@ import { mapGetters } from 'vuex';
 import PreChatForm from '../components/PreChat/Form';
 import configMixin from '../mixins/configMixin';
 import routerMixin from '../mixins/routerMixin';
+import { isEmptyObject } from 'widget/helpers/utils';
 
 export default {
   components: {
@@ -35,13 +36,22 @@ export default {
     },
   },
   methods: {
-    onSubmit({ fullName, emailAddress, message, activeCampaignId }) {
+    onSubmit({
+      fullName,
+      emailAddress,
+      message,
+      activeCampaignId,
+      phoneNumber,
+      contactCustomAttributes,
+      conversationCustomAttributes,
+    }) {
       if (activeCampaignId) {
         bus.$emit('execute-campaign', activeCampaignId);
         this.$store.dispatch('contacts/update', {
           user: {
             email: emailAddress,
             name: fullName,
+            phone_number: phoneNumber,
           },
         });
       } else {
@@ -49,8 +59,16 @@ export default {
           fullName: fullName,
           emailAddress: emailAddress,
           message: message,
+          phoneNumber: phoneNumber,
+          customAttributes: conversationCustomAttributes,
         });
       }
+      if (!isEmptyObject(contactCustomAttributes)) {
+        this.$store.dispatch(
+          'contacts/setCustomAttributes',
+          contactCustomAttributes
+        );
+      }
     },
   },
 };
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 94ea0138b..b85443633 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -32,9 +32,13 @@ class Channel::WebWidget < ApplicationRecord
   self.table_name = 'channel_web_widgets'
   EDITABLE_ATTRS = [:website_url, :widget_color, :welcome_title, :welcome_tagline, :reply_time, :pre_chat_form_enabled,
                     :continuity_via_email, :hmac_mandatory,
-                    { pre_chat_form_options: [:pre_chat_message, :require_email] },
+                    { pre_chat_form_options: [:pre_chat_message, :require_email,
+                                              { pre_chat_fields:
+                                                [:field_type, :label, :placeholder, :name, :enabled, :type, :enabled, :required,
+                                                 :locale, { values: [] }] }] },
                     { selected_feature_flags: [] }].freeze
 
+  before_validation :validate_pre_chat_options
   validates :website_url, presence: true
   validates :widget_color, presence: true
 
@@ -74,6 +78,25 @@ class Channel::WebWidget < ApplicationRecord
     "
   end
 
+  def validate_pre_chat_options
+    return if pre_chat_form_options.with_indifferent_access['pre_chat_fields'].present?
+
+    self.pre_chat_form_options = {
+      pre_chat_message: 'Share your queries or comments here.',
+      pre_chat_fields: [
+        {
+          'field_type': 'standard', 'label': 'Email Id', 'name': 'emailAddress', 'type': 'email', 'required': true, 'enabled': false
+        },
+        {
+          'field_type': 'standard', 'label': 'Full name', 'name': 'fullName', 'type': 'text', 'required': false, 'enabled': false
+        },
+        {
+          'field_type': 'standard', 'label': 'Phone number', 'name': 'phoneNumber', 'type': 'text', 'required': false, 'enabled': false
+        }
+      ]
+    }
+  end
+
   def create_contact_inbox(additional_attributes = {})
     ActiveRecord::Base.transaction do
       contact = inbox.account.contacts.create!(
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index 9feca3994..fa0370375 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -39,6 +39,6 @@ class CustomAttributeDefinition < ApplicationRecord
   private
 
   def sync_widget_pre_chat_custom_fields
-    ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_later(attribute_key)
+    ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_now(account, attribute_key)
   end
 end
diff --git a/app/views/api/v1/widget/contacts/show.json.jbuilder b/app/views/api/v1/widget/contacts/show.json.jbuilder
index 9853ccbee..d6228cbfe 100644
--- a/app/views/api/v1/widget/contacts/show.json.jbuilder
+++ b/app/views/api/v1/widget/contacts/show.json.jbuilder
@@ -1,3 +1,4 @@
 json.id @contact.id
 json.name @contact.name
 json.email @contact.email
+json.phone_number @contact.phone_number
diff --git a/app/views/api/v1/widget/contacts/update.json.jbuilder b/app/views/api/v1/widget/contacts/update.json.jbuilder
index 9853ccbee..d6228cbfe 100644
--- a/app/views/api/v1/widget/contacts/update.json.jbuilder
+++ b/app/views/api/v1/widget/contacts/update.json.jbuilder
@@ -1,3 +1,4 @@
 json.id @contact.id
 json.name @contact.name
 json.email @contact.email
+json.phone_number @contact.phone_number
diff --git a/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb b/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb
new file mode 100644
index 000000000..a2fe3d9a7
--- /dev/null
+++ b/db/migrate/20220316054933_add_custom_fields_to_pre_chat_form.rb
@@ -0,0 +1,29 @@
+class AddCustomFieldsToPreChatForm < ActiveRecord::Migration[6.1]
+  def change
+    Channel::WebWidget.find_in_batches do |channels_batch|
+      channels_batch.each do |channel|
+        pre_chat_message = channel[:pre_chat_form_options]['pre_chat_message'] || 'Share your queries or comments here.'
+        pre_chat_fields = pre_chat_fields?(channel)
+        channel[:pre_chat_form_options] = {
+          'pre_chat_message': pre_chat_message,
+          'pre_chat_fields': pre_chat_fields
+        }
+        channel.save!
+      end
+    end
+  end
+
+  def pre_chat_fields?(channel)
+    email_enabled = channel[:pre_chat_form_options]['require_email'] || false
+    [
+      {
+        'field_type': 'standard', 'label': 'Email Id', 'name': 'emailAddress', 'type': 'email', 'required': true, 'enabled': email_enabled
+      },
+      {
+        'field_type': 'standard', 'label': 'Full name', 'name': 'fullName', 'type': 'text', 'required': false, 'enabled': false
+      }, {
+        'field_type': 'standard', 'label': 'Phone number', 'name': 'phoneNumber', 'type': 'text', 'required': false, 'enabled': false
+      }
+    ]
+  end
+end
diff --git a/spec/models/channel/web_widget_spec.rb b/spec/models/channel/web_widget_spec.rb
new file mode 100644
index 000000000..3c7a803ab
--- /dev/null
+++ b/spec/models/channel/web_widget_spec.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Channel::WebWidget do
+  context 'when
+  web widget channel' do
+    let!(:channel_widget) { create(:channel_widget) }
+
+    it 'pre chat options' do
+      expect(channel_widget.pre_chat_form_options['pre_chat_message']).to eq 'Share your queries or comments here.'
+      expect(channel_widget.pre_chat_form_options['pre_chat_fields'].length).to eq 3
+    end
+  end
+end
diff --git a/spec/models/channel/widget_test.rb b/spec/models/channel/widget_test.rb
deleted file mode 100644
index 10445c44d..000000000
--- a/spec/models/channel/widget_test.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class Channel::WidgetTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
-end

From 5b9c4bf7f18a8bdc783386d54e3c749713f279ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:13:17 +0530
Subject: [PATCH 059/177] chore(deps): bump async from 2.6.3 to 2.6.4 (#4497)

Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  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 8f0bd9067..c32b9fc7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3469,9 +3469,9 @@ async-limiter@~1.0.0:
   integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==
 
 async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 

From 4f3a2713552a3d862104fc8a33f00ca7aae30a3b Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Wed, 20 Apr 2022 10:49:52 +0530
Subject: [PATCH 060/177] chore: Add `custom attributes` in
 `campaign.triggered` event (#4463)

---
 .../campaigns/campaign_conversation_builder.rb     |  5 +++--
 app/javascript/widget/App.vue                      |  7 ++++---
 app/javascript/widget/api/campaign.js              | 14 ++++++++++----
 app/javascript/widget/api/endPoints.js             |  3 ++-
 app/javascript/widget/store/modules/campaign.js    |  7 +++++--
 app/javascript/widget/views/PreChatForm.vue        |  5 ++++-
 app/listeners/campaign_listener.rb                 |  4 +++-
 spec/listeners/campaign_listener_spec.rb           |  5 +++--
 8 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/app/builders/campaigns/campaign_conversation_builder.rb b/app/builders/campaigns/campaign_conversation_builder.rb
index 48a3cebd4..9eb640576 100644
--- a/app/builders/campaigns/campaign_conversation_builder.rb
+++ b/app/builders/campaigns/campaign_conversation_builder.rb
@@ -1,5 +1,5 @@
 class Campaigns::CampaignConversationBuilder
-  pattr_initialize [:contact_inbox_id!, :campaign_display_id!, :conversation_additional_attributes]
+  pattr_initialize [:contact_inbox_id!, :campaign_display_id!, :conversation_additional_attributes, :custom_attributes]
 
   def perform
     @contact_inbox = ContactInbox.find(@contact_inbox_id)
@@ -32,7 +32,8 @@ class Campaigns::CampaignConversationBuilder
       contact_id: @contact_inbox.contact_id,
       contact_inbox_id: @contact_inbox.id,
       campaign_id: @campaign.id,
-      additional_attributes: conversation_additional_attributes
+      additional_attributes: conversation_additional_attributes,
+      custom_attributes: custom_attributes || {}
     }
   end
 end
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index ec30064a7..723effb81 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -155,13 +155,14 @@ export default {
           this.replaceRoute('prechat-form');
         } else {
           this.replaceRoute('messages');
-          bus.$emit('execute-campaign', this.activeCampaign.id);
+          bus.$emit('execute-campaign', { campaignId: this.activeCampaign.id });
         }
         this.unsetUnreadView();
       });
-      bus.$on('execute-campaign', campaignId => {
+      bus.$on('execute-campaign', campaignDetails => {
+        const { customAttributes, campaignId } = campaignDetails;
         const { websiteToken } = window.chatwootWebChannel;
-        this.executeCampaign({ campaignId, websiteToken });
+        this.executeCampaign({ campaignId, websiteToken, customAttributes });
         this.replaceRoute('messages');
       });
     },
diff --git a/app/javascript/widget/api/campaign.js b/app/javascript/widget/api/campaign.js
index 00116a6b2..57d81e084 100644
--- a/app/javascript/widget/api/campaign.js
+++ b/app/javascript/widget/api/campaign.js
@@ -7,9 +7,16 @@ const getCampaigns = async websiteToken => {
   return result;
 };
 
-const triggerCampaign = async ({ campaignId, websiteToken }) => {
-  const urlData = endPoints.triggerCampaign({ websiteToken, campaignId });
-
+const triggerCampaign = async ({
+  campaignId,
+  websiteToken,
+  customAttributes,
+}) => {
+  const urlData = endPoints.triggerCampaign({
+    websiteToken,
+    campaignId,
+    customAttributes,
+  });
   await API.post(
     urlData.url,
     { ...urlData.data },
@@ -18,5 +25,4 @@ const triggerCampaign = async ({ campaignId, websiteToken }) => {
     }
   );
 };
-
 export { getCampaigns, triggerCampaign };
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index 870275382..298196a43 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -78,12 +78,13 @@ const getCampaigns = token => ({
     website_token: token,
   },
 });
-const triggerCampaign = ({ websiteToken, campaignId }) => ({
+const triggerCampaign = ({ websiteToken, campaignId, customAttributes }) => ({
   url: '/api/v1/widget/events',
   data: {
     name: 'campaign.triggered',
     event_info: {
       campaign_id: campaignId,
+      custom_attributes: customAttributes,
       ...generateEventParams(),
     },
   },
diff --git a/app/javascript/widget/store/modules/campaign.js b/app/javascript/widget/store/modules/campaign.js
index 381364543..5ea3e691f 100644
--- a/app/javascript/widget/store/modules/campaign.js
+++ b/app/javascript/widget/store/modules/campaign.js
@@ -92,14 +92,17 @@ export const actions = {
     }
   },
 
-  executeCampaign: async ({ commit }, { campaignId, websiteToken }) => {
+  executeCampaign: async (
+    { commit },
+    { campaignId, websiteToken, customAttributes }
+  ) => {
     try {
       commit(
         'conversation/setConversationUIFlag',
         { isCreating: true },
         { root: true }
       );
-      await triggerCampaign({ campaignId, websiteToken });
+      await triggerCampaign({ campaignId, websiteToken, customAttributes });
       commit('setCampaignExecuted', true);
       commit('setActiveCampaign', {});
     } catch (error) {
diff --git a/app/javascript/widget/views/PreChatForm.vue b/app/javascript/widget/views/PreChatForm.vue
index f3c9d7fe4..a3986b07a 100644
--- a/app/javascript/widget/views/PreChatForm.vue
+++ b/app/javascript/widget/views/PreChatForm.vue
@@ -46,7 +46,10 @@ export default {
       conversationCustomAttributes,
     }) {
       if (activeCampaignId) {
-        bus.$emit('execute-campaign', activeCampaignId);
+        bus.$emit('execute-campaign', {
+          campaignId: activeCampaignId,
+          customAttributes: conversationCustomAttributes,
+        });
         this.$store.dispatch('contacts/update', {
           user: {
             email: emailAddress,
diff --git a/app/listeners/campaign_listener.rb b/app/listeners/campaign_listener.rb
index 1405911c2..8d0f664a7 100644
--- a/app/listeners/campaign_listener.rb
+++ b/app/listeners/campaign_listener.rb
@@ -2,13 +2,15 @@ class CampaignListener < BaseListener
   def campaign_triggered(event)
     contact_inbox = event.data[:contact_inbox]
     campaign_display_id = event.data[:event_info][:campaign_id]
+    custom_attributes = event.data[:event_info][:custom_attributes]
 
     return if campaign_display_id.blank?
 
     ::Campaigns::CampaignConversationBuilder.new(
       contact_inbox_id: contact_inbox.id,
       campaign_display_id: campaign_display_id,
-      conversation_additional_attributes: event.data[:event_info].except(:campaign_id)
+      conversation_additional_attributes: event.data[:event_info].except(:campaign_id, :custom_attributes),
+      custom_attributes: custom_attributes
     ).perform
   end
 end
diff --git a/spec/listeners/campaign_listener_spec.rb b/spec/listeners/campaign_listener_spec.rb
index b9f693055..137d1c396 100644
--- a/spec/listeners/campaign_listener_spec.rb
+++ b/spec/listeners/campaign_listener_spec.rb
@@ -9,7 +9,7 @@ describe CampaignListener do
 
   let!(:event) do
     Events::Base.new('campaign_triggered', Time.zone.now,
-                     contact_inbox: contact_inbox, event_info: { campaign_id: campaign.display_id })
+                     contact_inbox: contact_inbox, event_info: { campaign_id: campaign.display_id, custom_attributes: { order_id: 321 } })
   end
 
   describe '#campaign_triggered' do
@@ -23,7 +23,8 @@ describe CampaignListener do
     context 'when params contain campaign id' do
       it 'triggers campaign conversation builder' do
         expect(Campaigns::CampaignConversationBuilder).to receive(:new)
-          .with({ contact_inbox_id: contact_inbox.id, campaign_display_id: campaign.display_id, conversation_additional_attributes: {} }).once
+          .with({ contact_inbox_id: contact_inbox.id, campaign_display_id: campaign.display_id, conversation_additional_attributes: {},
+                  custom_attributes: { order_id: 321 } }).once
         listener.campaign_triggered(event)
       end
     end

From f2f0d466f2d82be179bed531c021b86be942661a Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 20 Apr 2022 16:00:37 +0530
Subject: [PATCH 061/177] chore: Update Help Center APIs to accomodate locale
 (#4515)

---
 .../api/v1/accounts/kbase/base_controller.rb  |  2 +-
 .../v1/accounts/kbase/portals_controller.rb   | 10 ++-
 app/models/kbase/category.rb                  |  5 ++
 app/models/kbase/portal.rb                    |  5 +-
 .../kbase/portals/_portal.json.jbuilder       |  1 +
 .../kbase/portals/create.json.jbuilder        |  4 +-
 .../kbase/portals/index.json.jbuilder         |  4 +-
 .../accounts/kbase/portals/show.json.jbuilder |  1 +
 .../kbase/portals/update.json.jbuilder        |  4 +-
 .../api/v1/kbase/portal/show.json.jbuilder    |  1 +
 .../v1/models/kbase/_category.json.jbuilder   |  5 ++
 .../api/v1/models/kbase/_portal.json.jbuilder |  9 +++
 .../20220416203340_add_config_to_portal.rb    |  5 ++
 ...0416205519_add_locale_to_kbase_category.rb |  7 ++
 db/schema.rb                                  |  3 +
 .../kbase/categories_controller_spec.rb}      | 24 +++---
 .../kbase/portals_controller_spec.rb}         | 81 ++++++++++++-------
 17 files changed, 114 insertions(+), 57 deletions(-)
 create mode 100644 app/views/api/v1/accounts/kbase/portals/show.json.jbuilder
 create mode 100644 app/views/public/api/v1/kbase/portal/show.json.jbuilder
 create mode 100644 app/views/public/api/v1/models/kbase/_category.json.jbuilder
 create mode 100644 app/views/public/api/v1/models/kbase/_portal.json.jbuilder
 create mode 100644 db/migrate/20220416203340_add_config_to_portal.rb
 create mode 100644 db/migrate/20220416205519_add_locale_to_kbase_category.rb
 rename spec/{requests/api/v1/accounts/kbase/categories_request_spec.rb => controllers/api/v1/accounts/kbase/categories_controller_spec.rb} (90%)
 rename spec/{requests/api/v1/accounts/kbase/portals_request_spec.rb => controllers/api/v1/accounts/kbase/portals_controller_spec.rb} (72%)

diff --git a/app/controllers/api/v1/accounts/kbase/base_controller.rb b/app/controllers/api/v1/accounts/kbase/base_controller.rb
index f50140883..4f62cd858 100644
--- a/app/controllers/api/v1/accounts/kbase/base_controller.rb
+++ b/app/controllers/api/v1/accounts/kbase/base_controller.rb
@@ -4,6 +4,6 @@ class Api::V1::Accounts::Kbase::BaseController < Api::V1::Accounts::BaseControll
   private
 
   def portal
-    @portal ||= Current.account.kbase_portals.find_by(id: params[:portal_id])
+    @portal ||= Current.account.kbase_portals.find_by(slug: params[:portal_id])
   end
 end
diff --git a/app/controllers/api/v1/accounts/kbase/portals_controller.rb b/app/controllers/api/v1/accounts/kbase/portals_controller.rb
index 804b2d421..5ec1b4a83 100644
--- a/app/controllers/api/v1/accounts/kbase/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/kbase/portals_controller.rb
@@ -1,10 +1,12 @@
-class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::Kbase::BaseController
+class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::BaseController
   before_action :fetch_portal, except: [:index, :create]
 
   def index
     @portals = Current.account.kbase_portals
   end
 
+  def show; end
+
   def create
     @portal = Current.account.kbase_portals.create!(portal_params)
   end
@@ -21,7 +23,11 @@ class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::Kbase::Ba
   private
 
   def fetch_portal
-    @portal = current_account.kbase_portals.find(params[:id])
+    @portal = Current.account.kbase_portals.find_by(slug: permitted_params[:id])
+  end
+
+  def permitted_params
+    params.permit(:id)
   end
 
   def portal_params
diff --git a/app/models/kbase/category.rb b/app/models/kbase/category.rb
index 024efae8e..d2b270306 100644
--- a/app/models/kbase/category.rb
+++ b/app/models/kbase/category.rb
@@ -4,6 +4,7 @@
 #
 #  id          :bigint           not null, primary key
 #  description :text
+#  locale      :string           default("en")
 #  name        :string
 #  position    :integer
 #  created_at  :datetime         not null
@@ -11,6 +12,10 @@
 #  account_id  :integer          not null
 #  portal_id   :integer          not null
 #
+# Indexes
+#
+#  index_kbase_categories_on_locale_and_account_id  (locale,account_id)
+#
 class Kbase::Category < ApplicationRecord
   belongs_to :account
   belongs_to :portal
diff --git a/app/models/kbase/portal.rb b/app/models/kbase/portal.rb
index 03f8e29bf..c381e5c46 100644
--- a/app/models/kbase/portal.rb
+++ b/app/models/kbase/portal.rb
@@ -3,8 +3,8 @@
 # Table name: kbase_portals
 #
 #  id            :bigint           not null, primary key
-#  account_id    :integer          not null
 #  color         :string
+#  config        :jsonb
 #  custom_domain :string
 #  header_text   :text
 #  homepage_link :string
@@ -13,6 +13,7 @@
 #  slug          :string           not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
+#  account_id    :integer          not null
 #
 # Indexes
 #
@@ -26,5 +27,5 @@ class Kbase::Portal < ApplicationRecord
 
   validates :account_id, presence: true
   validates :name, presence: true
-  validates :slug, presence: true
+  validates :slug, presence: true, uniqueness: true
 end
diff --git a/app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder b/app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder
index 92ddc41ba..d612f5265 100644
--- a/app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder
+++ b/app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder
@@ -6,3 +6,4 @@ json.homepage_link portal.homepage_link
 json.name portal.name
 json.page_title portal.page_title
 json.slug portal.slug
+json.config portal.config
diff --git a/app/views/api/v1/accounts/kbase/portals/create.json.jbuilder b/app/views/api/v1/accounts/kbase/portals/create.json.jbuilder
index c46e46321..f4bc72924 100644
--- a/app/views/api/v1/accounts/kbase/portals/create.json.jbuilder
+++ b/app/views/api/v1/accounts/kbase/portals/create.json.jbuilder
@@ -1,3 +1 @@
-json.payload do
-  json.partial! 'portal', portal: @portal
-end
+json.partial! 'portal', portal: @portal
diff --git a/app/views/api/v1/accounts/kbase/portals/index.json.jbuilder b/app/views/api/v1/accounts/kbase/portals/index.json.jbuilder
index 3e4553382..4a7949da1 100644
--- a/app/views/api/v1/accounts/kbase/portals/index.json.jbuilder
+++ b/app/views/api/v1/accounts/kbase/portals/index.json.jbuilder
@@ -1,3 +1 @@
-json.payload do
-  json.array! @portals, partial: 'portal', as: :portal
-end
+json.array! @portals, partial: 'portal', as: :portal
diff --git a/app/views/api/v1/accounts/kbase/portals/show.json.jbuilder b/app/views/api/v1/accounts/kbase/portals/show.json.jbuilder
new file mode 100644
index 000000000..f4bc72924
--- /dev/null
+++ b/app/views/api/v1/accounts/kbase/portals/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'portal', portal: @portal
diff --git a/app/views/api/v1/accounts/kbase/portals/update.json.jbuilder b/app/views/api/v1/accounts/kbase/portals/update.json.jbuilder
index c46e46321..f4bc72924 100644
--- a/app/views/api/v1/accounts/kbase/portals/update.json.jbuilder
+++ b/app/views/api/v1/accounts/kbase/portals/update.json.jbuilder
@@ -1,3 +1 @@
-json.payload do
-  json.partial! 'portal', portal: @portal
-end
+json.partial! 'portal', portal: @portal
diff --git a/app/views/public/api/v1/kbase/portal/show.json.jbuilder b/app/views/public/api/v1/kbase/portal/show.json.jbuilder
new file mode 100644
index 000000000..f4bc72924
--- /dev/null
+++ b/app/views/public/api/v1/kbase/portal/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'portal', portal: @portal
diff --git a/app/views/public/api/v1/models/kbase/_category.json.jbuilder b/app/views/public/api/v1/models/kbase/_category.json.jbuilder
new file mode 100644
index 000000000..355a16608
--- /dev/null
+++ b/app/views/public/api/v1/models/kbase/_category.json.jbuilder
@@ -0,0 +1,5 @@
+json.id category.id
+json.name category.name
+json.locale category.locale
+json.description category.description
+json.position category.position
diff --git a/app/views/public/api/v1/models/kbase/_portal.json.jbuilder b/app/views/public/api/v1/models/kbase/_portal.json.jbuilder
new file mode 100644
index 000000000..d612f5265
--- /dev/null
+++ b/app/views/public/api/v1/models/kbase/_portal.json.jbuilder
@@ -0,0 +1,9 @@
+json.id portal.id
+json.color portal.color
+json.custom_domain portal.custom_domain
+json.header_text portal.header_text
+json.homepage_link portal.homepage_link
+json.name portal.name
+json.page_title portal.page_title
+json.slug portal.slug
+json.config portal.config
diff --git a/db/migrate/20220416203340_add_config_to_portal.rb b/db/migrate/20220416203340_add_config_to_portal.rb
new file mode 100644
index 000000000..27cd53773
--- /dev/null
+++ b/db/migrate/20220416203340_add_config_to_portal.rb
@@ -0,0 +1,5 @@
+class AddConfigToPortal < ActiveRecord::Migration[6.1]
+  def change
+    add_column :kbase_portals, :config, :jsonb, default: { allowed_locales: ['en'] }
+  end
+end
diff --git a/db/migrate/20220416205519_add_locale_to_kbase_category.rb b/db/migrate/20220416205519_add_locale_to_kbase_category.rb
new file mode 100644
index 000000000..04cdc4bf3
--- /dev/null
+++ b/db/migrate/20220416205519_add_locale_to_kbase_category.rb
@@ -0,0 +1,7 @@
+class AddLocaleToKbaseCategory < ActiveRecord::Migration[6.1]
+  def change
+    add_column :kbase_categories, :locale, :string, default: 'en'
+    add_index :kbase_categories, :locale
+    add_index :kbase_categories, [:locale, :account_id]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 8373fe31f..2d03ce428 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -507,6 +507,8 @@ ActiveRecord::Schema.define(version: 2022_04_18_094715) do
     t.integer "position"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.string "locale", default: "en"
+    t.index ["locale", "account_id"], name: "index_kbase_categories_on_locale_and_account_id"
   end
 
   create_table "kbase_folders", force: :cascade do |t|
@@ -528,6 +530,7 @@ ActiveRecord::Schema.define(version: 2022_04_18_094715) do
     t.text "header_text"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.jsonb "config", default: {"allowed_locales"=>["en"]}
     t.index ["slug"], name: "index_kbase_portals_on_slug", unique: true
   end
 
diff --git a/spec/requests/api/v1/accounts/kbase/categories_request_spec.rb b/spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb
similarity index 90%
rename from spec/requests/api/v1/accounts/kbase/categories_request_spec.rb
rename to spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb
index 2c8f54241..4d98cd898 100644
--- a/spec/requests/api/v1/accounts/kbase/categories_request_spec.rb
+++ b/spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb
@@ -6,10 +6,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
   let!(:portal) { create(:kbase_portal, name: 'test_portal', account_id: account.id) }
   let!(:category) { create(:kbase_category, name: 'category', portal: portal, account_id: account.id) }
 
-  describe 'POST /api/v1/accounts/{account.id}/kbase/portals/{portal.id}/categories' do
+  describe 'POST /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories", params: {}
+        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -23,7 +23,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
             position: 1
           }
         }
-        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories",
+        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories",
              params: category_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
@@ -33,10 +33,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
     end
   end
 
-  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.id}/categories/{category.id}' do
+  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories/{category.id}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories/#{category.id}", params: {}
+        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -53,7 +53,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
 
         expect(category.name).not_to eql(category_params[:category][:name])
 
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories/#{category.id}",
+        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}",
             params: category_params,
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
@@ -63,17 +63,17 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
     end
   end
 
-  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.id}/categories/{category.id}' do
+  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories/{category.id}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories/#{category.id}", params: {}
+        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'deletes category' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories/#{category.id}",
+        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}",
                headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         deleted_category = Kbase::Category.find_by(id: category.id)
@@ -82,10 +82,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
     end
   end
 
-  describe 'GET /api/v1/accounts/{account.id}/kbase/portals/{portal.id}/categories' do
+  describe 'GET /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories"
+        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories"
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -95,7 +95,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
         category2 = create(:kbase_category, name: 'test_category_2', portal: portal)
         expect(category2.id).not_to be nil
 
-        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}/categories",
+        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
diff --git a/spec/requests/api/v1/accounts/kbase/portals_request_spec.rb b/spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb
similarity index 72%
rename from spec/requests/api/v1/accounts/kbase/portals_request_spec.rb
rename to spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb
index 9adf9cba6..eae356930 100644
--- a/spec/requests/api/v1/accounts/kbase/portals_request_spec.rb
+++ b/spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb
@@ -3,7 +3,47 @@ require 'rails_helper'
 RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let!(:portal) { create(:kbase_portal, name: 'test_portal', account_id: account.id) }
+  let!(:portal) { create(:kbase_portal, slug: 'portal-1', name: 'test_portal', account_id: account.id) }
+
+  describe 'GET /api/v1/accounts/{account.id}/kbase/portals' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/kbase/portals"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'get all portals' do
+        portal2 = create(:kbase_portal, name: 'test_portal_2', account_id: account.id, slug: 'portal-2')
+        expect(portal2.id).not_to be nil
+        get "/api/v1/accounts/#{account.id}/kbase/portals",
+            headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response.count).to be 2
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/kbase/portals"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'get one portals' do
+        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
+            headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['name']).to eq portal.name
+      end
+    end
+  end
 
   describe 'POST /api/v1/accounts/{account.id}/kbase/portals' do
     context 'when it is an unauthenticated user' do
@@ -26,15 +66,15 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
-        expect(json_response['payload']['name']).to eql('test_portal')
+        expect(json_response['name']).to eql('test_portal')
       end
     end
   end
 
-  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.id}' do
+  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}", params: {}
+        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -49,53 +89,32 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
 
         expect(portal.name).to eql('test_portal')
 
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}",
+        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
             params: portal_params,
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
-        expect(json_response['payload']['name']).to eql(portal_params[:portal][:name])
+        expect(json_response['name']).to eql(portal_params[:portal][:name])
       end
     end
   end
 
-  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.id}' do
+  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}", params: {}
+        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'deletes portal' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.id}",
+        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
                headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        deleted_portal = Kbase::Portal.find_by(id: portal.id)
+        deleted_portal = Kbase::Portal.find_by(id: portal.slug)
         expect(deleted_portal).to be nil
       end
     end
   end
-
-  describe 'GET /api/v1/accounts/{account.id}/kbase/portals' do
-    context 'when it is an unauthenticated user' do
-      it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals"
-        expect(response).to have_http_status(:unauthorized)
-      end
-    end
-
-    context 'when it is an authenticated user' do
-      it 'get all portals' do
-        portal2 = create(:kbase_portal, name: 'test_portal_2', account_id: account.id)
-        expect(portal2.id).not_to be nil
-        get "/api/v1/accounts/#{account.id}/kbase/portals",
-            headers: agent.create_new_auth_token
-        expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
-        expect(json_response['payload'].count).to be 2
-      end
-    end
-  end
 end

From 2b2252b66e71a4e8d109e398df1d7f4094cbc4cc Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Wed, 20 Apr 2022 16:03:12 +0530
Subject: [PATCH 062/177] feat: Add a read indicator for web-widget channel
 (#4224)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../components/widgets/conversation/Message.vue | 17 +++++++++++++++++
 .../widgets/conversation/MessagesView.vue       | 14 ++++++++++++++
 .../widgets/conversation/bubble/Actions.vue     | 15 +++++++++++++++
 app/javascript/dashboard/helper/actionCable.js  |  6 ++++++
 .../dashboard/i18n/locale/en/chatlist.json      |  3 ++-
 .../dashboard/mixins/conversations.js           |  3 +++
 .../dashboard/mixins/specs/conversaton.spec.js  |  7 +++++++
 .../store/modules/conversations/actions.js      |  4 ++++
 .../store/modules/conversations/getters.js      |  3 +++
 .../store/modules/conversations/index.js        |  4 ++++
 .../modules/specs/conversations/actions.spec.js |  9 +++++++++
 .../modules/specs/conversations/getters.spec.js | 10 ++++++++++
 .../specs/conversations/mutations.spec.js       | 12 ++++++++++++
 .../dashboard/store/mutation-types.js           |  1 +
 .../components/FluentIcon/dashboard-icons.json  |  2 ++
 15 files changed, 109 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/Message.vue b/app/javascript/dashboard/components/widgets/conversation/Message.vue
index 4035a62d0..db37e7558 100644
--- a/app/javascript/dashboard/components/widgets/conversation/Message.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/Message.vue
@@ -60,6 +60,7 @@
           :readable-time="readableTime"
           :source-id="data.source_id"
           :inbox-id="data.inbox_id"
+          :message-read="showReadTicks"
         />
       </div>
       <spinner v-if="isPending" size="tiny" />
@@ -153,6 +154,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    hasUserReadMessage: {
+      type: Boolean,
+      default: false,
+    },
+    isWebWidgetInbox: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -268,6 +277,14 @@ export default {
     isOutgoing() {
       return this.data.message_type === MESSAGE_TYPE.OUTGOING;
     },
+    showReadTicks() {
+      return (
+        (this.isOutgoing || this.isTemplate) &&
+        this.hasUserReadMessage &&
+        this.isWebWidgetInbox &&
+        !this.data.private
+      );
+    },
     isTemplate() {
       return this.data.message_type === MESSAGE_TYPE.TEMPLATE;
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 280ddc158..3ebf59a54 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -48,6 +48,10 @@
         :data="message"
         :is-a-tweet="isATweet"
         :has-instagram-story="hasInstagramStory"
+        :has-user-read-message="
+          hasUserReadMessage(message.created_at, getLastSeenAt)
+        "
+        :is-web-widget-inbox="isAWebWidgetInbox"
       />
       <li v-show="getUnreadCount != 0" class="unread--toast">
         <span class="text-uppercase">
@@ -66,6 +70,10 @@
         :data="message"
         :is-a-tweet="isATweet"
         :has-instagram-story="hasInstagramStory"
+        :has-user-read-message="
+          hasUserReadMessage(message.created_at, getLastSeenAt)
+        "
+        :is-web-widget-inbox="isAWebWidgetInbox"
       />
     </ul>
     <div
@@ -141,6 +149,7 @@ export default {
       listLoadingStatus: 'getAllMessagesLoaded',
       getUnreadCount: 'getUnreadCount',
       loadingChatList: 'getChatListLoadingStatus',
+      conversationLastSeen: 'getConversationLastSeen',
     }),
     inboxId() {
       return this.currentChat.inbox_id;
@@ -241,6 +250,11 @@ export default {
       }
       return 'arrow-chevron-left';
     },
+    getLastSeenAt() {
+      if (this.conversationLastSeen) return this.conversationLastSeen;
+      const { contact_last_seen_at: contactLastSeenAt } = this.currentChat;
+      return contactLastSeenAt;
+    },
   },
 
   watch: {
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index a20f3d34c..86f97f400 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -8,6 +8,13 @@
         size="16"
       />
     </span>
+    <fluent-icon
+      v-if="messageRead"
+      v-tooltip.top-start="$t('CHAT_LIST.MESSAGE_READ')"
+      icon="checkmark-double"
+      class="action--icon read-tick"
+      size="12"
+    />
     <fluent-icon
       v-if="isEmail"
       v-tooltip.top-start="$t('CHAT_LIST.RECEIVED_VIA_EMAIL')"
@@ -120,6 +127,10 @@ export default {
       type: [String, Number],
       default: 0,
     },
+    messageRead: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     inbox() {
@@ -173,6 +184,10 @@ export default {
     }
 
     .action--icon {
+      &.read-tick {
+        color: var(--v-100);
+        margin-top: calc(var(--space-micro) + var(--space-micro) / 2);
+      }
       color: var(--white);
     }
 
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index ee272643c..77c8a7aff 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -23,6 +23,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'contact.updated': this.onContactUpdate,
       'conversation.mentioned': this.onConversationMentioned,
       'notification.created': this.onNotificationCreated,
+      'conversation.read': this.onConversationRead,
     };
   }
 
@@ -64,6 +65,11 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.fetchConversationStats();
   };
 
+  onConversationRead = data => {
+    const { contact_last_seen_at: lastSeen } = data;
+    this.app.$store.dispatch('updateConversationRead', lastSeen);
+  };
+
   onLogout = () => AuthAPI.logout();
 
   onMessageCreated = data => {
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index ccff2c33b..e3d637b71 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/mixins/conversations.js b/app/javascript/dashboard/mixins/conversations.js
index 2242685af..3b1def4fc 100644
--- a/app/javascript/dashboard/mixins/conversations.js
+++ b/app/javascript/dashboard/mixins/conversations.js
@@ -15,6 +15,9 @@ export default {
           chat.private !== true
       ).length;
     },
+    hasUserReadMessage(createdAt, contactLastSeen) {
+      return !(contactLastSeen - createdAt < 0);
+    },
     readMessages(m) {
       return m.messages.filter(
         chat => chat.created_at * 1000 <= m.agent_last_seen_at * 1000
diff --git a/app/javascript/dashboard/mixins/specs/conversaton.spec.js b/app/javascript/dashboard/mixins/specs/conversaton.spec.js
index eaa9aab97..a1784afeb 100644
--- a/app/javascript/dashboard/mixins/specs/conversaton.spec.js
+++ b/app/javascript/dashboard/mixins/specs/conversaton.spec.js
@@ -26,4 +26,11 @@ describe('#conversationMixin', () => {
       conversationMixin.methods.unReadMessages(conversationFixture.conversation)
     ).toEqual(conversationFixture.unReadMessages);
   });
+  it('should return the user message read flag', () => {
+    const contactLastSeen = 1649856659;
+    const createdAt = 1649859419;
+    expect(
+      conversationMixin.methods.hasUserReadMessage(createdAt, contactLastSeen)
+    ).toEqual(false);
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index ca42dfae0..2012a6edd 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -199,6 +199,10 @@ const actions = {
     }
   },
 
+  updateConversationRead({ commit }, timestamp) {
+    commit(types.SET_CONVERSATION_LAST_SEEN, timestamp);
+  },
+
   updateMessage({ commit }, message) {
     commit(types.ADD_MESSAGE, message);
   },
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index 75d9aef44..c5b34af60 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -91,6 +91,9 @@ const getters = {
       value => value.id === Number(conversationId)
     );
   },
+  getConversationLastSeen: _state => {
+    return _state.conversationLastSeen;
+  },
 };
 
 export default getters;
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 87d81d070..e05743dbe 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -13,6 +13,7 @@ const state = {
   currentInbox: null,
   selectedChatId: null,
   appliedFilters: [],
+  conversationLastSeen: null,
 };
 
 // mutations
@@ -33,6 +34,9 @@ export const mutations = {
     _state.allConversations = [];
     _state.selectedChatId = null;
   },
+  [types.SET_CONVERSATION_LAST_SEEN](_state, timestamp) {
+    _state.conversationLastSeen = timestamp;
+  },
   [types.SET_ALL_MESSAGES_LOADED](_state) {
     const [chat] = getSelectedChatConversation(_state);
     Vue.set(chat, 'allMessagesLoaded', true);
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
index 680b6dbec..91cbfa626 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -372,6 +372,15 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([[types.CLEAR_CONVERSATION_FILTERS]]);
     });
   });
+
+  describe('#updateConversationRead', () => {
+    it('commits the correct mutation and sets the contact_last_seen', () => {
+      actions.updateConversationRead({ commit }, 1649856659);
+      expect(commit.mock.calls).toEqual([
+        [types.SET_CONVERSATION_LAST_SEEN, 1649856659],
+      ]);
+    });
+  });
 });
 
 describe('#deleteMessage', () => {
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
index 7dc0dade5..ef891deb2 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/getters.spec.js
@@ -132,6 +132,16 @@ describe('#getters', () => {
     });
   });
 
+  describe('#getConversationLastSeen', () => {
+    it('getConversationLastSeen', () => {
+      const timestamp = 1649856659;
+      const state = {
+        conversationLastSeen: timestamp,
+      };
+      expect(getters.getConversationLastSeen(state)).toEqual(timestamp);
+    });
+  });
+
   describe('#getLastEmailInSelectedChat', () => {
     it('Returns cc in last email', () => {
       const state = {};
diff --git a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
index b7828fff3..8d4535b21 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/mutations.spec.js
@@ -187,6 +187,18 @@ describe('#mutations', () => {
       ]);
     });
 
+    describe('#SET_CONVERSATION_LAST_SEEN', () => {
+      it('sets conversation last seen timestamp', () => {
+        const state = {
+          conversationLastSeen: null,
+        };
+
+        mutations[types.SET_CONVERSATION_LAST_SEEN](state, 1649856659);
+
+        expect(state.conversationLastSeen).toEqual(1649856659);
+      });
+    });
+
     describe('#UPDATE_CONVERSATION_CUSTOM_ATTRIBUTES', () => {
       it('update conversation custom attributes', () => {
         const custom_attributes = { order_id: 1001 };
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 1c99f97d3..4ae2d0e10 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -21,6 +21,7 @@ export default {
   CLEAR_CONTACT_CONVERSATIONS: 'CLEAR_CONTACT_CONVERSATIONS',
   SET_CONVERSATION_FILTERS: 'SET_CONVERSATION_FILTERS',
   CLEAR_CONVERSATION_FILTERS: 'CLEAR_CONVERSATION_FILTERS',
+  SET_CONVERSATION_LAST_SEEN: 'SET_CONVERSATION_LAST_SEEN',
 
   SET_CURRENT_CHAT_WINDOW: 'SET_CURRENT_CHAT_WINDOW',
   CLEAR_CURRENT_CHAT_WINDOW: 'CLEAR_CURRENT_CHAT_WINDOW',
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 9f19f8a9d..f145159d1 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -37,6 +37,8 @@
   "checkmark-circle-solid": "M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10S2 17.523 2 12 6.477 2 12 2Zm3.22 6.97-4.47 4.47-1.97-1.97a.75.75 0 0 0-1.06 1.06l2.5 2.5a.75.75 0 0 0 1.06 0l5-5a.75.75 0 1 0-1.06-1.06Z",
   "checkmark-square-solid": "M18 3a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6a3 3 0 0 1 3-3h12zm-1.53 4.97L10 14.44l-2.47-2.47a.75.75 0 0 0-1.06 1.06l3 3a.75.75 0 0 0 1.06 0l7-7a.75.75 0 0 0-1.06-1.06z",
   "checkmark-outline": "M4.53 12.97a.75.75 0 0 0-1.06 1.06l4.5 4.5a.75.75 0 0 0 1.06 0l11-11a.75.75 0 0 0-1.06-1.06L8.5 16.94l-3.97-3.97Z",
+  "checkmark-solid": "m8.5 16.586l-3.793-3.793a1 1 0 0 0-1.414 1.414l4.5 4.5a1 1 0 0 0 1.414 0l11-11a1 1 0 0 0-1.414-1.414L8.5 16.586Z",
+  "checkmark-double-outline": "M10.2929 16.8787C9.90237 17.2692 9.90237 17.9024 10.2929 18.2929C10.6834 18.6834 11.3166 18.6834 11.7071 18.2929L23.2929 6.70711C23.6834 6.31658 23.6834 5.68342 23.2929 5.29289C22.9024 4.90237 22.2692 4.90237 21.8787 5.29289L10.2929 16.8787ZM2.70711 11.7929L6.5 15.5858L16.7929 5.29289C17.1834 4.90237 17.8166 4.90237 18.2071 5.29289C18.5976 5.68342 18.5976 6.31658 18.2071 6.70711L7.20711 17.7071C6.81658 18.0976 6.18342 18.0976 5.79289 17.7071L1.29289 13.2071C0.902369 12.8166 0.902369 12.1834 1.29289 11.7929C1.68342 11.4024 2.31658 11.4024 2.70711 11.7929Z",
   "chevron-down-outline": "M4.22 8.47a.75.75 0 0 1 1.06 0L12 15.19l6.72-6.72a.75.75 0 1 1 1.06 1.06l-7.25 7.25a.75.75 0 0 1-1.06 0L4.22 9.53a.75.75 0 0 1 0-1.06Z",
   "chevron-left-outline": "M15.53 4.22a.75.75 0 0 1 0 1.06L8.81 12l6.72 6.72a.75.75 0 1 1-1.06 1.06l-7.25-7.25a.75.75 0 0 1 0-1.06l7.25-7.25a.75.75 0 0 1 1.06 0Z",
   "chevron-right-outline": "M8.293 4.293a1 1 0 0 0 0 1.414L14.586 12l-6.293 6.293a1 1 0 1 0 1.414 1.414l7-7a1 1 0 0 0 0-1.414l-7-7a1 1 0 0 0-1.414 0Z",

From 2c73df429259755dc7ced8994859d5c052111a08 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 20 Apr 2022 22:42:13 +0530
Subject: [PATCH 063/177] Chore: Provide fixed attachment URLs for Channels
 (#4507)

Prior to this change, The attachment URL sent from Chatwoot to 3rd party integrations like Whatsapp and Facebook
involved a 301 redirect before the original content is served. This causes intermittent breakages for the sent attachments.

fixes: #3632
ref: https://blog.saeloun.com/2021/09/14/rails-7-adds-expiring-urls-to-active-storage.html
---
 app/models/attachment.rb                             |  5 ++++-
 app/models/channel/telegram.rb                       |  2 +-
 app/models/channel/whatsapp.rb                       |  2 +-
 app/services/facebook/send_on_facebook_service.rb    |  2 +-
 app/services/instagram/send_on_instagram_service.rb  |  2 +-
 app/services/twilio/send_on_twilio_service.rb        |  2 +-
 config/environments/test.rb                          |  4 ++--
 lib/integrations/slack/send_on_slack_service.rb      |  2 +-
 spec/models/attachment_spec.rb                       | 12 ++++++++++++
 .../facebook/send_on_facebook_service_spec.rb        |  3 ++-
 spec/services/sms/send_on_sms_service_spec.rb        |  4 +++-
 11 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 spec/models/attachment_spec.rb

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 6193fbb91..43ae583ea 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -44,12 +44,15 @@ class Attachment < ApplicationRecord
     base_data.merge(file_metadata)
   end
 
+  # NOTE: the URl returned does a 301 redirect to the actual file
   def file_url
     file.attached? ? url_for(file) : ''
   end
 
+  # NOTE: for External services use this methods since redirect doesn't work effectively in a lot of cases
   def download_url
-    file.attached? ? rails_storage_proxy_url(file) : ''
+    ActiveStorage::Current.host = Rails.application.routes.default_url_options[:host] if ActiveStorage::Current.host.blank?
+    file.attached? ? file.blob.url : ''
   end
 
   def thumb_url
diff --git a/app/models/channel/telegram.rb b/app/models/channel/telegram.rb
index afbff8497..f086ec277 100644
--- a/app/models/channel/telegram.rb
+++ b/app/models/channel/telegram.rb
@@ -95,7 +95,7 @@ class Channel::Telegram < ApplicationRecord
       when 'file'
         telegram_attachment[:type] = 'document'
       end
-      telegram_attachment[:media] = attachment.file_url
+      telegram_attachment[:media] = attachment.download_url
       telegram_attachments << telegram_attachment
     end
 
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 9349735fc..59ede2a8d 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -85,7 +85,7 @@ class Channel::Whatsapp < ApplicationRecord
   def send_attachment_message(phone_number, message)
     attachment = message.attachments.first
     type = %w[image audio video].include?(attachment.file_type) ? attachment.file_type : 'document'
-    attachment_url = attachment.file_url
+    attachment_url = attachment.download_url
     response = HTTParty.post(
       "#{api_base_path}/messages",
       headers: api_headers,
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 52c259edb..7ebab36a3 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -36,7 +36,7 @@ class Facebook::SendOnFacebookService < Base::SendOnChannelService
         attachment: {
           type: attachment_type(attachment),
           payload: {
-            url: attachment.file_url
+            url: attachment.download_url
           }
         }
       },
diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index f57fdd8ea..c206c765b 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -39,7 +39,7 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
         attachment: {
           type: attachment_type(attachment),
           payload: {
-            url: attachment.file_url
+            url: attachment.download_url
           }
         }
       }
diff --git a/app/services/twilio/send_on_twilio_service.rb b/app/services/twilio/send_on_twilio_service.rb
index c722bd6bf..fa480e745 100644
--- a/app/services/twilio/send_on_twilio_service.rb
+++ b/app/services/twilio/send_on_twilio_service.rb
@@ -25,7 +25,7 @@ class Twilio::SendOnTwilioService < Base::SendOnChannelService
   end
 
   def attachments
-    message.attachments.map(&:file_url)
+    message.attachments.map(&:download_url)
   end
 
   def inbox
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 24baf5aff..43b7108b8 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -20,8 +20,8 @@ Rails.application.configure do
   config.public_file_server.headers = {
     'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
-  config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
-  Rails.application.routes.default_url_options = { host: 'localhost', port: 3000 }
+  config.action_mailer.default_url_options = { host: 'http://localhost:3000' }
+  Rails.application.routes.default_url_options = { host: 'http://localhost:3000' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 1eb91b3ea..40fab95ea 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -73,7 +73,7 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def file_type
-    File.extname(message.attachments.first.file_url).strip.downcase[1..]
+    File.extname(message.attachments.first.download_url).strip.downcase[1..]
   end
 
   def file_information
diff --git a/spec/models/attachment_spec.rb b/spec/models/attachment_spec.rb
new file mode 100644
index 000000000..55cf01a0b
--- /dev/null
+++ b/spec/models/attachment_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe Attachment, type: :model do
+  describe 'download_url' do
+    it 'returns valid download url' do
+      message = create(:message)
+      attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+      attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+      expect(attachment.download_url).not_to eq nil
+    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 e0a39ba75..5063159ad 100644
--- a/spec/services/facebook/send_on_facebook_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -57,6 +57,7 @@ describe Facebook::SendOnFacebookService do
         attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
         attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
         message.save!
+        allow(attachment).to receive(:download_url).and_return('url1')
         ::Facebook::SendOnFacebookService.new(message: message).perform
         expect(bot).to have_received(:deliver).with({
                                                       recipient: { id: contact_inbox.source_id },
@@ -70,7 +71,7 @@ describe Facebook::SendOnFacebookService do
                                                         attachment: {
                                                           type: 'image',
                                                           payload: {
-                                                            url: attachment.file_url
+                                                            url: 'url1'
                                                           }
                                                         }
                                                       },
diff --git a/spec/services/sms/send_on_sms_service_spec.rb b/spec/services/sms/send_on_sms_service_spec.rb
index 21f9a7855..422861e06 100644
--- a/spec/services/sms/send_on_sms_service_spec.rb
+++ b/spec/services/sms/send_on_sms_service_spec.rb
@@ -36,12 +36,14 @@ describe Sms::SendOnSmsService do
         allow(HTTParty).to receive(:post).and_return(sms_request)
         allow(sms_request).to receive(:success?).and_return(true)
         allow(sms_request).to receive(:parsed_response).and_return({ 'id' => '123456789' })
+        allow(attachment).to receive(:download_url).and_return('url1')
+        allow(attachment2).to receive(:download_url).and_return('url2')
         expect(HTTParty).to receive(:post).with(
           'https://messaging.bandwidth.com/api/v2/users/1/messages',
           basic_auth: { username: '1', password: '1' },
           headers: { 'Content-Type' => 'application/json' },
           body: { 'to' => '+123456789', 'from' => sms_channel.phone_number, 'text' => 'test', 'applicationId' => '1',
-                  'media' => [attachment.download_url, attachment2.download_url] }.to_json
+                  'media' => %w[url1 url2] }.to_json
         )
         described_class.new(message: message).perform
         expect(message.reload.source_id).to eq('123456789')

From 27ddd77a1b621f503fe89a436a49f44b0b1204b5 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 21 Apr 2022 11:27:28 +0530
Subject: [PATCH 064/177] chore: Sanitize html content  (#4498)

---
 .../components/widgets/conversation/ReplyBox.vue     |  2 +-
 .../components/widgets/conversation/bubble/Text.vue  |  2 +-
 .../contact/components/MergeContactSummary.vue       |  4 ++--
 .../modules/notes/components/ContactNote.vue         |  2 +-
 app/javascript/dashboard/routes/auth/Signup.vue      |  2 +-
 .../conversation/ContactCustomAttributes.vue         |  4 +++-
 .../conversation/search/SearchMessageItem.vue        |  2 +-
 .../dashboard/settings/SettingsSubPageHeader.vue     |  2 +-
 .../routes/dashboard/settings/agents/Index.vue       |  2 +-
 .../settings/attributes/CustomAttribute.vue          |  2 +-
 .../routes/dashboard/settings/automation/Index.vue   |  2 +-
 .../routes/dashboard/settings/canned/Index.vue       |  2 +-
 .../routes/dashboard/settings/inbox/Index.vue        |  2 +-
 .../integrationapps/MultipleIntegrationHooks.vue     |  2 +-
 .../settings/integrations/IntegrationHelpText.vue    |  4 +++-
 .../dashboard/settings/integrations/Webhook.vue      |  2 +-
 .../routes/dashboard/settings/labels/Index.vue       |  2 +-
 .../routes/dashboard/settings/teams/Index.vue        |  2 +-
 app/javascript/packs/application.js                  |  3 ++-
 app/javascript/packs/widget.js                       |  2 ++
 .../shared/components/emoji/EmojiInput.vue           |  4 ++--
 .../widget/components/AgentMessageBubble.vue         |  2 +-
 app/javascript/widget/components/ChatHeader.vue      |  2 +-
 .../widget/components/ChatHeaderExpanded.vue         |  6 +++---
 app/javascript/widget/components/UnreadMessage.vue   |  5 ++++-
 .../widget/components/UserMessageBubble.vue          |  2 +-
 package.json                                         |  1 +
 yarn.lock                                            | 12 ++++++++++++
 28 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 99321eff8..ae2b83f2a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -80,8 +80,8 @@
     >
       <p
         v-if="isSignatureAvailable"
+        v-dompurify-html="formatMessage(messageSignature)"
         class="message-signature"
-        v-html="formatMessage(messageSignature)"
       />
       <p v-else class="message-signature">
         {{ $t('CONVERSATION.FOOTER.MESSAGE_SIGNATURE_NOT_CONFIGURED') }}
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
index 1bd16d9d5..bf21d535e 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
@@ -6,7 +6,7 @@
       'hide--quoted': !showQuotedContent,
     }"
   >
-    <div class="text-content" v-html="message"></div>
+    <div v-dompurify-html="message" class="text-content"></div>
     <button
       v-if="displayQuotedButton"
       class="quoted-text--button"
diff --git a/app/javascript/dashboard/modules/contact/components/MergeContactSummary.vue b/app/javascript/dashboard/modules/contact/components/MergeContactSummary.vue
index 1f238e509..667359493 100644
--- a/app/javascript/dashboard/modules/contact/components/MergeContactSummary.vue
+++ b/app/javascript/dashboard/modules/contact/components/MergeContactSummary.vue
@@ -7,7 +7,7 @@
       <li>
         <span class="bullet">❌</span>
         <span
-          v-html="
+          v-dompurify-html="
             $t('MERGE_CONTACTS.SUMMARY.DELETE_WARNING', {
               childContactName,
             })
@@ -17,7 +17,7 @@
       <li>
         <span class="bullet">✅</span>
         <span
-          v-html="
+          v-dompurify-html="
             $t('MERGE_CONTACTS.SUMMARY.ATTRIBUTE_WARNING', {
               childContactName,
               primaryContactName,
diff --git a/app/javascript/dashboard/modules/notes/components/ContactNote.vue b/app/javascript/dashboard/modules/notes/components/ContactNote.vue
index b781d9639..17e847a8f 100644
--- a/app/javascript/dashboard/modules/notes/components/ContactNote.vue
+++ b/app/javascript/dashboard/modules/notes/components/ContactNote.vue
@@ -35,7 +35,7 @@
         :reject-text="$t('DELETE_NOTE.CONFIRM.NO')"
       />
     </div>
-    <p class="note__content" v-html="formatMessage(note || '')" />
+    <p v-dompurify-html="formatMessage(note || '')" class="note__content" />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index 2ea4e443a..a91ab5f12 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -91,7 +91,7 @@
             button-class="large expanded"
           >
           </woot-submit-button>
-          <p class="accept--terms" v-html="termsLink"></p>
+          <p v-dompurify-html="termsLink" class="accept--terms"></p>
         </form>
         <div class="column text-center sigin--footer">
           <span>{{ $t('REGISTER.HAVE_AN_ACCOUNT') }}</span>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
index 6f73aa51e..a9a809385 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
@@ -9,7 +9,9 @@
         {{ attribute }}
       </div>
       <div>
-        <span v-html="valueWithLink(customAttributes[attribute])"></span>
+        <span
+          v-dompurify-html="valueWithLink(customAttributes[attribute])"
+        ></span>
       </div>
     </div>
     <p v-if="!listOfAttributes.length">
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
index 3dd5d5cc0..9064110db 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
@@ -14,7 +14,7 @@
         </div>
         <span class="timestamp">{{ readableTime }} </span>
       </div>
-      <p class="message-content" v-html="prepareContent(content)"></p>
+      <p v-dompurify-html="prepareContent(content)" class="message-content"></p>
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
index 283944437..ea6a6e86b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
@@ -3,7 +3,7 @@
     <h2 class="page-sub-title">
       {{ headerTitle }}
     </h2>
-    <p class="small-12 column" v-html="headerContent"></p>
+    <p v-dompurify-html="headerContent" class="small-12 column"></p>
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index 5714582d5..d58ca76fa 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -89,7 +89,7 @@
       </div>
       <div class="small-4 columns">
         <span
-          v-html="
+          v-dompurify-html="
             useInstallationName(
               $t('AGENT_MGMT.SIDEBAR_TXT'),
               globalConfig.installationName
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
index 1153490a9..f89bb6eb2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
@@ -76,7 +76,7 @@
       </div>
     </div>
     <div class="small-4 columns">
-      <span v-html="$t('ATTRIBUTES_MGMT.SIDEBAR_TXT')"></span>
+      <span v-dompurify-html="$t('ATTRIBUTES_MGMT.SIDEBAR_TXT')"></span>
     </div>
     <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
       <edit-attribute
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 28b8c982f..60f3c6dde 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -81,7 +81,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-html="$t('AUTOMATION.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('AUTOMATION.SIDEBAR_TXT')"></span>
       </div>
     </div>
     <woot-modal
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index 29e388e6c..bde14d385 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -76,7 +76,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-html="$t('CANNED_MGMT.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('CANNED_MGMT.SIDEBAR_TXT')"></span>
       </div>
     </div>
     <!-- Add Agent -->
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index 67ccfc0ef..d5abbaaf5 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -102,7 +102,7 @@
 
       <div class="small-4 columns">
         <span
-          v-html="
+          v-dompurify-html="
             useInstallationName(
               $t('INBOX_MGMT.SIDEBAR_TXT'),
               globalConfig.installationName
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
index c19f52793..19ec1d597 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
@@ -50,7 +50,7 @@
         <b>{{ integration.name }}</b>
       </p>
       <p
-        v-html="
+        v-dompurify-html="
           $t(
             `INTEGRATION_APPS.SIDEBAR_DESCRIPTION.${integration.name.toUpperCase()}`,
             { installationName: globalConfig.installationName }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
index 25049f2d0..c99f8827d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
@@ -4,7 +4,9 @@
       <div class="integration--description">
         <h5>{{ $t('INTEGRATION_SETTINGS.SLACK.HELP_TEXT.TITLE') }}</h5>
         <p>
-          <span v-html="$t('INTEGRATION_SETTINGS.SLACK.HELP_TEXT.BODY')"></span>
+          <span
+            v-dompurify-html="$t('INTEGRATION_SETTINGS.SLACK.HELP_TEXT.BODY')"
+          ></span>
         </p>
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
index 2c489585c..e5bb621f0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
@@ -72,7 +72,7 @@
 
       <div class="small-4 columns">
         <span
-          v-html="
+          v-dompurify-html="
             useInstallationName(
               $t('INTEGRATION_SETTINGS.WEBHOOK.SIDEBAR_TXT'),
               globalConfig.installationName
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index 19fde4428..66de41a00 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -72,7 +72,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-html="$t('LABEL_MGMT.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('LABEL_MGMT.SIDEBAR_TXT')"></span>
       </div>
     </div>
     <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
index 5eefe008f..c9bea40f6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -57,7 +57,7 @@
 
       <div class="small-4 columns">
         <span
-          v-html="
+          v-dompurify-html="
             $t('TEAMS_SETTINGS.SIDEBAR_TXT', {
               installationName: globalConfig.installationName,
             })
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 0f99970c0..b0e081f98 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -38,6 +38,7 @@ import {
   initializeChatwootEvents,
 } from '../dashboard/helper/scriptHelpers';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
+import VueDOMPurifyHTML from 'vue-dompurify-html';
 
 Vue.config.env = process.env;
 
@@ -54,7 +55,7 @@ if (window.analyticsConfig) {
     api_host: window.analyticsConfig.host,
   });
 }
-
+Vue.use(VueDOMPurifyHTML);
 Vue.use(VueRouter);
 Vue.use(VueI18n);
 Vue.use(WootUiKit);
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index 850645581..3b9661bc7 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -1,6 +1,7 @@
 import Vue from 'vue';
 import Vuelidate from 'vuelidate';
 import VueI18n from 'vue-i18n';
+import VueDOMPurifyHTML from 'vue-dompurify-html';
 import VueFormulate from '@braid/vue-formulate';
 import store from '../widget/store';
 import App from '../widget/App.vue';
@@ -10,6 +11,7 @@ import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import router from '../widget/router';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
+Vue.use(VueDOMPurifyHTML);
 
 const i18nConfig = new VueI18n({
   locale: 'en',
diff --git a/app/javascript/shared/components/emoji/EmojiInput.vue b/app/javascript/shared/components/emoji/EmojiInput.vue
index eb71ac73f..387605913 100644
--- a/app/javascript/shared/components/emoji/EmojiInput.vue
+++ b/app/javascript/shared/components/emoji/EmojiInput.vue
@@ -9,9 +9,9 @@
           @click="changeCategory(category)"
         >
           <button
+            v-dompurify-html="emojis[category][0]"
             class="emoji--item"
             @click="changeCategory(category)"
-            v-html="emojis[category][0]"
           />
         </li>
       </ul>
@@ -23,10 +23,10 @@
       <button
         v-for="emoji in emojis[selectedKey]"
         :key="emoji"
+        v-dompurify-html="emoji"
         class="emoji--item"
         track-by="$index"
         @click="onClick(emoji)"
-        v-html="emoji"
       />
     </div>
   </div>
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index b4a304914..0695292a7 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -8,9 +8,9 @@
       :class="$dm('bg-white', 'dark:bg-slate-700')"
     >
       <div
+        v-dompurify-html="formatMessage(message, false)"
         class="message-content"
         :class="$dm('text-black-900', 'dark:text-slate-50')"
-        v-html="formatMessage(message, false)"
       ></div>
       <email-input
         v-if="isTemplateEmail"
diff --git a/app/javascript/widget/components/ChatHeader.vue b/app/javascript/widget/components/ChatHeader.vue
index 15ffda422..906c98d14 100644
--- a/app/javascript/widget/components/ChatHeader.vue
+++ b/app/javascript/widget/components/ChatHeader.vue
@@ -22,7 +22,7 @@
           class="font-medium text-base flex items-center"
           :class="$dm('text-black-900', 'dark:text-slate-50')"
         >
-          <span class="mr-1" v-html="title" />
+          <span v-dompurify-html="title" class="mr-1" />
           <div
             :class="
               `h-2 w-2 rounded-full leading-4
diff --git a/app/javascript/widget/components/ChatHeaderExpanded.vue b/app/javascript/widget/components/ChatHeaderExpanded.vue
index fd316c3e0..c1823f504 100755
--- a/app/javascript/widget/components/ChatHeaderExpanded.vue
+++ b/app/javascript/widget/components/ChatHeaderExpanded.vue
@@ -11,14 +11,14 @@
       <header-actions :show-popout-button="showPopoutButton" />
     </div>
     <h2
-      class=" mt-5 text-3xl mb-3 font-normal"
+      v-dompurify-html="introHeading"
+      class="mt-5 text-3xl mb-3 font-normal"
       :class="$dm('text-slate-900', 'dark:text-slate-50')"
-      v-html="introHeading"
     />
     <p
+      v-dompurify-html="introBody"
       class="text-lg leading-normal"
       :class="$dm('text-slate-700', 'dark:text-slate-200')"
-      v-html="introBody"
     />
   </header>
 </template>
diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index a3d8ee363..f7494aec4 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -15,7 +15,10 @@
         <span class="agent--name">{{ agentName }}</span>
         <span class="company--name"> {{ companyName }}</span>
       </div>
-      <div class="message-content" v-html="formatMessage(message, false)"></div>
+      <div
+        v-dompurify-html="formatMessage(message, false)"
+        class="message-content"
+      ></div>
     </button>
   </div>
 </template>
diff --git a/app/javascript/widget/components/UserMessageBubble.vue b/app/javascript/widget/components/UserMessageBubble.vue
index 073766545..b0285b807 100755
--- a/app/javascript/widget/components/UserMessageBubble.vue
+++ b/app/javascript/widget/components/UserMessageBubble.vue
@@ -1,8 +1,8 @@
 <template>
   <div
+    v-dompurify-html="formatMessage(message, false)"
     class="chat-bubble user"
     :style="{ background: widgetColor }"
-    v-html="formatMessage(message, false)"
   />
 </template>
 
diff --git a/package.json b/package.json
index da44aecb2..9c249cf70 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "vue-chartjs": "3.5.1",
     "vue-clickaway": "~2.1.0",
     "vue-color": "2.8.1",
+    "vue-dompurify-html": "^2.5.1",
     "vue-easytable": "2.5.5",
     "vue-i18n": "8.24.3",
     "vue-loader": "15.9.6",
diff --git a/yarn.lock b/yarn.lock
index c32b9fc7b..959b40c3f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5843,6 +5843,11 @@ dompurify@2.2.7:
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.7.tgz#a5f055a2a471638680e779bd08fc334962d11fd8"
   integrity sha512-jdtDffdGNY+C76jvodNTu9jt5yYj59vuTUyx+wXdzcSwAGTYZDAQkQ7Iwx9zcGrA4ixC1syU4H3RZROqRxokxg==
 
+dompurify@^2.3.4:
+  version "2.3.6"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
+  integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
+
 domutils@^1.5.1, domutils@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
@@ -15101,6 +15106,13 @@ vue-docgen-loader@^1.5.0:
     loader-utils "^1.2.3"
     querystring "^0.2.0"
 
+vue-dompurify-html@^2.5.1:
+  version "2.5.1"
+  resolved "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.5.1.tgz#a754f4ac7b18eb8fe41f461cb2bb1c4956a9bd2d"
+  integrity sha512-B8rQj2jAPJJhtKHHa6jg5B3/RoKBmmUl/awP/GxWXGu75j4Y7+MHqv0DG52v0Uz0taEpHyZun34KEYMAfrPWnA==
+  dependencies:
+    dompurify "^2.3.4"
+
 vue-easytable@2.5.5:
   version "2.5.5"
   resolved "https://registry.yarnpkg.com/vue-easytable/-/vue-easytable-2.5.5.tgz#0d0ac244beb853859c76191c117311b5cf9654b5"

From f2815a2c002a81516473825ce7432cd4cc35846e Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Thu, 21 Apr 2022 14:10:54 +0530
Subject: [PATCH 065/177] Bump version to 2.4.1

---
 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 bcbe685e8..d370e1d74 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.4.0'
+  version: '2.4.1'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index da44aecb2..498be6ca2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue} --fix",

From f7694714394c47e980b45e82f1e66de658146421 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 21 Apr 2022 14:14:56 +0530
Subject: [PATCH 066/177] fix: Issue with closed all hours (#4521)

fixing the accidentally merged conditions for open all day and closed all day.
---
 app/javascript/widget/mixins/availability.js  |  6 ++-
 .../mixins/specs/availabilityMixin.spec.js    | 44 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/app/javascript/widget/mixins/availability.js b/app/javascript/widget/mixins/availability.js
index 1c5cbc37f..56f33b214 100644
--- a/app/javascript/widget/mixins/availability.js
+++ b/app/javascript/widget/mixins/availability.js
@@ -34,10 +34,14 @@ export default {
         openAllDay,
       } = this.currentDayAvailability;
 
-      if (openAllDay || closedAllDay) {
+      if (openAllDay) {
         return true;
       }
 
+      if (closedAllDay) {
+        return false;
+      }
+
       const { utcOffset } = this.channelConfig;
       const today = this.getDateWithOffset(utcOffset);
       const currentHours = today.getHours();
diff --git a/app/javascript/widget/mixins/specs/availabilityMixin.spec.js b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js
index 5b9e28caa..aa0cfd64c 100644
--- a/app/javascript/widget/mixins/specs/availabilityMixin.spec.js
+++ b/app/javascript/widget/mixins/specs/availabilityMixin.spec.js
@@ -28,6 +28,10 @@ global.chatwootWebChannel = {
 };
 
 describe('availabilityMixin', () => {
+  beforeEach(() => {
+    jest.useRealTimers();
+  });
+
   it('returns valid isInBetweenWorkingHours if in different timezone', () => {
     const Component = {
       render() {},
@@ -40,7 +44,6 @@ describe('availabilityMixin', () => {
     const vm = new Constructor().$mount();
     const wrapper = createWrapper(vm);
     expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true);
-    jest.useRealTimers();
   });
 
   it('returns valid isInBetweenWorkingHours if in same timezone', () => {
@@ -55,6 +58,43 @@ describe('availabilityMixin', () => {
     const Constructor = Vue.extend(Component);
     const wrapper = createWrapper(new Constructor().$mount());
     expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true);
-    jest.useRealTimers();
+  });
+
+  it('returns false if closed all day', () => {
+    const Component = {
+      render() {},
+      mixins: [availabilityMixin],
+    };
+    global.chatwootWebChannel.utcOffset = '-07:00';
+    global.chatwootWebChannel.workingHours = [
+      { day_of_week: 3, closed_all_day: true },
+    ];
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 09:01:46 GMT+0530'));
+
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(false);
+  });
+
+  it('returns true if open all day', () => {
+    const Component = {
+      render() {},
+      mixins: [availabilityMixin],
+    };
+    global.chatwootWebChannel.utcOffset = '-07:00';
+    global.chatwootWebChannel.workingHours = [
+      { day_of_week: 3, open_all_day: true },
+    ];
+    jest
+      .useFakeTimers('modern')
+      .setSystemTime(new Date('Thu Apr 14 2022 09:01:46 GMT+0530'));
+
+    const Constructor = Vue.extend(Component);
+    const vm = new Constructor().$mount();
+    const wrapper = createWrapper(vm);
+    expect(wrapper.vm.isInBetweenTheWorkingHours).toBe(true);
   });
 });

From b082b0e58c441de39de186f6fabfcaa4cd3a0f5f Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Thu, 21 Apr 2022 20:39:45 +0530
Subject: [PATCH 067/177] fix: Dig params in widget contact end point (#4516)

---
 app/controllers/api/v1/widget/base_controller.rb   |  4 ++--
 .../api/v1/widget/conversations_controller.rb      |  3 ++-
 .../message_templates/hook_execution_service.rb    |  2 +-
 .../api/v1/widget/messages_controller_spec.rb      |  2 +-
 .../hook_execution_service_spec.rb                 | 14 --------------
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index 67132869d..646d70acf 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -71,7 +71,7 @@ class Api::V1::Widget::BaseController < ApplicationController
   end
 
   def contact_email
-    permitted_params[:contact][:email].downcase if permitted_params[:contact].present?
+    permitted_params.dig(:contact, :email)&.downcase
   end
 
   def contact_name
@@ -79,7 +79,7 @@ class Api::V1::Widget::BaseController < ApplicationController
   end
 
   def contact_phone_number
-    params[:contact][:phone_number]
+    permitted_params.dig(:contact, :phone_number)
   end
 
   def browser_params
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index ef2422bef..cfe107ac6 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -69,7 +69,8 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email], message: [:content, :referer_url, :timestamp, :echo_id],
+    params.permit(:id, :typing_status, :website_token, :email, contact: [:name, :email, :phone_number],
+                                                               message: [:content, :referer_url, :timestamp, :echo_id],
                                                                custom_attributes: {})
   end
 end
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index bed23b2f8..5bffb881b 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -46,7 +46,7 @@ class MessageTemplates::HookExecutionService
 
   # TODO: we should be able to reduce this logic once we have a toggle for email collect messages
   def should_send_email_collect?
-    !contact_has_email? && inbox.web_widget? && !inbox.channel.pre_chat_form_enabled? && !email_collect_was_sent?
+    !contact_has_email? && inbox.web_widget? && !email_collect_was_sent?
   end
 
   def contact_has_email?
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index 208327c74..fe6dd19e4 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -150,7 +150,7 @@ RSpec.describe '/api/v1/widget/messages', type: :request do
             headers: { 'X-Auth-Token' => token },
             as: :json
 
-        expect(response).to have_http_status(:internal_server_error)
+        expect(response).to have_http_status(:success)
       end
     end
 
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index a71a393e5..b8255d903 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -62,20 +62,6 @@ describe ::MessageTemplates::HookExecutionService do
       expect(email_collect_service).to have_received(:perform)
     end
 
-    it 'doesnot calls ::MessageTemplates::Template::EmailCollect when prechat form is enabled' do
-      contact = create(:contact, email: nil)
-      conversation = create(:conversation, contact: contact)
-
-      # ensure prechat form is enabled
-      conversation.inbox.channel.update(pre_chat_form_enabled: true)
-      allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(true)
-
-      # described class gets called in message after commit
-      message = create(:message, conversation: conversation)
-
-      expect(::MessageTemplates::Template::EmailCollect).not_to have_received(:new).with(conversation: message.conversation)
-    end
-
     it 'doesnot calls ::MessageTemplates::Template::EmailCollect on campaign conversations' do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact, campaign: create(:campaign))

From 2acb48bbe0cd3a98980593bfe321f428a7ddf35d Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 21 Apr 2022 20:52:23 +0530
Subject: [PATCH 068/177] feat: Add support for conversation attribute
 automation conditions in message event (#4518)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/builders/messages/message_builder.rb      |   7 +-
 .../settings/automation/constants.js          |  21 ++
 app/listeners/automation_rule_listener.rb     |   2 +-
 app/models/automation_rule.rb                 |   2 +-
 .../automation_rules/action_service.rb        |   2 +-
 .../conditions_filter_service.rb              |  63 +++---
 .../automation_rule_listener_spec.rb          | 195 +++++++++++++++++-
 7 files changed, 255 insertions(+), 37 deletions(-)

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 9c26ccca1..d2936e9f3 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -9,6 +9,7 @@ class Messages::MessageBuilder
     @user = user
     @message_type = params[:message_type] || 'outgoing'
     @attachments = params[:attachments]
+    @automation_rule = @params&.dig(:content_attributes, :automation_rule_id)
     return unless params.instance_of?(ActionController::Parameters)
 
     @in_reply_to = params.to_unsafe_h&.dig(:content_attributes, :in_reply_to)
@@ -64,6 +65,10 @@ class Messages::MessageBuilder
     @params[:external_created_at].present? ? { external_created_at: @params[:external_created_at] } : {}
   end
 
+  def automation_rule_id
+    @automation_rule.present? ? { content_attributes: { automation_rule_id: @automation_rule } } : {}
+  end
+
   def message_sender
     return if @params[:sender_type] != 'AgentBot'
 
@@ -82,6 +87,6 @@ class Messages::MessageBuilder
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id]
-    }.merge(external_created_at)
+    }.merge(external_created_at).merge(automation_rule_id)
   end
 end
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index bdec6ebc0..3d1dac355 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -64,6 +64,13 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_2,
       },
+      {
+        key: 'inbox_id',
+        name: 'Inbox',
+        attributeI18nKey: 'INBOX',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
@@ -149,6 +156,13 @@ export const AUTOMATIONS = {
         inputType: 'plain_text',
         filterOperators: OPERATOR_TYPES_2,
       },
+      {
+        key: 'inbox_id',
+        name: 'Inbox',
+        attributeI18nKey: 'INBOX',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
@@ -247,6 +261,13 @@ export const AUTOMATIONS = {
         inputType: 'search_select',
         filterOperators: OPERATOR_TYPES_3,
       },
+      {
+        key: 'inbox_id',
+        name: 'Inbox',
+        attributeI18nKey: 'INBOX',
+        inputType: 'multi_select',
+        filterOperators: OPERATOR_TYPES_1,
+      },
     ],
     actions: [
       {
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 6ebc46666..0f445fea7 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -36,7 +36,7 @@ class AutomationRuleListener < BaseListener
     return unless rule_present?('message_created', account)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation, { message: message }).message_conditions
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation, { message: message }).perform
       ::AutomationRules::ActionService.new(rule, account, message.conversation).perform if conditions_match.present?
     end
   end
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 1dcc2583d..8211de98b 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -27,7 +27,7 @@ class AutomationRule < ApplicationRecord
 
   scope :active, -> { where(active: true) }
 
-  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company].freeze
+  CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id].freeze
   ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachments].freeze
 
   private
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 0771f817d..887e82b38 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -56,7 +56,7 @@ class AutomationRules::ActionService
   end
 
   def send_message(message)
-    params = { content: message[0], private: false }
+    params = { content: message[0], private: false, content_attributes: { automation_rule_id: @rule.id } }
     mb = Messages::MessageBuilder.new(nil, @conversation, params)
     mb.perform
   end
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 2ac011fbd..67cd2a62c 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -14,36 +14,33 @@ class AutomationRules::ConditionsFilterService < FilterService
   end
 
   def perform
-    conversation_filters = @filters['conversations']
-    contact_filters = @filters['contacts']
+    @conversation_filters = @filters['conversations']
+    @contact_filters = @filters['contacts']
+    @message_filters = @filters['messages']
 
     @rule.conditions.each_with_index do |query_hash, current_index|
-      conversation_filter = conversation_filters[query_hash['attribute_key']]
-      contact_filter = contact_filters[query_hash['attribute_key']]
-
-      if conversation_filter
-        @query_string += conversation_query_string('conversations', conversation_filter, query_hash.with_indifferent_access, current_index)
-      elsif contact_filter
-        @query_string += conversation_query_string('contacts', contact_filter, query_hash.with_indifferent_access, current_index)
-      elsif custom_attribute(query_hash['attribute_key'], @account)
-        # send table name according to attribute key right now we are supporting contact based custom attribute filter
-        @query_string += custom_attribute_query(query_hash.with_indifferent_access, 'contacts', current_index)
-      end
+      apply_filter(query_hash, current_index)
     end
 
     records = base_relation.where(@query_string, @filter_values.with_indifferent_access)
     records.any?
   end
 
-  def message_conditions
-    message_filters = @filters['messages']
+  def apply_filter(query_hash, current_index)
+    conversation_filter = @conversation_filters[query_hash['attribute_key']]
+    contact_filter = @contact_filters[query_hash['attribute_key']]
+    message_filter = @message_filters[query_hash['attribute_key']]
 
-    @rule.conditions.each_with_index do |query_hash, current_index|
-      current_filter = message_filters[query_hash['attribute_key']]
-      @query_string += message_query_string(current_filter, query_hash.with_indifferent_access, current_index)
+    if conversation_filter
+      @query_string += conversation_query_string('conversations', conversation_filter, query_hash.with_indifferent_access, current_index)
+    elsif contact_filter
+      @query_string += contact_query_string(contact_filter, query_hash.with_indifferent_access, current_index)
+    elsif message_filter
+      @query_string += message_query_string(message_filter, query_hash.with_indifferent_access, current_index)
+    elsif custom_attribute(query_hash['attribute_key'], @account)
+      # send table name according to attribute key right now we are supporting contact based custom attribute filter
+      @query_string += custom_attribute_query(query_hash.with_indifferent_access, 'contacts', current_index)
     end
-    records = Message.where(id: @options[:message].id).where(@query_string, @filter_values.with_indifferent_access)
-    records.any?
   end
 
   def message_query_string(current_filter, query_hash, current_index)
@@ -59,16 +56,18 @@ class AutomationRules::ConditionsFilterService < FilterService
   end
 
   # This will be used in future for contact automation rule
-  def contact_conditions(_contact)
-    conversation_filters = @filters['conversations']
+  def contact_query_string(current_filter, query_hash, current_index)
+    attribute_key = query_hash['attribute_key']
+    query_operator = query_hash['query_operator']
 
-    @rule.conditions.each_with_index do |query_hash, current_index|
-      current_filter = conversation_filters[query_hash['attribute_key']]
-      @query_string += conversation_query_string(current_filter, query_hash.with_indifferent_access, current_index)
+    filter_operator_value = filter_operation(query_hash, current_index)
+
+    case current_filter['attribute_type']
+    when 'additional_attributes'
+      " contacts.additional_attributes ->> '#{attribute_key}' #{filter_operator_value} #{query_operator} "
+    when 'standard'
+      " contacts.#{attribute_key} #{filter_operator_value} #{query_operator} "
     end
-
-    records = base_relation.where(@query_string, @filter_values.with_indifferent_access)
-    records.any?
   end
 
   def conversation_query_string(table_name, current_filter, query_hash, current_index)
@@ -91,6 +90,12 @@ class AutomationRules::ConditionsFilterService < FilterService
   private
 
   def base_relation
-    Conversation.where(id: @conversation.id).joins('LEFT OUTER JOIN contacts on conversations.contact_id = contacts.id')
+    records = Conversation.where(id: @conversation.id).joins(
+      'LEFT OUTER JOIN contacts on conversations.contact_id = contacts.id'
+    ).joins(
+      'LEFT OUTER JOIN messages on messages.conversation_id = conversations.id'
+    )
+    records = records.where(messages: { id: @options[:message].id }) if @options[:message].present?
+    records
   end
 end
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 6bbffe077..079b9bbd5 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -10,9 +10,6 @@ describe AutomationRuleListener do
   let(:team) { create(:team, account: account) }
   let(:user_1) { create(:user, role: 0) }
   let(:user_2) { create(:user, role: 0) }
-  let!(:event) do
-    Events::Base.new('conversation_status_changed', Time.zone.now, { conversation: conversation })
-  end
 
   before do
     create(:custom_attribute_definition,
@@ -39,7 +36,7 @@ describe AutomationRuleListener do
                                         { 'action_name' => 'add_label', 'action_params' => %w[support priority_customer] },
                                         { 'action_name' => 'send_webhook_event', 'action_params' => ['https://www.example.com'] },
                                         { 'action_name' => 'assign_best_agent', 'action_params' => [user_1.id] },
-                                        { 'action_name' => 'send_email_transcript', 'action_params' => 'new_agent@example.com' },
+                                        { 'action_name' => 'send_email_transcript', 'action_params' => ['new_agent@example.com'] },
                                         { 'action_name' => 'mute_conversation', 'action_params' => nil },
                                         { 'action_name' => 'change_status', 'action_params' => ['snoozed'] },
                                         { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
@@ -70,6 +67,12 @@ describe AutomationRuleListener do
             attribute_key: 'customer_type',
             filter_operator: 'equal_to',
             values: ['platinum'],
+            query_operator: 'AND'
+          }.with_indifferent_access,
+          {
+            attribute_key: 'inbox_id',
+            filter_operator: 'equal_to',
+            values: [inbox.id],
             query_operator: nil
           }.with_indifferent_access
         ]
@@ -150,6 +153,40 @@ describe AutomationRuleListener do
         expect(conversation.team_id).to eq(team.id)
       end
     end
+
+    context 'when inbox condition does not match' do
+      let!(:inbox_1) { create(:inbox, account: account) }
+      let!(:event) do
+        Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation })
+      end
+
+      before do
+        automation_rule.update!(
+          event_name: 'conversation_updated',
+          name: 'Call actions conversation updated',
+          description: 'Add labels, assign team after conversation updated',
+          conditions: [
+            {
+              attribute_key: 'inbox_id',
+              filter_operator: 'equal_to',
+              values: [inbox_1.id],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+        )
+      end
+
+      it 'triggers automation rule would not send message to the contacts' do
+        expect(conversation.messages.count).to eq(0)
+        expect(conversation.messages).to be_empty
+
+        listener.conversation_updated(event)
+
+        conversation.reload
+
+        expect(conversation.messages.count).to eq(0)
+      end
+    end
   end
 
   describe '#conversation_updated' do
@@ -305,4 +342,154 @@ describe AutomationRuleListener do
       end
     end
   end
+
+  describe '#message_created with conversation and contacts based conditions' do
+    before do
+      automation_rule.update!(
+        event_name: 'message_created',
+        name: 'Call actions message created',
+        description: 'Send Message in the conversation',
+        conditions: [
+          { attribute_key: 'team_id', filter_operator: 'equal_to', values: [team.id], query_operator: 'AND' }.with_indifferent_access,
+          { attribute_key: 'message_type', filter_operator: 'equal_to', values: ['incoming'], query_operator: 'AND' }.with_indifferent_access,
+          { attribute_key: 'email', filter_operator: 'contains', values: ['example.com'], query_operator: 'AND' }.with_indifferent_access,
+          { attribute_key: 'company', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
+        ],
+        actions: [
+          { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
+          { 'action_name' => 'send_email_transcript', 'action_params' => ['new_agent@example.com'] }
+        ]
+      )
+      conversation.update!(team_id: team.id)
+      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company': 'Marvel' })
+    end
+
+    let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
+    let!(:event) do
+      Events::Base.new('message_created', Time.zone.now, { conversation: conversation, message: message })
+    end
+
+    context 'when rule matches' do
+      it 'triggers automation rule send email transcript to the mentioned email' do
+        mailer = double
+
+        automation_rule
+
+        listener.message_created(event)
+
+        conversation.reload
+
+        allow(mailer).to receive(:conversation_transcript)
+      end
+
+      it 'triggers automation rule send message to the contacts' do
+        expect(conversation.messages.count).to eq(1)
+
+        listener.message_created(event)
+
+        conversation.reload
+
+        expect(conversation.messages.count).to eq(2)
+        expect(conversation.messages.last.content).to eq('Send this message.')
+      end
+    end
+
+    context 'when rule does not match' do
+      before do
+        conversation.update!(team_id: team.id)
+        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company': 'DC' })
+      end
+
+      let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'outgoing') }
+      let!(:event) do
+        Events::Base.new('message_created', Time.zone.now, { conversation: conversation, message: message })
+      end
+
+      it 'triggers automation rule but wont send message' do
+        expect(conversation.messages.count).to eq(1)
+
+        listener.message_created(event)
+
+        conversation.reload
+
+        expect(conversation.messages.count).to eq(1)
+        expect(conversation.messages.last.content).to eq('Incoming Message')
+      end
+    end
+  end
+
+  describe '#conversation_created with contacts based conditions' do
+    before do
+      automation_rule.update!(
+        event_name: 'conversation_created',
+        name: 'Call actions message created',
+        description: 'Send Message in the conversation',
+        conditions: [
+          { attribute_key: 'team_id', filter_operator: 'equal_to', values: [team.id], query_operator: 'AND' }.with_indifferent_access,
+          { attribute_key: 'email', filter_operator: 'contains', values: ['example.com'], query_operator: 'AND' }.with_indifferent_access,
+          { attribute_key: 'company', filter_operator: 'equal_to', values: ['Marvel'], query_operator: nil }.with_indifferent_access
+        ],
+        actions: [
+          { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
+          { 'action_name' => 'send_email_transcript', 'action_params' => ['new_agent@example.com'] }
+        ]
+      )
+      conversation.update!(team_id: team.id)
+      conversation.contact.update!(email: 'tj@example.com', additional_attributes: { 'company': 'Marvel' })
+    end
+
+    let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming') }
+    let!(:event) do
+      Events::Base.new('conversation_created', Time.zone.now, { conversation: conversation, message: message })
+    end
+
+    context 'when rule matches' do
+      it 'triggers automation rule send email transcript to the mentioned email' do
+        mailer = double
+
+        automation_rule
+
+        listener.conversation_created(event)
+
+        conversation.reload
+
+        allow(mailer).to receive(:conversation_transcript)
+      end
+
+      it 'triggers automation rule send message to the contacts' do
+        expect(conversation.messages.count).to eq(1)
+
+        listener.conversation_created(event)
+
+        conversation.reload
+
+        expect(conversation.messages.count).to eq(2)
+        expect(conversation.messages.last.content).to eq('Send this message.')
+        expect(conversation.messages.last.content_attributes[:automation_rule_id]).to eq(automation_rule.id)
+      end
+    end
+
+    context 'when rule does not match' do
+      before do
+        conversation.update!(team_id: team.id)
+        conversation.contact.update!(email: 'tj@ex.com', additional_attributes: { 'company': 'DC' })
+      end
+
+      let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'outgoing') }
+      let!(:event) do
+        Events::Base.new('conversation_created', Time.zone.now, { conversation: conversation, message: message })
+      end
+
+      it 'triggers automation rule but wont send message' do
+        expect(conversation.messages.count).to eq(1)
+
+        listener.conversation_created(event)
+
+        conversation.reload
+
+        expect(conversation.messages.count).to eq(1)
+        expect(conversation.messages.last.content).to eq('Incoming Message')
+      end
+    end
+  end
 end

From 1b3011b27beecb7f4098f4e1387e5824c3c39829 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Sun, 24 Apr 2022 12:02:40 +0530
Subject: [PATCH 069/177] fix: Add Attachment endpoint to save file against
 automation rule (#4480)

Co-authored-by: fayazara <fayazara@gmail.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../accounts/automation_rules_controller.rb   |  25 +++-
 app/javascript/dashboard/api/automation.js    |   8 ++
 .../widgets/AutomationActionInput.vue         |  12 ++
 .../widgets/AutomationFileInput.vue           | 117 ++++++++++++++++++
 .../dashboard/helper/actionQueryGenerator.js  |  10 +-
 .../dashboard/i18n/locale/en/automation.json  |   7 ++
 .../automation/EditAutomationRule.vue         |  15 +++
 .../settings/automation/constants.js          |  40 +++---
 .../dashboard/store/modules/automations.js    |   8 ++
 .../FluentIcon/dashboard-icons.json           |   1 +
 app/models/attachment.rb                      |   1 -
 app/models/automation_rule.rb                 |  18 ++-
 app/policies/automation_rule_policy.rb        |   4 +
 .../automation_rules/action_service.rb        |  13 +-
 .../partials/_automation_rule.json.jbuilder   |   1 +
 config/routes.rb                              |   1 +
 .../automation_rules_controller_spec.rb       |  58 +++++----
 .../automation_rule_listener_spec.rb          |   9 ++
 18 files changed, 291 insertions(+), 57 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/AutomationFileInput.vue

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 41296db62..5e649b6e0 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -17,6 +17,16 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     @automation_rule
   end
 
+  def attach_file
+    file_blob = ActiveStorage::Blob.create_and_upload!(
+      key: nil,
+      io: params[:attachment].tempfile,
+      filename: params[:attachment].original_filename,
+      content_type: params[:attachment].content_type
+    )
+    render json: { blob_key: file_blob.key, blob_id: file_blob.id }
+  end
+
   def show; end
 
   def update
@@ -25,6 +35,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
       @automation_rule.actions = params[:actions] if params[:actions]
       @automation_rule.save!
       process_attachments
+
     rescue StandardError => e
       Rails.logger.error e
       render json: { error: @automation_rule.errors.messages }.to_json, status: :unprocessable_entity
@@ -43,17 +54,19 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
     @automation_rule = new_rule
   end
 
-  private
-
   def process_attachments
-    return if params[:attachments].blank?
+    actions = @automation_rule.actions.filter_map { |k, _v| k if k['action_name'] == 'send_attachment' }
+    return if actions.blank?
 
-    params[:attachments].each do |uploaded_attachment|
-      @automation_rule.files.attach(uploaded_attachment)
+    actions.each do |action|
+      blob_id = action['action_params']
+      blob = ActiveStorage::Blob.find_by(id: blob_id)
+      @automation_rule.files.attach(blob)
     end
-    @automation_rule
   end
 
+  private
+
   def automation_rules_permit
     params.permit(
       :name, :description, :event_name, :account_id, :active,
diff --git a/app/javascript/dashboard/api/automation.js b/app/javascript/dashboard/api/automation.js
index e83ece3d1..eef39d12c 100644
--- a/app/javascript/dashboard/api/automation.js
+++ b/app/javascript/dashboard/api/automation.js
@@ -9,6 +9,14 @@ class AutomationsAPI extends ApiClient {
   clone(automationId) {
     return axios.post(`${this.url}/${automationId}/clone`);
   }
+
+  attachment(file) {
+    return axios.post(`${this.url}/attach_file`, file, {
+      headers: {
+        'Content-Type': 'multipart/form-data',
+      },
+    });
+  }
 }
 
 export default new AutomationsAPI();
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index baa66afb4..8230c6963 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -52,6 +52,11 @@
             class="answer--text-input"
             placeholder="Enter url"
           />
+          <automation-action-file-input
+            v-if="inputType === 'attachment'"
+            v-model="action_params"
+            :initial-file-name="initialFileName"
+          />
         </div>
       </div>
       <woot-button
@@ -84,9 +89,11 @@
 
 <script>
 import AutomationActionTeamMessageInput from './AutomationActionTeamMessageInput.vue';
+import AutomationActionFileInput from './AutomationFileInput.vue';
 export default {
   components: {
     AutomationActionTeamMessageInput,
+    AutomationActionFileInput,
   },
   props: {
     value: {
@@ -109,6 +116,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    initialFileName: {
+      type: String,
+      default: '',
+    },
   },
   computed: {
     action_name: {
@@ -187,6 +198,7 @@ export default {
 .filter__answer--wrap {
   margin-right: var(--space-smaller);
   flex-grow: 1;
+  max-width: 50%;
 
   input {
     margin-bottom: 0;
diff --git a/app/javascript/dashboard/components/widgets/AutomationFileInput.vue b/app/javascript/dashboard/components/widgets/AutomationFileInput.vue
new file mode 100644
index 000000000..595faa8fb
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/AutomationFileInput.vue
@@ -0,0 +1,117 @@
+<template>
+  <label class="input-wrapper" :class="uploadState">
+    <input
+      v-if="uploadState !== 'processing'"
+      type="file"
+      name="attachment"
+      :class="uploadState === 'processing' ? 'disabled' : ''"
+      @change="onChangeFile"
+    />
+    <spinner v-if="uploadState === 'processing'" />
+    <fluent-icon v-if="uploadState === 'idle'" icon="file-upload" />
+    <fluent-icon
+      v-if="uploadState === 'uploaded'"
+      icon="checkmark-circle"
+      type="outline"
+      class="success-icon"
+    />
+    <fluent-icon
+      v-if="uploadState === 'failed'"
+      icon="dismiss-circle"
+      type="outline"
+      class="error-icon"
+    />
+    <p class="file-button">{{ label }}</p>
+  </label>
+</template>
+
+<script>
+import Spinner from 'shared/components/Spinner';
+import alertMixin from 'shared/mixins/alertMixin';
+export default {
+  components: {
+    Spinner,
+  },
+  mixins: [alertMixin],
+  props: {
+    value: {
+      type: Array,
+      default: () => [],
+    },
+    initialFileName: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      uploadState: 'idle',
+      label: this.$t('AUTOMATION.ATTACHMENT.LABEL_IDLE'),
+    };
+  },
+  mounted() {
+    if (this.initialFileName) {
+      this.label = this.initialFileName;
+      this.uploadState = 'uploaded';
+    }
+  },
+  methods: {
+    async onChangeFile(event) {
+      this.uploadState = 'processing';
+      this.label = this.$t('AUTOMATION.ATTACHMENT.LABEL_UPLOADING');
+      try {
+        const file = event.target.files[0];
+        const formData = new FormData();
+        formData.append('attachment', file, file.name);
+        const id = await this.$store.dispatch(
+          'automations/uploadAttachment',
+          formData
+        );
+        this.$emit('input', [id]);
+        this.uploadState = 'uploaded';
+        this.label = this.$t('AUTOMATION.ATTACHMENT.LABEL_UPLOADED');
+      } catch (error) {
+        this.uploadState = 'failed';
+        this.label = this.$t('AUTOMATION.ATTACHMENT.LABEL_UPLOAD_FAILED');
+        this.showAlert(this.$t('AUTOMATION.ATTACHMENT.UPLOAD_ERROR'));
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+input[type='file'] {
+  display: none;
+}
+.input-wrapper {
+  display: flex;
+  height: 39px;
+  background-color: var(--white);
+  border-radius: var(--border-radius-small);
+  border: 1px dashed var(--w-100);
+  padding: var(--space-smaller) var(--space-small);
+  align-items: center;
+  font-size: var(--font-size-mini);
+  cursor: pointer;
+}
+.success-icon {
+  margin-right: var(--space-small);
+  color: var(--g-500);
+}
+.error-icon {
+  margin-right: var(--space-small);
+  color: var(--r-500);
+}
+
+.processing {
+  cursor: not-allowed;
+  opacity: 0.9;
+}
+.file-button {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 100%;
+}
+</style>
diff --git a/app/javascript/dashboard/helper/actionQueryGenerator.js b/app/javascript/dashboard/helper/actionQueryGenerator.js
index 7ef5fa56f..965c5b238 100644
--- a/app/javascript/dashboard/helper/actionQueryGenerator.js
+++ b/app/javascript/dashboard/helper/actionQueryGenerator.js
@@ -1,7 +1,15 @@
+const allElementsString = arr => {
+  return arr.every(elem => typeof elem === 'string');
+};
+
+const allElementsNumbers = arr => {
+  return arr.every(elem => typeof elem === 'number');
+};
+
 const formatArray = params => {
   if (params.length <= 0) {
     params = [];
-  } else if (params.every(elem => typeof elem === 'string')) {
+  } else if (allElementsString(params) || allElementsNumbers(params)) {
     params = [...params];
   } else {
     params = params.map(val => val.id);
diff --git a/app/javascript/dashboard/i18n/locale/en/automation.json b/app/javascript/dashboard/i18n/locale/en/automation.json
index 0d2076b65..5d291814e 100644
--- a/app/javascript/dashboard/i18n/locale/en/automation.json
+++ b/app/javascript/dashboard/i18n/locale/en/automation.json
@@ -104,6 +104,13 @@
       "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": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
index 6c5d03962..668b44d51 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/EditAutomationRule.vue
@@ -101,6 +101,12 @@
                 showActionInput(automation.actions[i].action_name)
               "
               :v="$v.automation.actions.$each[i]"
+              :initial-file-name="
+                getFileName(
+                  automation.actions[i].action_params[0],
+                  automation.actions[i].action_name
+                )
+              "
               @removeAction="removeAction(i)"
             />
             <div class="filter-actions">
@@ -507,6 +513,15 @@ export default {
       if (type === null) return false;
       return true;
     },
+    getFileName(id, actionType) {
+      if (!id) return '';
+      if (actionType === 'send_attachment') {
+        const file = this.automation.files.find(item => item.blob_id === id);
+        // replace `blob_id.toString()` with file name once api is fixed.
+        if (file) return file.filename.toString();
+      }
+      return '';
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
index 3d1dac355..387d0d407 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/constants.js
@@ -119,11 +119,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
-      // {
-      //   key: 'send_attachment',
-      //   name: 'Send Attachment',
-      //   attributeI18nKey: 'SEND_ATTACHMENT',
-      // },
+      {
+        key: 'send_attachment',
+        name: 'Send Attachment',
+        attributeI18nKey: 'SEND_ATTACHMENT',
+      },
     ],
   },
   conversation_created: {
@@ -210,11 +210,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
-      // {
-      //   key: 'send_attachment',
-      //   name: 'Send Attachment',
-      //   attributeI18nKey: 'SEND_ATTACHMENT',
-      // },
+      {
+        key: 'send_attachment',
+        name: 'Send Attachment',
+        attributeI18nKey: 'SEND_ATTACHMENT',
+      },
     ],
   },
   conversation_updated: {
@@ -315,11 +315,11 @@ export const AUTOMATIONS = {
         name: 'Send Webhook Event',
         attributeI18nKey: 'SEND_WEBHOOK_EVENT',
       },
-      // {
-      //   key: 'send_attachment',
-      //   name: 'Send Attachment',
-      //   attributeI18nKey: 'SEND_ATTACHMENT',
-      // },
+      {
+        key: 'send_attachment',
+        name: 'Send Attachment',
+        attributeI18nKey: 'SEND_ATTACHMENT',
+      },
     ],
   },
 };
@@ -380,11 +380,11 @@ export const AUTOMATION_ACTION_TYPES = [
     label: 'Send Webhook Event',
     inputType: 'url',
   },
-  // {
-  //   key: 'send_attachment',
-  //   label: 'Send Attachment',
-  //   inputType: 'file',
-  // },
+  {
+    key: 'send_attachment',
+    label: 'Send Attachment',
+    inputType: 'attachment',
+  },
   {
     key: 'send_message',
     label: 'Send a message',
diff --git a/app/javascript/dashboard/store/modules/automations.js b/app/javascript/dashboard/store/modules/automations.js
index a588d9ae7..7d9f4cb69 100644
--- a/app/javascript/dashboard/store/modules/automations.js
+++ b/app/javascript/dashboard/store/modules/automations.js
@@ -76,6 +76,14 @@ export const actions = {
       commit(types.SET_AUTOMATION_UI_FLAG, { isCloning: false });
     }
   },
+  uploadAttachment: async (_, file) => {
+    try {
+      const { data } = await AutomationAPI.attachment(file);
+      return data.blob_id;
+    } catch (error) {
+      throw new Error(error);
+    }
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index f145159d1..54dc0b627 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -68,6 +68,7 @@
   "emoji-outline": "M12 1.999c5.524 0 10.002 4.478 10.002 10.002 0 5.523-4.478 10.001-10.002 10.001-5.524 0-10.002-4.478-10.002-10.001C1.998 6.477 6.476 1.999 12 1.999Zm0 1.5a8.502 8.502 0 1 0 0 17.003A8.502 8.502 0 0 0 12 3.5ZM8.462 14.784A4.491 4.491 0 0 0 12 16.502a4.492 4.492 0 0 0 3.535-1.714.75.75 0 1 1 1.177.93A5.991 5.991 0 0 1 12 18.002a5.991 5.991 0 0 1-4.716-2.29.75.75 0 0 1 1.178-.928ZM9 8.75a1.25 1.25 0 1 1 0 2.499A1.25 1.25 0 0 1 9 8.75Zm6 0a1.25 1.25 0 1 1 0 2.499 1.25 1.25 0 0 1 0-2.499Z",
   "error-circle-outline": "M12 2c5.523 0 10 4.478 10 10s-4.477 10-10 10S2 17.522 2 12 6.477 2 12 2Zm0 1.667c-4.595 0-8.333 3.738-8.333 8.333 0 4.595 3.738 8.333 8.333 8.333 4.595 0 8.333-3.738 8.333-8.333 0-4.595-3.738-8.333-8.333-8.333Zm-.001 10.835a.999.999 0 1 1 0 1.998.999.999 0 0 1 0-1.998ZM11.994 7a.75.75 0 0 1 .744.648l.007.101.004 4.502a.75.75 0 0 1-1.493.103l-.007-.102-.004-4.501a.75.75 0 0 1 .75-.751Z",
   "filter-outline": "M13.5 16a.75.75 0 0 1 0 1.5h-3a.75.75 0 0 1 0-1.5h3Zm3-5a.75.75 0 0 1 0 1.5h-9a.75.75 0 0 1 0-1.5h9Zm3-5a.75.75 0 0 1 0 1.5h-15a.75.75 0 0 1 0-1.5h15Z",
+  "file-upload-outline": "M6 2a2 2 0 0 0-2 2v5.207a5.48 5.48 0 0 1 1-.185V4a1 1 0 0 1 1-1h4v3.5A1.5 1.5 0 0 0 11.5 8H15v8a1 1 0 0 1-1 1h-3.6a5.507 5.507 0 0 1-.657 1H14a2 2 0 0 0 2-2V7.414a1.5 1.5 0 0 0-.44-1.06l-3.914-3.915A1.5 1.5 0 0 0 10.586 2H6Zm8.793 5H11.5a.5.5 0 0 1-.5-.5V3.207L14.793 7ZM5.5 19a4.5 4.5 0 1 0 0-9a4.5 4.5 0 0 0 0 9Zm2.354-4.854a.5.5 0 1 1-.708.708L6 13.707V16.5a.5.5 0 0 1-1 0v-2.793l-1.146 1.147a.5.5 0 1 1-.708-.707l2-2A.5.5 0 0 1 5.497 12h.006a.498.498 0 0 1 .348.144l.003.003l2 2Z",
   "flash-on-outline": "m8.294 14-1.767 7.068c-.187.746.736 1.256 1.269.701L19.79 9.27A.75.75 0 0 0 19.25 8h-4.46l1.672-5.013A.75.75 0 0 0 15.75 2h-7a.75.75 0 0 0-.721.544l-3 10.5A.75.75 0 0 0 5.75 14h2.544Zm4.745-5.487a.75.75 0 0 0 .711.987h3.74l-8.824 9.196 1.316-5.264a.75.75 0 0 0-.727-.932h-2.51l2.57-9h5.394l-1.67 5.013Z",
   "folder-outline": "M8.207 4c.46 0 .908.141 1.284.402l.156.12L12.022 6.5h7.728a2.25 2.25 0 0 1 2.229 1.938l.016.158.005.154v9a2.25 2.25 0 0 1-2.096 2.245L19.75 20H4.25a2.25 2.25 0 0 1-2.245-2.096L2 17.75V6.25a2.25 2.25 0 0 1 2.096-2.245L4.25 4h3.957Zm1.44 5.979a2.25 2.25 0 0 1-1.244.512l-.196.009-4.707-.001v7.251c0 .38.282.694.648.743l.102.007h15.5a.75.75 0 0 0 .743-.648l.007-.102v-9a.75.75 0 0 0-.648-.743L19.75 8h-7.729L9.647 9.979ZM8.207 5.5H4.25a.75.75 0 0 0-.743.648L3.5 6.25v2.749L8.207 9a.75.75 0 0 0 .395-.113l.085-.06 1.891-1.578-1.89-1.575a.75.75 0 0 0-.377-.167L8.207 5.5Z",
   "globe-desktop-outline": "M22.002 12C22.002 6.477 17.524 2 12 2 6.476 1.999 2 6.477 2 12.001c0 5.186 3.947 9.45 9.001 9.952V20.11c-.778-.612-1.478-1.905-1.939-3.61h1.94V15H8.737a18.969 18.969 0 0 1-.135-5h6.794c.068.64.105 1.31.105 2h1.5c0-.684-.033-1.353-.095-2h3.358c.154.64.237 1.31.237 2h1.5ZM4.786 16.5h2.722l.102.396c.317 1.17.748 2.195 1.27 3.015a8.532 8.532 0 0 1-4.094-3.41ZM3.736 10h3.358a20.847 20.847 0 0 0-.095 2c0 1.043.075 2.051.217 3H4.043a8.483 8.483 0 0 1-.544-3c0-.682.08-1.347.232-1.983L3.736 10Zm5.122-5.902.023-.008C8.16 5.222 7.611 6.748 7.298 8.5H4.25c.905-2 2.56-3.587 4.608-4.402Zm3.026-.594L12 3.5l.126.006c1.262.126 2.48 2.125 3.045 4.995H8.83c.568-2.878 1.79-4.88 3.055-4.996Zm3.343.76-.107-.174.291.121a8.533 8.533 0 0 1 4.339 4.29h-3.048c-.298-1.665-.806-3.125-1.475-4.237Z M12 19a1 1 0 0 0 1 1h3v2h-.5a.5.5 0 1 0 0 1h4a.5.5 0 0 0 0-1H19v-2h3a1 1 0 0 0 1-1v-5a1 1 0 0 0-1-1h-9a1 1 0 0 0-1 1v5Z",
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 43ae583ea..2a8e575f3 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -28,7 +28,6 @@ class Attachment < ApplicationRecord
     application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
     application/vnd.openxmlformats-officedocument.wordprocessingml.document
   ].freeze
-
   belongs_to :account
   belongs_to :message
   has_one_attached :file
diff --git a/app/models/automation_rule.rb b/app/models/automation_rule.rb
index 8211de98b..d76f2058e 100644
--- a/app/models/automation_rule.rb
+++ b/app/models/automation_rule.rb
@@ -18,6 +18,8 @@
 #  index_automation_rules_on_account_id  (account_id)
 #
 class AutomationRule < ApplicationRecord
+  include Rails.application.routes.url_helpers
+
   belongs_to :account
   has_many_attached :files
 
@@ -28,7 +30,21 @@ class AutomationRule < ApplicationRecord
   scope :active, -> { where(active: true) }
 
   CONDITIONS_ATTRS = %w[content email country_code status message_type browser_language assignee_id team_id referer city company inbox_id].freeze
-  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachments].freeze
+  ACTIONS_ATTRS = %w[send_message add_label send_email_to_team assign_team assign_best_agents send_attachment].freeze
+
+  def file_base_data
+    files.map do |file|
+      {
+        id: file.id,
+        automation_rule_id: id,
+        file_type: file.content_type,
+        account_id: account_id,
+        file_url: url_for(file),
+        blob_id: file.blob_id,
+        filename: file.filename.to_s
+      }
+    end
+  end
 
   private
 
diff --git a/app/policies/automation_rule_policy.rb b/app/policies/automation_rule_policy.rb
index 431b32964..b0e33437d 100644
--- a/app/policies/automation_rule_policy.rb
+++ b/app/policies/automation_rule_policy.rb
@@ -7,6 +7,10 @@ class AutomationRulePolicy < ApplicationPolicy
     @account_user.administrator?
   end
 
+  def attach_file?
+    @account_user.administrator?
+  end
+
   def show?
     @account_user.administrator?
   end
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 887e82b38..e88ca06dd 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -21,9 +21,14 @@ class AutomationRules::ActionService
 
   private
 
-  def send_attachments(_file_params)
-    blobs = @rule.files.map { |file, _| file.blob }
-    params = { content: nil, private: false, attachments: blobs }
+  def send_attachment(blob_ids)
+    return unless @rule.files.attached?
+
+    blob = ActiveStorage::Blob.find(blob_ids)
+
+    return if blob.blank?
+
+    params = { content: nil, private: false, attachments: blob }
     mb = Messages::MessageBuilder.new(nil, @conversation, params)
     mb.perform
   end
@@ -51,7 +56,7 @@ class AutomationRules::ActionService
   end
 
   def send_webhook_event(webhook_url)
-    payload = @conversation.webhook_data.merge(event: "automation_event: #{@rule.event_name}")
+    payload = @conversation.webhook_data.merge(event: "automation_event.#{@rule.event_name}")
     WebhookJob.perform_later(webhook_url[0], payload)
   end
 
diff --git a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
index b0e01c824..a1047c82f 100644
--- a/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
+++ b/app/views/api/v1/accounts/automation_rules/partials/_automation_rule.json.jbuilder
@@ -7,3 +7,4 @@ json.conditions automation_rule.conditions
 json.actions automation_rule.actions
 json.created_on automation_rule.created_at.to_i
 json.active automation_rule.active?
+json.files automation_rule.file_base_data if automation_rule.files.any?
diff --git a/config/routes.rb b/config/routes.rb
index a2afa4f09..7ed667160 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +55,7 @@ Rails.application.routes.draw do
           resources :canned_responses, only: [:index, :create, :update, :destroy]
           resources :automation_rules, only: [:index, :create, :show, :update, :destroy] do
             post :clone
+            post :attach_file, on: :collection
           end
           resources :campaigns, only: [:index, :create, :show, :update, :destroy]
 
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index 2039daf15..4513773bc 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -133,29 +133,35 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
       it 'Saves file in the automation actions to send an attachments' do
         file = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
-        params[:attachments] = [file]
+
+        expect(account.automation_rules.count).to eq(0)
+
+        post "/api/v1/accounts/#{account.id}/automation_rules/attach_file",
+             headers: administrator.create_new_auth_token,
+             params: { attachment: file }
+
+        expect(response).to have_http_status(:success)
+
+        blob = JSON.parse(response.body)
+
+        expect(blob['blob_key']).to be_present
+        expect(blob['blob_id']).to be_present
+
         params[:actions] = [
           {
             action_name: :send_message,
             action_params: ['Welcome to the chatwoot platform.']
           },
           {
-            action_name: :update_additional_attributes,
-            action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
-          },
-          {
-            action_name: :send_attachments
+            action_name: :send_attachment,
+            action_params: [blob['blob_id']]
           }
         ]
 
-        expect(account.automation_rules.count).to eq(0)
-
         post "/api/v1/accounts/#{account.id}/automation_rules",
              headers: administrator.create_new_auth_token,
              params: params
 
-        expect(response).to have_http_status(:success)
-        expect(account.automation_rules.count).to eq(1)
         automation_rule = account.automation_rules.first
         expect(automation_rule.files.presence).to be_truthy
         expect(automation_rule.files.count).to eq(1)
@@ -163,32 +169,36 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
       it 'Saves files in the automation actions to send multiple attachments' do
         file_1 = fixture_file_upload(Rails.root.join('spec/assets/avatar.png'), 'image/png')
-        file_2 = fixture_file_upload(Rails.root.join('spec/assets/sample.pdf'), 'image/png')
-        params[:attachments] = [file_1, file_2]
+        file_2 = fixture_file_upload(Rails.root.join('spec/assets/sample.png'), 'image/png')
+
+        post "/api/v1/accounts/#{account.id}/automation_rules/attach_file",
+             headers: administrator.create_new_auth_token,
+             params: { attachment: file_1 }
+
+        blob_1 = JSON.parse(response.body)
+
+        post "/api/v1/accounts/#{account.id}/automation_rules/attach_file",
+             headers: administrator.create_new_auth_token,
+             params: { attachment: file_2 }
+
+        blob_2 = JSON.parse(response.body)
+
         params[:actions] = [
           {
-            action_name: :send_message,
-            action_params: ['Welcome to the chatwoot platform.']
+            action_name: :send_attachment,
+            action_params: [blob_1['blob_id']]
           },
           {
-            action_name: :update_additional_attributes,
-            action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
-          },
-          {
-            action_name: :send_attachments
+            action_name: :send_attachment,
+            action_params: [blob_2['blob_id']]
           }
         ]
 
-        expect(account.automation_rules.count).to eq(0)
-
         post "/api/v1/accounts/#{account.id}/automation_rules",
              headers: administrator.create_new_auth_token,
              params: params
 
-        expect(response).to have_http_status(:success)
-        expect(account.automation_rules.count).to eq(1)
         automation_rule = account.automation_rules.first
-        expect(automation_rule.files.presence).to be_truthy
         expect(automation_rule.files.count).to eq(2)
       end
     end
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 079b9bbd5..6213e4450 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -128,6 +128,15 @@ describe AutomationRuleListener do
         expect(conversation.messages.first.content).to eq('Send this message.')
       end
 
+      it 'triggers automation rule to mute conversation' do
+        expect(conversation).not_to be_muted
+
+        listener.conversation_updated(event)
+
+        conversation.reload
+        expect(conversation).to be_muted
+      end
+
       it 'triggers automation_rule with contact standard attributes' do
         automation_rule.update!(
           conditions: [

From fa51fd1d736bb1a398eeedb792839652720dd589 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 25 Apr 2022 12:25:38 +0530
Subject: [PATCH 070/177] fix: Bypass invalid values in contact patch end point
 (#4519)

---
 app/models/contact.rb                         | 17 +++++--
 .../api/v1/widget/contacts_controller_spec.rb | 46 ++++++++++++++++++-
 2 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 2261d4230..304edf681 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -31,8 +31,7 @@ class Contact < ApplicationRecord
   validates :email, allow_blank: true, uniqueness: { scope: [:account_id], case_sensitive: false }
   validates :identifier, allow_blank: true, uniqueness: { scope: [:account_id] }
   validates :phone_number,
-            allow_blank: true, uniqueness: { scope: [:account_id] },
-            format: { with: /\+[1-9]\d{1,14}\z/, message: 'should be in e164 format' }
+            allow_blank: true, uniqueness: { scope: [:account_id] }
   validates :name, length: { maximum: 255 }
 
   belongs_to :account
@@ -42,8 +41,8 @@ class Contact < ApplicationRecord
   has_many :inboxes, through: :contact_inboxes
   has_many :messages, as: :sender, dependent: :destroy_async
   has_many :notes, dependent: :destroy_async
-
   before_validation :prepare_contact_attributes
+  before_save :phone_number_format, :email_format
   after_create_commit :dispatch_create_event, :ip_lookup
   after_update_commit :dispatch_update_event
   after_destroy_commit :dispatch_destroy_event
@@ -143,6 +142,18 @@ class Contact < ApplicationRecord
     ContactIpLookupJob.perform_later(self)
   end
 
+  def phone_number_format
+    return if phone_number.blank?
+
+    self.phone_number = changes['phone_number'].first unless phone_number.match?(/\+[1-9]\d{1,14}\z/)
+  end
+
+  def email_format
+    return if email.blank?
+
+    self.email = changes['email'].first unless email.match(Devise.email_regexp)
+  end
+
   def prepare_contact_attributes
     prepare_email_attribute
     prepare_jsonb_attributes
diff --git a/spec/controllers/api/v1/widget/contacts_controller_spec.rb b/spec/controllers/api/v1/widget/contacts_controller_spec.rb
index 9364dbb3a..02adcd0f0 100644
--- a/spec/controllers/api/v1/widget/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/contacts_controller_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe '/api/v1/widget/contacts', type: :request do
   let(:account) { create(:account) }
   let(:web_widget) { create(:channel_widget, account: account) }
-  let(:contact) { create(:contact, account: account) }
+  let(:contact) { create(:contact, account: account, email: 'test@test.com', phone_number: '+745623239') }
   let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: web_widget.inbox) }
   let(:payload) { { source_id: contact_inbox.source_id, inbox_id: web_widget.inbox.id } }
   let(:token) { ::Widget::TokenService.new(payload: payload).generate_token }
@@ -39,6 +39,50 @@ RSpec.describe '/api/v1/widget/contacts', type: :request do
       end
     end
 
+    context 'with update contact' do
+      let(:params) { { website_token: web_widget.website_token } }
+
+      it 'dont update phone number if invalid phone number passed' do
+        patch '/api/v1/widget/contact',
+              params: params.merge({ phone_number: '45623239' }),
+              headers: { 'X-Auth-Token' => token },
+              as: :json
+        body = JSON.parse(response.body)
+        expect(body['phone_number']).to eq('+745623239')
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'update phone number if valid phone number passed' do
+        patch '/api/v1/widget/contact',
+              params: params.merge({ phone_number: '+245623239' }),
+              headers: { 'X-Auth-Token' => token },
+              as: :json
+        body = JSON.parse(response.body)
+        expect(body['phone_number']).to eq('+245623239')
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'dont update email if invalid email passed' do
+        patch '/api/v1/widget/contact',
+              params: params.merge({ email: 'test@' }),
+              headers: { 'X-Auth-Token' => token },
+              as: :json
+        body = JSON.parse(response.body)
+        expect(body['email']).to eq('test@test.com')
+        expect(response).to have_http_status(:success)
+      end
+
+      it 'update email if valid email passed' do
+        patch '/api/v1/widget/contact',
+              params: params.merge({ email: 'test-1@test.com' }),
+              headers: { 'X-Auth-Token' => token },
+              as: :json
+        body = JSON.parse(response.body)
+        expect(body['email']).to eq('test-1@test.com')
+        expect(response).to have_http_status(:success)
+      end
+    end
+
     context 'with mandatory hmac' do
       let(:identify_action) { double }
       let(:web_widget) { create(:channel_widget, account: account, hmac_mandatory: true) }

From 899176a793c43572fd7fda9c52a99af78baa10bc Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 25 Apr 2022 17:44:42 +0530
Subject: [PATCH 071/177] feat: Add event subscription option to webhooks
 (#4540)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../api/v1/accounts/webhooks_controller.rb    |   2 +-
 .../assets/scss/_utility-helpers.scss         |   4 +
 .../dashboard/components/widgets/ShowMore.vue |  50 ++++++++
 .../i18n/locale/en/integrations.json          |  52 ++++----
 .../dashboard/i18n/locale/en/settings.json    |   4 +
 .../settings/integrations/EditWebHook.vue     | 108 ----------------
 .../settings/integrations/NewWebHook.vue      | 121 ------------------
 .../integrations/Webhooks/EditWebHook.vue     |  61 +++++++++
 .../{Webhook.vue => Webhooks/Index.vue}       |  60 +++------
 .../integrations/Webhooks/NewWebHook.vue      |  59 +++++++++
 .../integrations/Webhooks/WebhookForm.vue     | 108 ++++++++++++++++
 .../integrations/Webhooks/WebhookRow.vue      |  83 ++++++++++++
 .../Webhooks/specs/webhookMixin.spec.js       |  26 ++++
 .../integrations/Webhooks/webhookMixin.js     |  10 ++
 .../integrations/integrations.routes.js       |   2 +-
 .../dashboard/store/modules/webhooks.js       |   2 +-
 app/listeners/webhook_listener.rb             |  30 ++---
 app/models/webhook.rb                         |  29 +++--
 .../accounts/webhooks/_webhook.json.jbuilder  |   1 +
 config/locales/en.yml                         |   2 +
 ...424081117_add_subscriptions_to_webhooks.rb |  12 ++
 db/schema.rb                                  |   3 +-
 .../v1/accounts/webhook_controller_spec.rb    |  30 +++++
 spec/factories/webhooks.rb                    |  10 ++
 spec/listeners/webhook_listener_spec.rb       |  42 ++----
 25 files changed, 552 insertions(+), 359 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/ShowMore.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
 rename app/javascript/dashboard/routes/dashboard/settings/integrations/{Webhook.vue => Webhooks/Index.vue} (73%)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/NewWebHook.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/specs/webhookMixin.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/webhookMixin.js
 create mode 100644 db/migrate/20220424081117_add_subscriptions_to_webhooks.rb

diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index 0add18047..7ea257ed2 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -23,7 +23,7 @@ class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   private
 
   def webhook_params
-    params.require(:webhook).permit(:inbox_id, :url)
+    params.require(:webhook).permit(:inbox_id, :url, subscriptions: [])
   end
 
   def fetch_webhook
diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
index abea0e28c..71977cf2b 100644
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -2,6 +2,10 @@
   margin-right: var(--space-small);
 }
 
+.margin-bottom-small {
+  margin-bottom: var(--space-small);
+}
+
 .margin-right-smaller {
   margin-right: var(--space-smaller);
 }
diff --git a/app/javascript/dashboard/components/widgets/ShowMore.vue b/app/javascript/dashboard/components/widgets/ShowMore.vue
new file mode 100644
index 000000000..c4755aed9
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/ShowMore.vue
@@ -0,0 +1,50 @@
+<template>
+  <span>
+    {{ textToBeDisplayed }}
+    <button class="show-more--button" @click="toggleShowMore">
+      {{ buttonLabel }}
+    </button>
+  </span>
+</template>
+<script>
+export default {
+  props: {
+    text: {
+      type: String,
+      default: '',
+    },
+    limit: {
+      type: Number,
+      default: 120,
+    },
+  },
+  data() {
+    return {
+      showMore: false,
+    };
+  },
+  computed: {
+    textToBeDisplayed() {
+      if (this.showMore) {
+        return this.text;
+      }
+
+      return this.text.slice(0, this.limit) + '...';
+    },
+    buttonLabel() {
+      const i18nKey = !this.showMore ? 'SHOW_MORE' : 'SHOW_LESS';
+      return this.$t(`COMPONENTS.SHOW_MORE_BLOCK.${i18nKey}`);
+    },
+  },
+  methods: {
+    toggleShowMore() {
+      this.showMore = !this.showMore;
+    },
+  },
+};
+</script>
+<style scoped>
+.show-more--button {
+  color: var(--w-500);
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 4562183c7..2094f269b 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -2,6 +2,29 @@
   "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"
+          }
+        },
+        "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",
@@ -17,35 +40,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Cancel",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "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",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
         }
       },
@@ -57,16 +61,16 @@
         },
         "CONFIRM": {
           "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Yes, Delete ",
           "NO": "No, Keep it"
         }
       }
     },
     "SLACK": {
-      "HELP_TEXT" : { 
+      "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>" 
+        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 5727e09d0..63b070b0e 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -127,6 +127,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Uploading..."
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
deleted file mode 100644
index cdfa2998a..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/EditWebHook.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <div class="column content-box">
-    <woot-modal-header
-      :header-title="$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.TITLE')"
-    />
-    <form class="row" @submit.prevent="editWebhook">
-      <div class="medium-12 columns">
-        <label :class="{ error: $v.endPoint.$error }">
-          {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.LABEL') }}
-          <input
-            v-model.trim="endPoint"
-            type="text"
-            name="endPoint"
-            :placeholder="
-              $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.PLACEHOLDER')
-            "
-            @input="$v.endPoint.$touch"
-          />
-          <span v-if="$v.endPoint.$error" class="message">
-            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.END_POINT.ERROR') }}
-          </span>
-        </label>
-      </div>
-
-      <div class="modal-footer">
-        <div class="medium-12 columns">
-          <woot-button
-            :is-disabled="
-              $v.endPoint.$invalid || uiFlags.updatingItem || endPoint === url
-            "
-            :is-loading="uiFlags.updatingItem"
-          >
-            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.FORM.SUBMIT') }}
-          </woot-button>
-          <woot-button class="button clear" @click.prevent="onClose">
-            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.CANCEL') }}
-          </woot-button>
-        </div>
-      </div>
-    </form>
-  </div>
-</template>
-
-<script>
-import { required, url, minLength } from 'vuelidate/lib/validators';
-import alertMixin from 'shared/mixins/alertMixin';
-import { mapGetters } from 'vuex';
-
-export default {
-  mixins: [alertMixin],
-  props: {
-    id: {
-      type: Number,
-      required: true,
-    },
-    url: {
-      type: String,
-      required: true,
-    },
-    onClose: {
-      type: Function,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      alertMessage: '',
-      endPoint: this.url,
-      webhookId: this.id,
-    };
-  },
-  validations: {
-    endPoint: {
-      required,
-      minLength: minLength(7),
-      url,
-    },
-  },
-  computed: {
-    ...mapGetters({ uiFlags: 'webhooks/getUIFlags' }),
-  },
-  methods: {
-    resetForm() {
-      this.endPoint = '';
-      this.$v.endPoint.$reset();
-    },
-    async editWebhook() {
-      try {
-        await this.$store.dispatch('webhooks/update', {
-          webhook: { url: this.endPoint },
-          id: this.webhookId,
-        });
-        this.alertMessage = this.$t(
-          'INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.SUCCESS_MESSAGE'
-        );
-        this.resetForm();
-        this.onClose();
-      } catch (error) {
-        this.alertMessage =
-          error.response.data.message ||
-          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
-      } finally {
-        this.showAlert(this.alertMessage);
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
deleted file mode 100644
index 35e3df04d..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/NewWebHook.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<template>
-  <modal :show.sync="show" :on-close="onClose" :close-on-backdrop-click="false">
-    <div class="column content-box">
-      <woot-modal-header
-        :header-title="$t('INTEGRATION_SETTINGS.WEBHOOK.ADD.TITLE')"
-        :header-content="
-          useInstallationName(
-            $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.DESC'),
-            globalConfig.installationName
-          )
-        "
-      />
-      <form class="row" @submit.prevent="addWebhook">
-        <div class="medium-12 columns">
-          <label :class="{ error: $v.endPoint.$error }">
-            {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.END_POINT.LABEL') }}
-            <input
-              v-model.trim="endPoint"
-              type="text"
-              name="endPoint"
-              :placeholder="
-                $t(
-                  'INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.END_POINT.PLACEHOLDER'
-                )
-              "
-              @input="$v.endPoint.$touch"
-            />
-            <span v-if="$v.endPoint.$error" class="message">
-              {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.END_POINT.ERROR') }}
-            </span>
-          </label>
-        </div>
-
-        <div class="modal-footer">
-          <div class="medium-12 columns">
-            <woot-button
-              :disabled="$v.endPoint.$invalid || addWebHook.showLoading"
-              :is-loading="addWebHook.showLoading"
-            >
-              {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.FORM.SUBMIT') }}
-            </woot-button>
-            <woot-button class="button clear" @click.prevent="onClose">
-              {{ $t('INTEGRATION_SETTINGS.WEBHOOK.ADD.CANCEL') }}
-            </woot-button>
-          </div>
-        </div>
-      </form>
-    </div>
-  </modal>
-</template>
-
-<script>
-import { required, url, minLength } from 'vuelidate/lib/validators';
-import alertMixin from 'shared/mixins/alertMixin';
-import Modal from '../../../../components/Modal';
-import globalConfigMixin from 'shared/mixins/globalConfigMixin';
-import { mapGetters } from 'vuex';
-
-export default {
-  components: {
-    Modal,
-  },
-  mixins: [alertMixin, globalConfigMixin],
-  props: {
-    onClose: {
-      type: Function,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      endPoint: '',
-      addWebHook: {
-        showAlert: false,
-        showLoading: false,
-      },
-      show: true,
-    };
-  },
-  computed: {
-    ...mapGetters({ globalConfig: 'globalConfig/get' }),
-  },
-  validations: {
-    endPoint: {
-      required,
-      minLength: minLength(7),
-      url,
-    },
-  },
-  methods: {
-    resetForm() {
-      this.endPoint = '';
-      this.$v.endPoint.$reset();
-    },
-    async addWebhook() {
-      this.addWebHook.showLoading = true;
-
-      try {
-        await this.$store.dispatch('webhooks/create', {
-          webhook: { url: this.endPoint },
-        });
-        this.addWebHook.showLoading = false;
-
-        this.addWebHook.message = this.$t(
-          'INTEGRATION_SETTINGS.WEBHOOK.ADD.API.SUCCESS_MESSAGE'
-        );
-        this.resetForm();
-        this.onClose();
-      } catch (error) {
-        this.addWebHook.showLoading = false;
-        this.addWebHook.message =
-          error.response.data.message ||
-          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
-      } finally {
-        this.addWebHook.showLoading = false;
-        this.showAlert(this.addWebHook.message);
-      }
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
new file mode 100644
index 000000000..624a41d05
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/EditWebHook.vue
@@ -0,0 +1,61 @@
+<template>
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.TITLE')"
+    />
+    <webhook-form
+      :value="value"
+      :is-submitting="uiFlags.updatingItem"
+      :submit-label="$t('INTEGRATION_SETTINGS.WEBHOOK.FORM.EDIT_SUBMIT')"
+      @submit="onSubmit"
+      @cancel="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import { mapGetters } from 'vuex';
+import WebhookForm from './WebhookForm.vue';
+
+export default {
+  components: { WebhookForm },
+  mixins: [alertMixin],
+  props: {
+    value: {
+      type: Object,
+      required: true,
+    },
+    id: {
+      type: [Number, String],
+      required: true,
+    },
+    onClose: {
+      type: Function,
+      required: true,
+    },
+  },
+  computed: {
+    ...mapGetters({ uiFlags: 'webhooks/getUIFlags' }),
+  },
+  methods: {
+    async onSubmit(webhook) {
+      try {
+        await this.$store.dispatch('webhooks/update', {
+          webhook,
+          id: this.id,
+        });
+        this.showAlert(
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.SUCCESS_MESSAGE')
+        );
+        this.onClose();
+      } catch (error) {
+        const alertMessage =
+          error.response.data.message ||
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
+        this.showAlert(alertMessage);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
similarity index 73%
rename from app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
rename to app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
index e5bb621f0..8bd36c0a8 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/Index.vue
@@ -4,7 +4,7 @@
       color-scheme="success"
       class-names="button--fixed-right-top"
       icon="add-circle"
-      @click="openAddPopup()"
+      @click="openAddPopup"
     >
       {{ $t('INTEGRATION_SETTINGS.WEBHOOK.HEADER_BTN_TXT') }}
     </woot-button>
@@ -37,35 +37,14 @@
             </th>
           </thead>
           <tbody>
-            <tr v-for="(webHookItem, index) in records" :key="webHookItem.id">
-              <td class="webhook-link">
-                {{ webHookItem.url }}
-              </td>
-              <td class="button-wrapper">
-                <woot-button
-                  v-tooltip.top="
-                    $t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.BUTTON_TEXT')
-                  "
-                  variant="smooth"
-                  size="tiny"
-                  color-scheme="secondary"
-                  icon="edit"
-                  @click="openEditPopup(webHookItem)"
-                >
-                </woot-button>
-                <woot-button
-                  v-tooltip.top="
-                    $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT')
-                  "
-                  variant="smooth"
-                  color-scheme="alert"
-                  size="tiny"
-                  icon="dismiss-circle"
-                  @click="openDeletePopup(webHookItem, index)"
-                >
-                </woot-button>
-              </td>
-            </tr>
+            <webhook-row
+              v-for="(webHookItem, index) in records"
+              :key="webHookItem.id"
+              :index="index"
+              :webhook="webHookItem"
+              @edit="openEditPopup"
+              @delete="openDeletePopup"
+            />
           </tbody>
         </table>
       </div>
@@ -83,24 +62,27 @@
     </div>
 
     <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
-      <new-webhook :on-close="hideAddPopup" />
+      <new-webhook v-if="showAddPopup" :on-close="hideAddPopup" />
     </woot-modal>
 
     <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
       <edit-webhook
         v-if="showEditPopup"
         :id="selectedWebHook.id"
-        :url="selectedWebHook.url"
+        :value="selectedWebHook"
         :on-close="hideEditPopup"
       />
     </woot-modal>
-
     <woot-delete-modal
       :show.sync="showDeleteConfirmationPopup"
       :on-close="closeDeletePopup"
       :on-confirm="confirmDeletion"
       :title="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.TITLE')"
-      :message="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.MESSAGE')"
+      :message="
+        $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.MESSAGE', {
+          webhookURL: selectedWebHook.url,
+        })
+      "
       :confirm-text="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.YES')"
       :reject-text="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.NO')"
     />
@@ -112,11 +94,13 @@ import NewWebhook from './NewWebHook';
 import EditWebhook from './EditWebHook';
 import alertMixin from 'shared/mixins/alertMixin';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import WebhookRow from './WebhookRow';
 
 export default {
   components: {
     NewWebhook,
     EditWebhook,
+    WebhookRow,
   },
   mixins: [alertMixin, globalConfigMixin],
   data() {
@@ -179,11 +163,3 @@ export default {
   },
 };
 </script>
-<style scoped lang="scss">
-.webhook-link {
-  word-break: break-word;
-}
-.button-wrapper button:nth-child(2) {
-  margin-left: var(--space-normal);
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/NewWebHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/NewWebHook.vue
new file mode 100644
index 000000000..7c90241c4
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/NewWebHook.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="column content-box">
+    <woot-modal-header
+      :header-title="$t('INTEGRATION_SETTINGS.WEBHOOK.ADD.TITLE')"
+      :header-content="
+        useInstallationName(
+          $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.DESC'),
+          globalConfig.installationName
+        )
+      "
+    />
+    <webhook-form
+      :is-submitting="uiFlags.creatingItem"
+      :submit-label="$t('INTEGRATION_SETTINGS.WEBHOOK.FORM.ADD_SUBMIT')"
+      @submit="onSubmit"
+      @cancel="onClose"
+    />
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import { mapGetters } from 'vuex';
+import WebhookForm from './WebhookForm.vue';
+
+export default {
+  components: { WebhookForm },
+  mixins: [alertMixin, globalConfigMixin],
+  props: {
+    onClose: {
+      type: Function,
+      required: true,
+    },
+  },
+  computed: {
+    ...mapGetters({
+      globalConfig: 'globalConfig/get',
+      uiFlags: 'webhooks/getUIFlags',
+    }),
+  },
+  methods: {
+    async onSubmit(webhook) {
+      try {
+        await this.$store.dispatch('webhooks/create', { webhook });
+        this.showAlert(
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.ADD.API.SUCCESS_MESSAGE')
+        );
+        this.onClose();
+      } catch (error) {
+        const message =
+          error.response.data.message ||
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.API.ERROR_MESSAGE');
+        this.showAlert(message);
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
new file mode 100644
index 000000000..3d6be7ae0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookForm.vue
@@ -0,0 +1,108 @@
+<template>
+  <form class="row" @submit.prevent="onSubmit">
+    <div class="medium-12 columns">
+      <label :class="{ error: $v.url.$error }">
+        {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.LABEL') }}
+        <input
+          v-model.trim="url"
+          type="text"
+          name="url"
+          :placeholder="
+            $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.PLACEHOLDER')
+          "
+          @input="$v.url.$touch"
+        />
+        <span v-if="$v.url.$error" class="message">
+          {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.END_POINT.ERROR') }}
+        </span>
+      </label>
+      <label :class="{ error: $v.url.$error }" class="margin-bottom-small">
+        {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.LABEL') }}
+      </label>
+      <div v-for="event in supportedWebhookEvents" :key="event">
+        <input
+          :id="event"
+          v-model="subscriptions"
+          type="checkbox"
+          :value="event"
+          name="subscriptions"
+          class="margin-right-small"
+        />
+        <span class="fs-small">
+          {{ `${getEventLabel(event)} (${event})` }}
+        </span>
+      </div>
+    </div>
+
+    <div class="modal-footer">
+      <div class="medium-12 columns">
+        <woot-button
+          :disabled="$v.$invalid || isSubmitting"
+          :is-loading="isSubmitting"
+        >
+          {{ submitLabel }}
+        </woot-button>
+        <woot-button class="button clear" @click.prevent="$emit('cancel')">
+          {{ $t('INTEGRATION_SETTINGS.WEBHOOK.FORM.CANCEL') }}
+        </woot-button>
+      </div>
+    </div>
+  </form>
+</template>
+
+<script>
+import { required, url, minLength } from 'vuelidate/lib/validators';
+import webhookMixin from './webhookMixin';
+
+const SUPPORTED_WEBHOOK_EVENTS = [
+  'conversation_created',
+  'conversation_status_changed',
+  'conversation_updated',
+  'message_created',
+  'message_updated',
+  'webwidget_triggered',
+];
+
+export default {
+  mixins: [webhookMixin],
+  props: {
+    value: {
+      type: Object,
+      default: () => ({}),
+    },
+    isSubmitting: {
+      type: Boolean,
+      default: false,
+    },
+    submitLabel: {
+      type: String,
+      required: true,
+    },
+  },
+  validations: {
+    url: {
+      required,
+      minLength: minLength(7),
+      url,
+    },
+    subscriptions: {
+      required,
+    },
+  },
+  data() {
+    return {
+      url: this.value.url || '',
+      subscriptions: this.value.subscriptions || [],
+      supportedWebhookEvents: SUPPORTED_WEBHOOK_EVENTS,
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$emit('submit', {
+        url: this.url,
+        subscriptions: this.subscriptions,
+      });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
new file mode 100644
index 000000000..0e754d93d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -0,0 +1,83 @@
+<template>
+  <tr>
+    <td>
+      <div class="webhook--link">{{ webhook.url }}</div>
+      <span class="webhook--subscribed-events">
+        <span class="webhook--subscribed-label">
+          {{ $t('INTEGRATION_SETTINGS.WEBHOOK.SUBSCRIBED_EVENTS') }}:
+        </span>
+        <show-more :text="subscribedEvents" :limit="60" />
+      </span>
+    </td>
+    <td class="button-wrapper">
+      <woot-button
+        v-tooltip.top="$t('INTEGRATION_SETTINGS.WEBHOOK.EDIT.BUTTON_TEXT')"
+        variant="smooth"
+        size="tiny"
+        color-scheme="secondary"
+        icon="edit"
+        @click="$emit('edit', webhook)"
+      >
+      </woot-button>
+      <woot-button
+        v-tooltip.top="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT')"
+        variant="smooth"
+        color-scheme="alert"
+        size="tiny"
+        icon="dismiss-circle"
+        @click="$emit('delete', webhook, index)"
+      >
+      </woot-button>
+    </td>
+  </tr>
+</template>
+<script>
+import webhookMixin from './webhookMixin';
+import ShowMore from 'dashboard/components/widgets/ShowMore';
+
+export default {
+  components: { ShowMore },
+  mixins: [webhookMixin],
+  props: {
+    webhook: {
+      type: Object,
+      required: true,
+    },
+    index: {
+      type: Number,
+      required: true,
+    },
+  },
+  computed: {
+    subscribedEvents() {
+      const { subscriptions } = this.webhook;
+      return subscriptions.map(event => this.getEventLabel(event)).join(', ');
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.webhook--link {
+  color: var(--s-700);
+  font-weight: var(--font-weight-medium);
+  word-break: break-word;
+}
+
+.webhook--subscribed-events {
+  color: var(--s-500);
+  font-size: var(--font-size-mini);
+}
+
+.webhook--subscribed-label {
+  font-weight: var(--font-weight-medium);
+}
+
+.button-wrapper {
+  max-width: var(--space-mega);
+  min-width: auto;
+
+  button:nth-child(2) {
+    margin-left: var(--space-normal);
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/specs/webhookMixin.spec.js b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/specs/webhookMixin.spec.js
new file mode 100644
index 000000000..c617b64b0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/specs/webhookMixin.spec.js
@@ -0,0 +1,26 @@
+import { createWrapper } from '@vue/test-utils';
+import webhookMixin from '../webhookMixin';
+import Vue from 'vue';
+
+describe('webhookMixin', () => {
+  describe('#getEventLabel', () => {
+    it('returns correct i18n translation:', () => {
+      const Component = {
+        render() {},
+        title: 'WebhookComponent',
+        mixins: [webhookMixin],
+        methods: {
+          $t(text) {
+            return text;
+          },
+        },
+      };
+      const Constructor = Vue.extend(Component);
+      const vm = new Constructor().$mount();
+      const wrapper = createWrapper(vm);
+      expect(wrapper.vm.getEventLabel('message_created')).toEqual(
+        `INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.EVENTS.MESSAGE_CREATED`
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/webhookMixin.js b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/webhookMixin.js
new file mode 100644
index 000000000..38283fe90
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/webhookMixin.js
@@ -0,0 +1,10 @@
+export default {
+  methods: {
+    getEventLabel(event) {
+      const eventName = event.toUpperCase();
+      return this.$t(
+        `INTEGRATION_SETTINGS.WEBHOOK.FORM.SUBSCRIPTIONS.EVENTS.${eventName}`
+      );
+    },
+  },
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js b/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
index 36596ad0e..4240062e6 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/integrations.routes.js
@@ -1,6 +1,6 @@
 import Index from './Index';
 import SettingsContent from '../Wrapper';
-import Webhook from './Webhook';
+import Webhook from './Webhooks/Index';
 import ShowIntegration from './ShowIntegration';
 import { frontendURL } from '../../../../helper/URLHelper';
 
diff --git a/app/javascript/dashboard/store/modules/webhooks.js b/app/javascript/dashboard/store/modules/webhooks.js
index 11c0dec34..eb096468e 100644
--- a/app/javascript/dashboard/store/modules/webhooks.js
+++ b/app/javascript/dashboard/store/modules/webhooks.js
@@ -14,7 +14,7 @@ const state = {
 
 export const getters = {
   getWebhooks(_state) {
-    return _state.records;
+    return _state.records.sort((w1, w2) => w1.id - w2.id);
   },
   getUIFlags(_state) {
     return _state.uiFlags;
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index b0629a469..11a86e639 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -1,22 +1,4 @@
 class WebhookListener < BaseListener
-  # FIXME: deprecate the opened and resolved events in future in favor of status changed event.
-  def conversation_resolved(event)
-    conversation = extract_conversation_and_account(event)[0]
-    changed_attributes = extract_changed_attributes(event)
-    inbox = conversation.inbox
-    payload = conversation.webhook_data.merge(event: __method__.to_s, changed_attributes: changed_attributes)
-    deliver_webhook_payloads(payload, inbox)
-  end
-
-  # FIXME: deprecate the opened and resolved events in future in favor of status changed event.
-  def conversation_opened(event)
-    conversation = extract_conversation_and_account(event)[0]
-    changed_attributes = extract_changed_attributes(event)
-    inbox = conversation.inbox
-    payload = conversation.webhook_data.merge(event: __method__.to_s, changed_attributes: changed_attributes)
-    deliver_webhook_payloads(payload, inbox)
-  end
-
   def conversation_status_changed(event)
     conversation = extract_conversation_and_account(event)[0]
     changed_attributes = extract_changed_attributes(event)
@@ -71,15 +53,23 @@ class WebhookListener < BaseListener
 
   private
 
-  def deliver_webhook_payloads(payload, inbox)
-    # Account webhooks
+  def deliver_account_webhooks(payload, inbox)
     inbox.account.webhooks.account.each do |webhook|
+      next unless webhook.subscriptions.include?(payload[:event])
+
       WebhookJob.perform_later(webhook.url, payload)
     end
+  end
 
+  def deliver_api_inbox_webhooks(payload, inbox)
     return unless inbox.channel_type == 'Channel::Api'
     return if inbox.channel.webhook_url.blank?
 
     WebhookJob.perform_later(inbox.channel.webhook_url, payload)
   end
+
+  def deliver_webhook_payloads(payload, inbox)
+    deliver_account_webhooks(payload, inbox)
+    deliver_api_inbox_webhooks(payload, inbox)
+  end
 end
diff --git a/app/models/webhook.rb b/app/models/webhook.rb
index a78e7c267..fe97fe583 100644
--- a/app/models/webhook.rb
+++ b/app/models/webhook.rb
@@ -2,13 +2,14 @@
 #
 # Table name: webhooks
 #
-#  id           :bigint           not null, primary key
-#  url          :string
-#  webhook_type :integer          default("account")
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#  account_id   :integer
-#  inbox_id     :integer
+#  id            :bigint           not null, primary key
+#  subscriptions :jsonb
+#  url           :string
+#  webhook_type  :integer          default("account")
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
+#  account_id    :integer
+#  inbox_id      :integer
 #
 # Indexes
 #
@@ -21,6 +22,18 @@ class Webhook < ApplicationRecord
 
   validates :account_id, presence: true
   validates :url, uniqueness: { scope: [:account_id] }, format: URI::DEFAULT_PARSER.make_regexp(%w[http https])
-
+  validate :validate_webhook_subscriptions
   enum webhook_type: { account: 0, inbox: 1 }
+
+  ALLOWED_WEBHOOK_EVENTS = %w[conversation_status_changed conversation_updated conversation_created message_created message_updated
+                              webwidget_triggered].freeze
+
+  private
+
+  def validate_webhook_subscriptions
+    invalid_subscriptions = !subscriptions.instance_of?(Array) ||
+                            subscriptions.blank? ||
+                            (subscriptions.uniq - ALLOWED_WEBHOOK_EVENTS).length.positive?
+    errors.add(:subscriptions, I18n.t('errors.webhook.invalid')) if invalid_subscriptions
+  end
 end
diff --git a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
index b02de2098..fac8fdcf2 100644
--- a/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
+++ b/app/views/api/v1/accounts/webhooks/_webhook.json.jbuilder
@@ -1,6 +1,7 @@
 json.id webhook.id
 json.url webhook.url
 json.account_id webhook.account_id
+json.subscriptions webhook.subscriptions
 if webhook.inbox
   json.inbox do
     json.id webhook.inbox.id
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6a928e75a..0c92c32eb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -36,6 +36,8 @@ en:
     reset_password_failure: Uh ho! We could not find any user with the specified email.
 
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb b/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb
new file mode 100644
index 000000000..b4e8d4dfc
--- /dev/null
+++ b/db/migrate/20220424081117_add_subscriptions_to_webhooks.rb
@@ -0,0 +1,12 @@
+class AddSubscriptionsToWebhooks < ActiveRecord::Migration[6.1]
+  def change
+    add_column :webhooks, :subscriptions, :jsonb, default: %w[
+      conversation_status_changed
+      conversation_updated
+      conversation_created
+      message_created
+      message_updated
+      webwidget_triggered
+    ]
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2d03ce428..a30f6e6cf 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_18_094715) do
+ActiveRecord::Schema.define(version: 2022_04_24_081117) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -763,6 +763,7 @@ ActiveRecord::Schema.define(version: 2022_04_18_094715) do
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.integer "webhook_type", default: 0
+    t.jsonb "subscriptions", default: ["conversation_status_changed", "conversation_updated", "conversation_created", "message_created", "message_updated", "webwidget_triggered"]
     t.index ["account_id", "url"], name: "index_webhooks_on_account_id_and_url", unique: true
   end
 
diff --git a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
index ccafe2f56..aeea4d45f 100644
--- a/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/webhook_controller_spec.rb
@@ -57,6 +57,36 @@ RSpec.describe 'Webhooks API', type: :request do
         expect(response).to have_http_status(:unprocessable_entity)
         expect(JSON.parse(response.body)['message']).to eql 'Url is invalid'
       end
+
+      it 'throws error if subscription events are invalid' do
+        post "/api/v1/accounts/#{account.id}/webhooks",
+             params: { url: 'https://hello.com', subscriptions: ['conversation_random_event'] },
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(JSON.parse(response.body)['message']).to eql 'Subscriptions Invalid events'
+      end
+
+      it 'throws error if subscription events are empty' do
+        post "/api/v1/accounts/#{account.id}/webhooks",
+             params: { url: 'https://hello.com', subscriptions: [] },
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(JSON.parse(response.body)['message']).to eql 'Subscriptions Invalid events'
+      end
+
+      it 'use default if subscription events are nil' do
+        post "/api/v1/accounts/#{account.id}/webhooks",
+             params: { url: 'https://hello.com', subscriptions: nil },
+             headers: administrator.create_new_auth_token,
+             as: :json
+        expect(response).to have_http_status(:ok)
+        expect(
+          JSON.parse(response.body)['payload']['webhook']['subscriptions']
+        ).to eql %w[conversation_status_changed conversation_updated conversation_created message_created message_updated
+                    webwidget_triggered]
+      end
     end
   end
 
diff --git a/spec/factories/webhooks.rb b/spec/factories/webhooks.rb
index e80ed1aeb..b49434fce 100644
--- a/spec/factories/webhooks.rb
+++ b/spec/factories/webhooks.rb
@@ -3,5 +3,15 @@ FactoryBot.define do
     account_id { 1 }
     inbox_id { 1 }
     url { 'https://api.chatwoot.com' }
+    subscriptions do
+      %w[
+        conversation_status_changed
+        conversation_updated
+        conversation_created
+        message_created
+        message_updated
+        webwidget_triggered
+      ]
+    end
   end
 end
diff --git a/spec/listeners/webhook_listener_spec.rb b/spec/listeners/webhook_listener_spec.rb
index bcc990c5b..5dac1a8ec 100644
--- a/spec/listeners/webhook_listener_spec.rb
+++ b/spec/listeners/webhook_listener_spec.rb
@@ -23,14 +23,22 @@ describe WebhookListener do
       end
     end
 
-    context 'when webhook is configured' do
-      it 'triggers webhook' do
+    context 'when webhook is configured and event is subscribed' do
+      it 'triggers the webhook event' do
         webhook = create(:webhook, inbox: inbox, account: account)
         expect(WebhookJob).to receive(:perform_later).with(webhook.url, message.webhook_data.merge(event: 'message_created')).once
         listener.message_created(message_created_event)
       end
     end
 
+    context 'when webhook is configured and event is not subscribed' do
+      it 'does not trigger the webhook event' do
+        create(:webhook, subscriptions: ['conversation_created'], inbox: inbox, account: account)
+        expect(WebhookJob).not_to receive(:perform_later)
+        listener.message_created(message_created_event)
+      end
+    end
+
     context 'when inbox is an API Channel' do
       it 'triggers webhook if webhook_url is present' do
         channel_api = create(:channel_api, account: account)
@@ -106,36 +114,6 @@ describe WebhookListener do
     end
   end
 
-  describe '#conversation_resolved' do
-    let!(:conversation_resolved_event) do
-      Events::Base.new(event_name, Time.zone.now, conversation: conversation.reload, changed_attributes: { status: [:open, :resolved] })
-    end
-    let(:event_name) { :'conversation.resolved' }
-
-    context 'when webhook is not configured' do
-      it 'does not trigger webhook' do
-        expect(WebhookJob).to receive(:perform_later).exactly(0).times
-        listener.conversation_resolved(conversation_resolved_event)
-      end
-    end
-
-    context 'when webhook is configured' do
-      it 'triggers webhook' do
-        webhook = create(:webhook, inbox: inbox, account: account)
-
-        conversation.update(status: :resolved)
-
-        expect(WebhookJob).to receive(:perform_later).with(webhook.url,
-                                                           conversation.webhook_data.merge(event: 'conversation_resolved',
-                                                                                           changed_attributes: [{ status: {
-                                                                                             current_value: :resolved, previous_value: :open
-                                                                                           } }])).once
-
-        listener.conversation_resolved(conversation_resolved_event)
-      end
-    end
-  end
-
   describe '#conversation_updated' do
     let(:custom_attributes) { { test: nil } }
     let!(:conversation_updated_event) do

From 676796ddc75a4a53282d544270890f2aa0b77264 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 25 Apr 2022 20:04:41 +0530
Subject: [PATCH 072/177] feat: Add reports about live agent load (#4537)

* feat: Add reports about live agent load
---
 app/builders/v2/report_builder.rb             |  16 +-
 .../api/v2/accounts/reports_controller.rb     |   3 +-
 app/javascript/dashboard/api/reports.js       |   9 +
 .../dashboard/api/specs/reports.spec.js       |  13 ++
 .../layout/config/sidebarItems/reports.js     |  12 +-
 .../dashboard/helper/actionCable.js           |   6 +
 .../i18n/locale/en/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/en/report.json      |  30 ++-
 .../dashboard/i18n/locale/en/settings.json    |   7 +-
 .../dashboard/commands/CommandBarIcons.js     |   1 +
 .../dashboard/commands/goToCommandHotKeys.js  |   9 +
 .../settings/reports/LiveReports.vue          | 129 ++++++++++++
 .../components/overview/AgentTable.vue        | 199 ++++++++++++++++++
 .../components/overview/MetricCard.vue        |  98 +++++++++
 .../dashboard/settings/reports/constants.js   |   9 +
 .../settings/reports/reports.routes.js        |  22 +-
 .../dashboard/store/modules/agents.js         |  19 +-
 .../dashboard/store/modules/reports.js        |  71 +++++++
 .../modules/specs/agents/actions.spec.js      |   3 +-
 .../modules/specs/agents/getters.spec.js      |  67 ++++++
 .../modules/specs/agents/mutations.spec.js    |   1 +
 .../dashboard/store/mutation-types.js         |   7 +
 .../shared/helpers/vuex/mutationHelpers.js    |  10 +-
 .../modules/specs/agent/mutations.spec.js     |   2 +
 app/listeners/action_cable_listener.rb        |   8 +
 .../api/v2/accounts/report_controller_spec.rb |   8 +-
 .../resource/reports/conversation/agent.yml   |  19 +-
 swagger/swagger.json                          |  27 +--
 28 files changed, 758 insertions(+), 48 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 67b80b7a5..459c0759a 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -4,6 +4,7 @@ class V2::ReportBuilder
   attr_reader :account, :params
 
   DEFAULT_GROUP_BY = 'day'.freeze
+  AGENT_RESULTS_PER_PAGE = 10
 
   def initialize(account, params)
     @account = account
@@ -79,12 +80,15 @@ class V2::ReportBuilder
   end
 
   def agent_metrics
-    users = @account.users
-    users = users.where(id: params[:user_id]) if params[:user_id].present?
-    users.each_with_object([]) do |user, arr|
-      @user = user
+    account_users = @account.account_users.page(params[:page]).per(AGENT_RESULTS_PER_PAGE)
+    account_users.each_with_object([]) do |account_user, arr|
+      @user = account_user.user
       arr << {
-        user: { id: user.id, name: user.name, thumbnail: user.avatar_url },
+        id: @user.id,
+        name: @user.name,
+        email: @user.email,
+        thumbnail: @user.avatar_url,
+        availability: account_user.availability_status,
         metric: conversations
       }
     end
@@ -94,7 +98,7 @@ class V2::ReportBuilder
     @open_conversations = scope.conversations.open
     first_response_count = scope.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
     metric = {
-      open: @open_conversations.count,
+      total: @open_conversations.count,
       unattended: @open_conversations.count - first_response_count
     }
     metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 227ba2500..c2117583a 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -82,7 +82,8 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
   def conversation_params
     {
       type: params[:type].to_sym,
-      user_id: params[:user_id]
+      user_id: params[:user_id],
+      page: params[:page].presence || 1
     }
   end
 
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index 5c39ddbe6..ca50c062f 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -44,6 +44,15 @@ class ReportsAPI extends ApiClient {
     });
   }
 
+  getConversationMetric(type = 'account', page = 1) {
+    return axios.get(`${this.url}/conversations`, {
+      params: {
+        type,
+        page,
+      },
+    });
+  }
+
   getAgentReports(since, until) {
     return axios.get(`${this.url}/agents`, {
       params: { since, until },
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index efde84fe4..b51c87db5 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -97,5 +97,18 @@ describe('#Reports API', () => {
         }
       );
     });
+
+    it('#getConversationMetric', () => {
+      reportsAPI.getConversationMetric('account');
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v2/reports/conversations',
+        {
+          params: {
+            type: 'account',
+            page: 1,
+          },
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js b/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
index a9c703c44..967ee44ed 100644
--- a/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
+++ b/app/javascript/dashboard/components/layout/config/sidebarItems/reports.js
@@ -3,7 +3,8 @@ import { frontendURL } from '../../../../helper/URLHelper';
 const reports = accountId => ({
   parentNav: 'reports',
   routes: [
-    'settings_account_reports',
+    'account_overview_reports',
+    'conversation_reports',
     'csat_reports',
     'agent_reports',
     'label_reports',
@@ -16,7 +17,14 @@ const reports = accountId => ({
       label: 'REPORTS_OVERVIEW',
       hasSubMenu: false,
       toState: frontendURL(`accounts/${accountId}/reports/overview`),
-      toStateName: 'settings_account_reports',
+      toStateName: 'account_overview_reports',
+    },
+    {
+      icon: 'chat',
+      label: 'REPORTS_CONVERSATION',
+      hasSubMenu: false,
+      toState: frontendURL(`accounts/${accountId}/reports/conversation`),
+      toStateName: 'conversation_reports',
     },
     {
       icon: 'emoji',
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 77c8a7aff..e00cf283f 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -23,6 +23,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'contact.updated': this.onContactUpdate,
       'conversation.mentioned': this.onConversationMentioned,
       'notification.created': this.onNotificationCreated,
+      'first.reply.created': this.onFirstReplyCreated,
       'conversation.read': this.onConversationRead,
     };
   }
@@ -128,6 +129,7 @@ class ActionCableConnector extends BaseActionCableConnector {
 
   fetchConversationStats = () => {
     bus.$emit('fetch_conversation_stats');
+    bus.$emit('fetch_overview_reports');
   };
 
   onContactDelete = data => {
@@ -145,6 +147,10 @@ class ActionCableConnector extends BaseActionCableConnector {
   onNotificationCreated = data => {
     this.app.$store.dispatch('notifications/addNotification', data);
   };
+
+  onFirstReplyCreated = () => {
+    bus.$emit('fetch_overview_reports');
+  };
 }
 
 export default {
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index b1e1c3eca..2a726b26f 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -108,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 1574b1cca..a774dff33 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "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",
@@ -381,5 +381,33 @@
         "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": "Conversations Loading...",
+      "TOTAL" : "Total",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Unassigned"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Agents Loading...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Agent",
+        "TOTAL": "Total",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Busy",
+      "OFFLINE": "Offline"
+    }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 63b070b0e..97539d49c 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -23,7 +23,7 @@
         "TITLE": "Personal message signature",
         "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
         "BTN_TEXT": "Save message signature",
-        "API_ERROR":"Couldn't save signature! Try again",
+        "API_ERROR": "Couldn't save signature! Try again",
         "API_SUCCESS": "Signature saved successfully"
       },
       "MESSAGE_SIGNATURE": {
@@ -173,7 +173,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Conversations",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +183,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
index 561e8cd0d..d0d0bb633 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/CommandBarIcons.js
@@ -13,6 +13,7 @@ export const ICON_SNOOZE_UNTIL_TOMORRROW = `<svg role="img" class="ninja-icon ni
 export const ICON_CONVERSATION_DASHBOARD = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M10.55 2.532a2.25 2.25 0 0 1 2.9 0l6.75 5.692c.507.428.8 1.057.8 1.72v9.803a1.75 1.75 0 0 1-1.75 1.75h-3.5a1.75 1.75 0 0 1-1.75-1.75v-5.5a.25.25 0 0 0-.25-.25h-3.5a.25.25 0 0 0-.25.25v5.5a1.75 1.75 0 0 1-1.75 1.75h-3.5A1.75 1.75 0 0 1 3 19.747V9.944c0-.663.293-1.292.8-1.72l6.75-5.692zm1.933 1.147a.75.75 0 0 0-.966 0L4.767 9.37a.75.75 0 0 0-.267.573v9.803c0 .138.112.25.25.25h3.5a.25.25 0 0 0 .25-.25v-5.5c0-.967.784-1.75 1.75-1.75h3.5c.966 0 1.75.783 1.75 1.75v5.5c0 .138.112.25.25.25h3.5a.25.25 0 0 0 .25-.25V9.944a.75.75 0 0 0-.267-.573l-6.75-5.692z" fill="currentColor"></path></g></svg>`;
 export const ICON_CONTACT_DASHBOARD = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M17.754 14a2.249 2.249 0 0 1 2.25 2.249v.575c0 .894-.32 1.76-.902 2.438c-1.57 1.834-3.957 2.739-7.102 2.739c-3.146 0-5.532-.905-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.577a2.249 2.249 0 0 1 2.249-2.25h11.501zm0 1.5H6.253a.749.749 0 0 0-.75.749v.577c0 .536.192 1.054.54 1.461c1.253 1.468 3.219 2.214 5.957 2.214s4.706-.746 5.962-2.214a2.25 2.25 0 0 0 .541-1.463v-.575a.749.749 0 0 0-.749-.75zM12 2.004a5 5 0 1 1 0 10a5 5 0 0 1 0-10zm0 1.5a3.5 3.5 0 1 0 0 7a3.5 3.5 0 0 0 0-7z" fill="currentColor"></path></g></svg>`;
 export const ICON_REPORTS_OVERVIEW = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M16.749 2h4.554l.1.014l.099.028l.06.026c.08.034.153.085.219.15l.04.044l.044.057l.054.09l.039.09l.019.064l.014.064l.009.095v4.532a.75.75 0 0 1-1.493.102l-.007-.102V4.559l-6.44 6.44a.75.75 0 0 1-.976.073L13 11L9.97 8.09l-5.69 5.689a.75.75 0 0 1-1.133-.977l.073-.084l6.22-6.22a.75.75 0 0 1 .976-.072l.084.072l3.03 2.91L19.438 3.5h-2.69a.75.75 0 0 1-.742-.648l-.007-.102a.75.75 0 0 1 .648-.743L16.75 2zM3.75 17a.75.75 0 0 1 .75.75v3.5a.75.75 0 0 1-1.5 0v-3.5a.75.75 0 0 1 .75-.75zm5.75-3.25a.75.75 0 0 0-1.5 0v7.5a.75.75 0 0 0 1.5 0v-7.5zM13.75 15a.75.75 0 0 1 .75.75v5.5a.75.75 0 0 1-1.5 0v-5.5a.75.75 0 0 1 .75-.75zm5.75-4.25a.75.75 0 0 0-1.5 0v10.5a.75.75 0 0 0 1.5 0v-10.5z" fill="currentColor"></path></g></svg>`;
+export const ICON_CONVERSATION_REPORTS = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M12 2c5.523 0 10 4.477 10 10s-4.477 10-10 10a9.96 9.96 0 0 1-4.587-1.112l-3.826 1.067a1.25 1.25 0 0 1-1.54-1.54l1.068-3.823A9.96 9.96 0 0 1 2 12C2 6.477 6.477 2 12 2Zm0 1.5A8.5 8.5 0 0 0 3.5 12c0 1.47.373 2.883 1.073 4.137l.15.27-1.112 3.984 3.987-1.112.27.15A8.5 8.5 0 1 0 12 3.5ZM8.75 13h4.498a.75.75 0 0 1 .102 1.493l-.102.007H8.75a.75.75 0 0 1-.102-1.493L8.75 13h4.498H8.75Zm0-3.5h6.505a.75.75 0 0 1 .101 1.493l-.101.007H8.75a.75.75 0 0 1-.102-1.493L8.75 9.5h6.505H8.75Z" fill="currentColor"/></svg>`;
 export const ICON_AGENT_REPORTS = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M4 13.999L13 14a2 2 0 0 1 1.995 1.85L15 16v1.5C14.999 21 11.284 22 8.5 22c-2.722 0-6.335-.956-6.495-4.27L2 17.5v-1.501c0-1.054.816-1.918 1.85-1.995L4 14zM15.22 14H20c1.054 0 1.918.816 1.994 1.85L22 16v1c-.001 3.062-2.858 4-5 4a7.16 7.16 0 0 1-2.14-.322c.336-.386.607-.827.802-1.327A6.19 6.19 0 0 0 17 19.5l.267-.006c.985-.043 3.086-.363 3.226-2.289L20.5 17v-1a.501.501 0 0 0-.41-.492L20 15.5h-4.051a2.957 2.957 0 0 0-.595-1.34L15.22 14H20h-4.78zM4 15.499l-.1.01a.51.51 0 0 0-.254.136a.506.506 0 0 0-.136.253l-.01.101V17.5c0 1.009.45 1.722 1.417 2.242c.826.445 2.003.714 3.266.753l.317.005l.317-.005c1.263-.039 2.439-.308 3.266-.753c.906-.488 1.359-1.145 1.412-2.057l.005-.186V16a.501.501 0 0 0-.41-.492L13 15.5l-9-.001zM8.5 3a4.5 4.5 0 1 1 0 9a4.5 4.5 0 0 1 0-9zm9 2a3.5 3.5 0 1 1 0 7a3.5 3.5 0 0 1 0-7zm-9-.5c-1.654 0-3 1.346-3 3s1.346 3 3 3s3-1.346 3-3s-1.346-3-3-3zm9 2c-1.103 0-2 .897-2 2s.897 2 2 2s2-.897 2-2s-.897-2-2-2z" fill="currentColor"></path></g></svg>`;
 export const ICON_LABEL_REPORTS = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M19.75 2A2.25 2.25 0 0 1 22 4.25v5.462a3.25 3.25 0 0 1-.952 2.298l-8.5 8.503a3.255 3.255 0 0 1-4.597.001L3.489 16.06a3.25 3.25 0 0 1-.003-4.596l8.5-8.51A3.25 3.25 0 0 1 14.284 2h5.465zm0 1.5h-5.465c-.465 0-.91.185-1.239.513l-8.512 8.523a1.75 1.75 0 0 0 .015 2.462l4.461 4.454a1.755 1.755 0 0 0 2.477 0l8.5-8.503a1.75 1.75 0 0 0 .513-1.237V4.25a.75.75 0 0 0-.75-.75zM17 5.502a1.5 1.5 0 1 1 0 3a1.5 1.5 0 0 1 0-3z" fill="currentColor"></path></g></svg>`;
 export const ICON_INBOX_REPORTS = `<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="ninja-icon ninja-icon--fluent" width="18" height="18" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><g fill="none"><path d="M6.25 3h11.5a3.25 3.25 0 0 1 3.245 3.066L21 6.25v11.5a3.25 3.25 0 0 1-3.066 3.245L17.75 21H6.25a3.25 3.25 0 0 1-3.245-3.066L3 17.75V6.25a3.25 3.25 0 0 1 3.066-3.245L6.25 3h11.5h-11.5zM4.5 14.5v3.25a1.75 1.75 0 0 0 1.606 1.744l.144.006h11.5a1.75 1.75 0 0 0 1.744-1.607l.006-.143V14.5h-3.825a3.752 3.752 0 0 1-3.475 2.995l-.2.005a3.752 3.752 0 0 1-3.632-2.812l-.043-.188H4.5v3.25v-3.25zm13.25-10H6.25a1.75 1.75 0 0 0-1.744 1.606L4.5 6.25V13H9a.75.75 0 0 1 .743.648l.007.102a2.25 2.25 0 0 0 4.495.154l.005-.154a.75.75 0 0 1 .648-.743L15 13h4.5V6.25a1.75 1.75 0 0 0-1.607-1.744L17.75 4.5z" fill="currentColor"></path></g></svg>`;
diff --git a/app/javascript/dashboard/routes/dashboard/commands/goToCommandHotKeys.js b/app/javascript/dashboard/routes/dashboard/commands/goToCommandHotKeys.js
index 5fee0f6f2..9a5b09f2e 100644
--- a/app/javascript/dashboard/routes/dashboard/commands/goToCommandHotKeys.js
+++ b/app/javascript/dashboard/routes/dashboard/commands/goToCommandHotKeys.js
@@ -13,6 +13,7 @@ import {
   ICON_REPORTS_OVERVIEW,
   ICON_TEAM_REPORTS,
   ICON_USER_PROFILE,
+  ICON_CONVERSATION_REPORTS,
 } from './CommandBarIcons';
 import { frontendURL } from '../../../helper/URLHelper';
 
@@ -41,6 +42,14 @@ const GO_TO_COMMANDS = [
     path: accountId => `accounts/${accountId}/reports/overview`,
     role: ['administrator'],
   },
+  {
+    id: 'open_conversation_reports',
+    section: 'COMMAND_BAR.SECTIONS.REPORTS',
+    title: 'COMMAND_BAR.COMMANDS.GO_TO_CONVERSATION_REPORTS',
+    icon: ICON_CONVERSATION_REPORTS,
+    path: accountId => `accounts/${accountId}/reports/conversation`,
+    role: ['administrator'],
+  },
   {
     id: 'open_agent_reports',
     section: 'COMMAND_BAR.SECTIONS.REPORTS',
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
new file mode 100644
index 000000000..88aa5c558
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/LiveReports.vue
@@ -0,0 +1,129 @@
+<template>
+  <div class="column content-box">
+    <div class="row">
+      <div class="column small-12 medium-8 conversation-metric">
+        <metric-card
+          :header="this.$t('OVERVIEW_REPORTS.ACCOUNT_CONVERSATIONS.HEADER')"
+          :is-loading="uiFlags.isFetchingAccountConversationMetric"
+          :loading-message="
+            $t('OVERVIEW_REPORTS.ACCOUNT_CONVERSATIONS.LOADING_MESSAGE')
+          "
+        >
+          <div
+            v-for="(metric, name, index) in conversationMetrics"
+            :key="index"
+            class="metric-content column"
+          >
+            <h3 class="heading">
+              {{ name }}
+            </h3>
+            <p class="metric">{{ metric }}</p>
+          </div>
+        </metric-card>
+      </div>
+      <div class="column small-12 medium-4">
+        <metric-card :header="this.$t('OVERVIEW_REPORTS.AGENT_STATUS.HEADER')">
+          <div
+            v-for="(metric, name, index) in agentStatusMetrics"
+            :key="index"
+            class="metric-content column"
+          >
+            <h3 class="heading">
+              {{ name }}
+            </h3>
+            <p class="metric">{{ metric }}</p>
+          </div>
+        </metric-card>
+      </div>
+    </div>
+    <div class="row">
+      <metric-card
+        :header="this.$t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.HEADER')"
+      >
+        <agent-table
+          :total-agents="agentsCount"
+          :agent-metrics="agentConversationMetric"
+          :page-index="pageIndex"
+          :is-loading="uiFlags.isFetchingAgentConversationMetric"
+          @page-change="onPageNumberChange"
+        />
+      </metric-card>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import AgentTable from './components/overview/AgentTable';
+import MetricCard from './components/overview/MetricCard';
+import { OVERVIEW_METRICS } from './constants';
+export default {
+  name: 'LiveReports',
+  components: {
+    AgentTable,
+    MetricCard,
+  },
+  data() {
+    return {
+      pageIndex: 1,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      agentStatus: 'agents/getAgentStatus',
+      agentsCount: 'agents/getAgentsCount',
+      accountConversationMetric: 'getAccountConversationMetric',
+      agentConversationMetric: 'getAgentConversationMetric',
+      uiFlags: 'getOverviewUIFlags',
+    }),
+    agentStatusMetrics() {
+      let metric = {};
+      Object.keys(this.agentStatus).forEach(key => {
+        const metricName = this.$t(
+          `OVERVIEW_REPORTS.AGENT_STATUS.${OVERVIEW_METRICS[key]}`
+        );
+        metric[metricName] = this.agentStatus[key];
+      });
+      return metric;
+    },
+    conversationMetrics() {
+      let metric = {};
+      Object.keys(this.accountConversationMetric).forEach(key => {
+        const metricName = this.$t(
+          `OVERVIEW_REPORTS.ACCOUNT_CONVERSATIONS.${OVERVIEW_METRICS[key]}`
+        );
+        metric[metricName] = this.accountConversationMetric[key];
+      });
+      return metric;
+    },
+  },
+  mounted() {
+    this.$store.dispatch('agents/get');
+    this.fetchAllData();
+
+    bus.$on('fetch_overview_reports', () => {
+      this.fetchAllData();
+    });
+  },
+  methods: {
+    fetchAllData() {
+      this.fetchAccountConversationMetric();
+      this.fetchAgentConversationMetric();
+    },
+    fetchAccountConversationMetric() {
+      this.$store.dispatch('fetchAccountConversationMetric', {
+        type: 'account',
+      });
+    },
+    fetchAgentConversationMetric() {
+      this.$store.dispatch('fetchAgentConversationMetric', {
+        type: 'agent',
+        page: this.pageIndex,
+      });
+    },
+    onPageNumberChange(pageIndex) {
+      this.pageIndex = pageIndex;
+      this.fetchAgentConversationMetric();
+    },
+  },
+};
+</script>
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
new file mode 100644
index 000000000..55a93d2fe
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/AgentTable.vue
@@ -0,0 +1,199 @@
+<template>
+  <div class="agent-table-container">
+    <ve-table
+      max-height="calc(100vh - 35rem)"
+      :fixed-header="true"
+      :columns="columns"
+      :table-data="tableData"
+    />
+    <div v-if="isLoading" class="agents-loader">
+      <spinner />
+      <span>{{
+        $t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.LOADING_MESSAGE')
+      }}</span>
+    </div>
+    <empty-state
+      v-else-if="!isLoading && !agentMetrics.length"
+      :title="$t('OVERVIEW_REPORTS.AGENT_CONVERSATIONS.NO_AGENTS')"
+    />
+    <div v-if="agentMetrics.length > 0" class="table-pagination">
+      <ve-pagination
+        :total="totalAgents"
+        :page-index="pageIndex"
+        :page-size="10"
+        :page-size-option="[10]"
+        @on-page-number-change="onPageNumberChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { VeTable, VePagination } from 'vue-easytable';
+import Spinner from 'shared/components/Spinner.vue';
+import EmptyState from 'dashboard/components/widgets/EmptyState.vue';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+
+export default {
+  name: 'AgentTable',
+  components: {
+    EmptyState,
+    Spinner,
+    VeTable,
+    VePagination,
+  },
+  props: {
+    totalAgents: {
+      type: Number,
+      default: 0,
+    },
+    agentMetrics: {
+      type: Array,
+      default: () => [],
+    },
+    isLoading: {
+      type: Boolean,
+      default: false,
+    },
+    pageIndex: {
+      type: Number,
+      default: 1,
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    tableData() {
+      return this.agentMetrics.map(agent => {
+        return {
+          agent: agent.name,
+          email: agent.email,
+          thumbnail: agent.thumbnail,
+          total: agent.metric.total || 0,
+          unattended: agent.metric.unattended || 0,
+          status: agent.availability,
+        };
+      });
+    },
+    columns() {
+      return [
+        {
+          field: 'agent',
+          key: 'agent',
+          title: this.$t(
+            'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.AGENT'
+          ),
+          fixed: 'left',
+          align: 'left',
+          width: 25,
+          renderBodyCell: ({ row }) => (
+            <div class="row-user-block">
+              <Thumbnail
+                src={row.thumbnail}
+                size="32px"
+                username={row.agent}
+                status={row.status}
+              />
+              <div class="user-block">
+                <h6 class="title text-truncate">{row.agent}</h6>
+                <span class="sub-title">{row.email}</span>
+              </div>
+            </div>
+          ),
+        },
+        {
+          field: 'total',
+          key: 'total',
+          title: this.$t(
+            'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.TOTAL'
+          ),
+          align: 'left',
+          width: 10,
+        },
+        {
+          field: 'unattended',
+          key: 'unattended',
+          title: this.$t(
+            'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.UNATTENDED'
+          ),
+          align: 'left',
+          width: 10,
+        },
+      ];
+    },
+  },
+  mounted() {},
+  methods: {
+    onPageNumberChange(pageIndex) {
+      this.$emit('page-change', pageIndex);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.agent-table-container {
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+
+  .ve-table {
+    &::v-deep {
+      th.ve-table-header-th {
+        font-size: var(--font-size-mini) !important;
+        padding: var(--space-small) var(--space-two) !important;
+      }
+
+      td.ve-table-body-td {
+        padding: var(--space-one) var(--space-two) !important;
+      }
+    }
+  }
+
+  &::v-deep .ve-pagination {
+    background-color: transparent;
+  }
+
+  &::v-deep .ve-pagination-select {
+    display: none;
+  }
+
+  .row-user-block {
+    align-items: center;
+    display: flex;
+    text-align: left;
+
+    .user-block {
+      display: flex;
+      flex-direction: column;
+      min-width: 0;
+      .title {
+        font-size: var(--font-size-small);
+        margin: var(--zero);
+        line-height: 1;
+      }
+      .sub-title {
+        font-size: var(--font-size-mini);
+      }
+    }
+
+    .user-thumbnail-box {
+      margin-right: var(--space-small);
+    }
+  }
+
+  .table-pagination {
+    margin-top: var(--space-normal);
+    text-align: right;
+  }
+}
+
+.agents-loader {
+  align-items: center;
+  display: flex;
+  font-size: var(--font-size-default);
+  justify-content: center;
+  padding: var(--space-large);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
new file mode 100644
index 000000000..5dd81f5ac
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
@@ -0,0 +1,98 @@
+<template>
+  <div class="card">
+    <div class="card-header">
+      <h5>{{ header }}</h5>
+      <span class="live">
+        <span class="ellipse" /><span>{{ $t('OVERVIEW_REPORTS.LIVE') }}</span>
+      </span>
+    </div>
+    <div v-if="!isLoading" class="card-body row">
+      <slot></slot>
+    </div>
+    <div v-else-if="isLoading" class="conversation-metric-loader">
+      <spinner />
+      <span>{{ loadingMessage }}</span>
+    </div>
+  </div>
+</template>
+<script>
+import Spinner from 'shared/components/Spinner.vue';
+
+export default {
+  name: 'MetricCard',
+  components: {
+    Spinner,
+  },
+  props: {
+    header: {
+      type: String,
+      default: '',
+    },
+    isLoading: {
+      type: Boolean,
+      default: false,
+    },
+    loadingMessage: {
+      type: String,
+      default: '',
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.card {
+  margin: var(--space-small) !important;
+}
+.card-header {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin-bottom: var(--space-medium);
+
+  h5 {
+    margin-bottom: var(--zero);
+  }
+
+  .live {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding-right: var(--space-small);
+    padding-left: var(--space-small);
+    margin: var(--space-smaller);
+    background: rgba(37, 211, 102, 0.1);
+    color: var(--g-400);
+    font-size: var(--font-size-mini);
+
+    .ellipse {
+      background-color: var(--g-400);
+      height: var(--space-smaller);
+      width: var(--space-smaller);
+      border-radius: var(--border-radius-rounded);
+      margin-right: var(--space-smaller);
+    }
+  }
+}
+.card-body {
+  .metric-content {
+    padding-bottom: var(--space-small);
+    .heading {
+      font-size: var(--font-size-default);
+    }
+    .metric {
+      color: var(--w-800);
+      font-size: var(--font-size-bigger);
+      margin-bottom: var(--zero);
+      margin-top: var(--space-smaller);
+    }
+  }
+}
+
+.conversation-metric-loader {
+  align-items: center;
+  display: flex;
+  font-size: var(--font-size-default);
+  justify-content: center;
+  padding: var(--space-large);
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index c44f2bdef..88f04b0f1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -121,3 +121,12 @@ export const METRIC_CHART = {
   },
   resolutions_count: DEFAULT_CHART,
 };
+
+export const OVERVIEW_METRICS = {
+  total: 'TOTAL',
+  unattended: 'UNATTENDED',
+  unassigned: 'UNASSIGNED',
+  online: 'ONLINE',
+  busy: 'BUSY',
+  offline: 'OFFLINE',
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
index 27f9a67ad..4d4814845 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/reports.routes.js
@@ -4,6 +4,7 @@ import LabelReports from './LabelReports';
 import InboxReports from './InboxReports';
 import TeamReports from './TeamReports';
 import CsatResponses from './CsatResponses';
+import LiveReports from './LiveReports';
 import SettingsContent from '../Wrapper';
 import { frontendURL } from '../../../../helper/URLHelper';
 
@@ -13,7 +14,7 @@ export default {
       path: frontendURL('accounts/:accountId/reports'),
       component: SettingsContent,
       props: {
-        headerTitle: 'REPORT.HEADER',
+        headerTitle: 'OVERVIEW_REPORTS.HEADER',
         icon: 'arrow-trending-lines',
         keepAlive: false,
       },
@@ -24,7 +25,24 @@ export default {
         },
         {
           path: 'overview',
-          name: 'settings_account_reports',
+          name: 'account_overview_reports',
+          roles: ['administrator'],
+          component: LiveReports,
+        },
+      ],
+    },
+    {
+      path: frontendURL('accounts/:accountId/reports'),
+      component: SettingsContent,
+      props: {
+        headerTitle: 'REPORT.HEADER',
+        icon: 'chat',
+        keepAlive: false,
+      },
+      children: [
+        {
+          path: 'conversation',
+          name: 'conversation_reports',
           roles: ['administrator'],
           component: Index,
         },
diff --git a/app/javascript/dashboard/store/modules/agents.js b/app/javascript/dashboard/store/modules/agents.js
index 61be40559..b8dbc7fc4 100644
--- a/app/javascript/dashboard/store/modules/agents.js
+++ b/app/javascript/dashboard/store/modules/agents.js
@@ -22,6 +22,22 @@ export const getters = {
   getUIFlags($state) {
     return $state.uiFlags;
   },
+  getAgentStatus($state) {
+    let status = {
+      online: $state.records.filter(
+        agent => agent.availability_status === 'online'
+      ).length,
+      busy: $state.records.filter(agent => agent.availability_status === 'busy')
+        .length,
+      offline: $state.records.filter(
+        agent => agent.availability_status === 'offline'
+      ).length,
+    };
+    return status;
+  },
+  getAgentsCount($state) {
+    return $state.records.length;
+  },
 };
 
 export const actions = {
@@ -58,9 +74,10 @@ export const actions = {
     }
   },
 
-  updatePresence: async ({ commit }, data) => {
+  updatePresence: async ({ commit, dispatch }, data) => {
     commit(types.default.SET_AGENT_UPDATING_STATUS, true);
     commit(types.default.UPDATE_AGENTS_PRESENCE, data);
+    dispatch('updateReportAgentStatus', data, { root: true });
     commit(types.default.SET_AGENT_UPDATING_STATUS, false);
   },
 
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 0b31883bf..dc9a6c33b 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -3,6 +3,7 @@
 /* eslint no-shadow: 0 */
 import * as types from '../mutation-types';
 import Report from '../../api/reports';
+import Vue from 'vue';
 
 import { downloadCsvFile } from '../../helper/downloadCsvFile';
 
@@ -22,6 +23,14 @@ const state = {
     resolutions_count: 0,
     previous: {},
   },
+  overview: {
+    uiFlags: {
+      isFetchingAccountConversationMetric: false,
+      isFetchingAgentConversationMetric: false,
+    },
+    accountConversationMetric: {},
+    agentConversationMetric: [],
+  },
 };
 
 const getters = {
@@ -31,6 +40,15 @@ const getters = {
   getAccountSummary(_state) {
     return _state.accountSummary;
   },
+  getAccountConversationMetric(_state) {
+    return _state.overview.accountConversationMetric;
+  },
+  getAgentConversationMetric(_state) {
+    return _state.overview.agentConversationMetric;
+  },
+  getOverviewUIFlags($state) {
+    return $state.overview.uiFlags;
+  },
 };
 
 export const actions = {
@@ -70,6 +88,37 @@ export const actions = {
         commit(types.default.TOGGLE_ACCOUNT_REPORT_LOADING, false);
       });
   },
+  fetchAccountConversationMetric({ commit }, reportObj) {
+    commit(types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING, true);
+    Report.getConversationMetric(reportObj.type)
+      .then(accountConversationMetric => {
+        commit(
+          types.default.SET_ACCOUNT_CONVERSATION_METRIC,
+          accountConversationMetric.data
+        );
+        commit(types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING, false);
+      })
+      .catch(() => {
+        commit(types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING, false);
+      });
+  },
+  fetchAgentConversationMetric({ commit }, reportObj) {
+    commit(types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING, true);
+    Report.getConversationMetric(reportObj.type, reportObj.page)
+      .then(agentConversationMetric => {
+        commit(
+          types.default.SET_AGENT_CONVERSATION_METRIC,
+          agentConversationMetric.data
+        );
+        commit(types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING, false);
+      })
+      .catch(() => {
+        commit(types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING, false);
+      });
+  },
+  updateReportAgentStatus({ commit }, data) {
+    commit(types.default.UPDATE_REPORT_AGENTS_STATUS, data);
+  },
   downloadAgentReports(_, reportObj) {
     return Report.getAgentReports(reportObj.from, reportObj.to)
       .then(response => {
@@ -118,6 +167,28 @@ const mutations = {
   [types.default.SET_ACCOUNT_SUMMARY](_state, summaryData) {
     _state.accountSummary = summaryData;
   },
+  [types.default.SET_ACCOUNT_CONVERSATION_METRIC](_state, metricData) {
+    _state.overview.accountConversationMetric = metricData;
+  },
+  [types.default.TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING](_state, flag) {
+    _state.overview.uiFlags.isFetchingAccountConversationMetric = flag;
+  },
+  [types.default.SET_AGENT_CONVERSATION_METRIC](_state, metricData) {
+    _state.overview.agentConversationMetric = metricData;
+  },
+  [types.default.TOGGLE_AGENT_CONVERSATION_METRIC_LOADING](_state, flag) {
+    _state.overview.uiFlags.isFetchingAgentConversationMetric = flag;
+  },
+  [types.default.UPDATE_REPORT_AGENTS_STATUS](_state, data) {
+    _state.overview.agentConversationMetric.forEach((element, index) => {
+      const availabilityStatus = data[element.id];
+      Vue.set(
+        _state.overview.agentConversationMetric[index],
+        'availability',
+        availabilityStatus || 'offline'
+      );
+    });
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js b/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
index 206ae9dfe..5c6310f48 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
@@ -4,6 +4,7 @@ import * as types from '../../../mutation-types';
 import agentList from './fixtures';
 
 const commit = jest.fn();
+const dispatch = jest.fn();
 global.axios = axios;
 jest.mock('axios');
 
@@ -97,7 +98,7 @@ describe('#actions', () => {
   describe('#updatePresence', () => {
     it('sends correct actions if API is success', async () => {
       const data = { users: { 1: 'online' }, contacts: { 2: 'online' } };
-      actions.updatePresence({ commit }, data);
+      actions.updatePresence({ commit, dispatch }, data);
       expect(commit.mock.calls).toEqual([
         [types.default.SET_AGENT_UPDATING_STATUS, true],
         [types.default.UPDATE_AGENTS_PRESENCE, data],
diff --git a/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js b/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
index 33a1ba5cf..b40bff351 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/getters.spec.js
@@ -77,4 +77,71 @@ describe('#getters', () => {
       isDeleting: false,
     });
   });
+
+  it('getAgentStatus', () => {
+    const state = {
+      records: [
+        {
+          id: 1,
+          name: 'Agent 1',
+          email: 'agent1@chatwoot.com',
+          confirmed: true,
+          availability_status: 'online',
+        },
+        {
+          id: 2,
+          name: 'Agent 2',
+          email: 'agent2@chatwoot.com',
+          confirmed: false,
+          availability_status: 'offline',
+        },
+      ],
+    };
+    expect(getters.getAgentStatus(state)).toEqual({
+      online: 1,
+      busy: 0,
+      offline: 1,
+    });
+  });
+
+  it('getAgentStatus', () => {
+    const state = {
+      records: [
+        {
+          id: 1,
+          name: 'Agent 1',
+          email: 'agent1@chatwoot.com',
+          confirmed: true,
+          availability_status: 'online',
+        },
+        {
+          id: 2,
+          name: 'Agent 2',
+          email: 'agent2@chatwoot.com',
+          confirmed: false,
+          availability_status: 'offline',
+        },
+      ],
+    };
+    expect(getters.getAgentStatus(state)).toEqual({
+      online: 1,
+      busy: 0,
+      offline: 1,
+    });
+  });
+
+  it('getAgentStatus', () => {
+    const state = {
+      records: [
+        {
+          id: 1,
+          name: 'Agent 1',
+          email: 'agent1@chatwoot.com',
+          confirmed: true,
+          availability_status: 'online',
+        },
+      ],
+    };
+    expect(getters.getAgentsCount(state)).toEqual(1);
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
index 00b569aaf..5c918582d 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
@@ -92,6 +92,7 @@ describe('#mutations', () => {
           id: 2,
           name: 'Agent1',
           email: 'agent1@chatwoot.com',
+          availability_status: 'offline',
         },
       ]);
     });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 4ae2d0e10..f89a5205d 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -144,6 +144,13 @@ export default {
   SET_ACCOUNT_REPORTS: 'SET_ACCOUNT_REPORTS',
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
+  SET_ACCOUNT_CONVERSATION_METRIC: 'SET_ACCOUNT_CONVERSATION_METRIC',
+  TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING:
+    'TOGGLE_ACCOUNT_CONVERSATION_METRIC_LOADING',
+  SET_AGENT_CONVERSATION_METRIC: 'SET_AGENT_CONVERSATION_METRIC',
+  TOGGLE_AGENT_CONVERSATION_METRIC_LOADING:
+    'TOGGLE_AGENT_CONVERSATION_METRIC_LOADING',
+  UPDATE_REPORT_AGENTS_STATUS: 'UPDATE_AGENTS_STATUS',
 
   // Conversation Metadata
   SET_CONVERSATION_METADATA: 'SET_CONVERSATION_METADATA',
diff --git a/app/javascript/shared/helpers/vuex/mutationHelpers.js b/app/javascript/shared/helpers/vuex/mutationHelpers.js
index 9822c0224..f54a1d21e 100644
--- a/app/javascript/shared/helpers/vuex/mutationHelpers.js
+++ b/app/javascript/shared/helpers/vuex/mutationHelpers.js
@@ -37,11 +37,11 @@ export const updateAttributes = (state, data) => {
 export const updatePresence = (state, data) => {
   state.records.forEach((element, index) => {
     const availabilityStatus = data[element.id];
-    if (availabilityStatus) {
-      Vue.set(state.records[index], 'availability_status', availabilityStatus);
-    } else {
-      Vue.delete(state.records[index], 'availability_status');
-    }
+    Vue.set(
+      state.records[index],
+      'availability_status',
+      availabilityStatus || 'offline'
+    );
   });
 };
 
diff --git a/app/javascript/widget/store/modules/specs/agent/mutations.spec.js b/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
index f29bb97d9..63bf3bcb3 100644
--- a/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
@@ -47,11 +47,13 @@ describe('#mutations', () => {
           id: 3,
           name: 'Pranav',
           avatar_url: '',
+          availability_status: 'offline',
         },
         {
           id: 4,
           name: 'Nithin',
           avatar_url: '',
+          availability_status: 'offline',
         },
       ]);
     });
diff --git a/app/listeners/action_cable_listener.rb b/app/listeners/action_cable_listener.rb
index d9099eda8..3d3bbdf83 100644
--- a/app/listeners/action_cable_listener.rb
+++ b/app/listeners/action_cable_listener.rb
@@ -23,6 +23,14 @@ class ActionCableListener < BaseListener
     broadcast(account, tokens, MESSAGE_UPDATED, message.push_event_data)
   end
 
+  def first_reply_created(event)
+    message, account = extract_message_and_account(event)
+    conversation = message.conversation
+    tokens = user_tokens(account, conversation.inbox.members)
+
+    broadcast(account, tokens, FIRST_REPLY_CREATED, message.push_event_data)
+  end
+
   def conversation_created(event)
     conversation, account = extract_conversation_and_account(event)
     tokens = user_tokens(account, conversation.inbox.members) + contact_inbox_tokens(conversation.contact_inbox)
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index cb2b9b72d..8c6f989c8 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -73,7 +73,7 @@ RSpec.describe 'Reports API', type: :request do
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
 
-        expect(json_response['open']).to eq(11)
+        expect(json_response['total']).to eq(11)
         expect(json_response['unattended']).to eq(11)
         expect(json_response['unassigned']).to eq(1)
       end
@@ -93,10 +93,10 @@ RSpec.describe 'Reports API', type: :request do
 
         json_response = JSON.parse(response.body)
         expect(json_response.blank?).to be false
-        user_metrics = json_response.find { |item| item['user']['name'] == admin[:name] }
+        user_metrics = json_response.find { |item| item['name'] == admin[:name] }
         expect(user_metrics.present?).to be true
 
-        expect(user_metrics['metric']['open']).to eq(2)
+        expect(user_metrics['metric']['total']).to eq(2)
         expect(user_metrics['metric']['unattended']).to eq(2)
       end
 
@@ -116,7 +116,7 @@ RSpec.describe 'Reports API', type: :request do
 
         json_response = JSON.parse(response.body)
         expect(json_response.blank?).to be false
-        expect(json_response[0]['metric']['open']).to eq(10)
+        expect(json_response[0]['metric']['total']).to eq(10)
         expect(json_response[0]['metric']['unattended']).to eq(10)
       end
     end
diff --git a/swagger/definitions/resource/reports/conversation/agent.yml b/swagger/definitions/resource/reports/conversation/agent.yml
index 7077b767b..251defb24 100644
--- a/swagger/definitions/resource/reports/conversation/agent.yml
+++ b/swagger/definitions/resource/reports/conversation/agent.yml
@@ -1,14 +1,15 @@
 type: object
 properties:
-  user:
-    type: object
-    properties:
-      id:
-        type: number
-      name:
-        type: string
-      thumbnail:
-        type: string
+  id:
+    type: number
+  name:
+    type: string
+  email:
+    type: string
+  thumbnail:
+    type: string
+  availability:
+    type: string
   metric:
     type: object
     properties:
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 7ec216f9a..81f19149c 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5629,19 +5629,20 @@
     "agent_conversation_metrics": {
       "type": "object",
       "properties": {
-        "user": {
-          "type": "object",
-          "properties": {
-            "id": {
-              "type": "number"
-            },
-            "name": {
-              "type": "string"
-            },
-            "thumbnail": {
-              "type": "string"
-            }
-          }
+        "id": {
+          "type": "number"
+        },
+        "name": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "thumbnail": {
+          "type": "string"
+        },
+        "availability": {
+          "type": "string"
         },
         "metric": {
           "type": "object",

From fa031a0e2d8a5b8dada9c76e679c0e14603aacea Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Tue, 26 Apr 2022 09:04:34 +0530
Subject: [PATCH 073/177] feat: Adds support for canned responses in contact
 messages (#4453)

---
 .../conversation/contact/ConversationForm.vue | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index 2f309964a..f2d262644 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -59,6 +59,13 @@
       </div>
       <div class="row">
         <div class="columns">
+          <div class="canned-response">
+            <canned-response
+              v-if="showCannedResponseMenu && hasSlashCommand"
+              :search-key="cannedResponseSearchKey"
+              @click="replaceTextWithCannedResponse"
+            />
+          </div>
           <div v-if="isAnEmailInbox || isAnWebWidgetInbox">
             <label>
               {{ $t('NEW_CONVERSATION.FORM.MESSAGE.LABEL') }}
@@ -113,6 +120,7 @@ import { mapGetters } from 'vuex';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import ReplyEmailHead from 'dashboard/components/widgets/conversation/ReplyEmailHead';
+import CannedResponse from 'dashboard/components/widgets/conversation/CannedResponse.vue';
 
 import alertMixin from 'shared/mixins/alertMixin';
 import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
@@ -124,6 +132,7 @@ export default {
     Thumbnail,
     WootMessageEditor,
     ReplyEmailHead,
+    CannedResponse,
   },
   mixins: [alertMixin],
   props: {
@@ -141,6 +150,8 @@ export default {
       name: '',
       subject: '',
       message: '',
+      showCannedResponseMenu: false,
+      cannedResponseSearchKey: '',
       selectedInbox: '',
       bccEmails: '',
       ccEmails: '',
@@ -211,6 +222,20 @@ export default {
       );
     },
   },
+  watch: {
+    message(value) {
+      this.hasSlashCommand = value[0] === '/';
+      const hasNextWord = value.includes(' ');
+      const isShortCodeActive = this.hasSlashCommand && !hasNextWord;
+      if (isShortCodeActive) {
+        this.cannedResponseSearchKey = value.substr(1, value.length);
+        this.showCannedResponseMenu = true;
+      } else {
+        this.cannedResponseSearchKey = '';
+        this.showCannedResponseMenu = false;
+      }
+    },
+  },
   methods: {
     onCancel() {
       this.$emit('cancel');
@@ -244,6 +269,11 @@ export default {
         }
       }
     },
+    replaceTextWithCannedResponse(message) {
+      setTimeout(() => {
+        this.message = message;
+      }, 50);
+    },
   },
 };
 </script>
@@ -251,9 +281,15 @@ export default {
 <style scoped lang="scss">
 .conversation--form {
   padding: var(--space-normal) var(--space-large) var(--space-large);
+}
 
-  .columns {
-    padding: 0 var(--space-smaller);
+.canned-response {
+  position: relative;
+  top: var(--space-medium);
+
+  ::v-deep .mention--box {
+    border-left: 1px solid var(--color-border);
+    border-right: 1px solid var(--color-border);
   }
 }
 

From 3a5e34fccb23b2c3f7054b00ba22a635fb4cacb3 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Tue, 26 Apr 2022 15:13:28 +0530
Subject: [PATCH 074/177] fix: Check `phone_number` and `email` changes are
 exist before validation (#4551)

---
 app/models/contact.rb       |  4 ++--
 spec/models/contact_spec.rb | 40 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/app/models/contact.rb b/app/models/contact.rb
index 304edf681..53dc9d281 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -145,13 +145,13 @@ class Contact < ApplicationRecord
   def phone_number_format
     return if phone_number.blank?
 
-    self.phone_number = changes['phone_number'].first unless phone_number.match?(/\+[1-9]\d{1,14}\z/)
+    self.phone_number = phone_number_was unless phone_number.match?(/\+[1-9]\d{1,14}\z/)
   end
 
   def email_format
     return if email.blank?
 
-    self.email = changes['email'].first unless email.match(Devise.email_regexp)
+    self.email = email_was unless email.match(Devise.email_regexp)
   end
 
   def prepare_contact_attributes
diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb
index f8b701a3a..416e0e68d 100644
--- a/spec/models/contact_spec.rb
+++ b/spec/models/contact_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Contact do
     it { is_expected.to have_many(:conversations).dependent(:destroy_async) }
   end
 
-  context 'pepare contact attributes before validation' do
+  context 'prepare contact attributes before validation' do
     it 'sets email to lowercase' do
       contact = create(:contact, email: 'Test@test.com')
       expect(contact.email).to eq('test@test.com')
@@ -43,4 +43,42 @@ RSpec.describe Contact do
       expect(contact.additional_attributes).to eq({})
     end
   end
+
+  # rubocop:disable Rails/SkipsModelValidations
+  context 'when phone number format' do
+    it 'will not throw error for existing invalid phone number' do
+      contact = create(:contact)
+      contact.update_column(:phone_number, '344234')
+      contact.reload
+      expect(contact.update!(name: 'test')).to eq true
+      expect(contact.phone_number).to eq '344234'
+    end
+
+    it 'updates phone number when adding valid phone number' do
+      contact = create(:contact)
+      contact.update_column(:phone_number, '344234')
+      contact.reload
+      expect(contact.update!(phone_number: '+12312312321')).to eq true
+      expect(contact.phone_number).to eq '+12312312321'
+    end
+  end
+
+  context 'when email format' do
+    it 'will not throw error for existing invalid email' do
+      contact = create(:contact)
+      contact.update_column(:email, 'ssfdasdf <test@test')
+      contact.reload
+      expect(contact.update!(name: 'test')).to eq true
+      expect(contact.email).to eq 'ssfdasdf <test@test'
+    end
+
+    it 'updates email when adding valid email' do
+      contact = create(:contact)
+      contact.update_column(:email, 'ssfdasdf <test@test')
+      contact.reload
+      expect(contact.update!(email: 'test@test.com')).to eq true
+      expect(contact.email).to eq 'test@test.com'
+    end
+  end
+  # rubocop:enable Rails/SkipsModelValidations
 end

From 1bf2da180bc33074173063cbc813db3cd5fb62a1 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Tue, 26 Apr 2022 18:22:13 +0530
Subject: [PATCH 075/177] fix: Update agent metrics query to show data from
 current account (#4557)

* Update agent metrics query to fetch data from current account
---
 app/builders/v2/report_builder.rb                    |  8 ++++----
 app/javascript/dashboard/i18n/locale/en/report.json  |  8 ++++----
 .../reports/components/overview/AgentTable.vue       | 12 ++++++------
 .../routes/dashboard/settings/reports/constants.js   |  2 +-
 .../api/v2/accounts/report_controller_spec.rb        |  9 ++++++---
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 459c0759a..475a34ccb 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -4,7 +4,7 @@ class V2::ReportBuilder
   attr_reader :account, :params
 
   DEFAULT_GROUP_BY = 'day'.freeze
-  AGENT_RESULTS_PER_PAGE = 10
+  AGENT_RESULTS_PER_PAGE = 25
 
   def initialize(account, params)
     @account = account
@@ -46,7 +46,7 @@ class V2::ReportBuilder
     if params[:type].equal?(:account)
       conversations
     else
-      agent_metrics
+      agent_metrics.sort_by { |hash| hash[:metric][:open] }.reverse
     end
   end
 
@@ -95,10 +95,10 @@ class V2::ReportBuilder
   end
 
   def conversations
-    @open_conversations = scope.conversations.open
+    @open_conversations = scope.conversations.where(account_id: @account.id).open
     first_response_count = scope.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
     metric = {
-      total: @open_conversations.count,
+      open: @open_conversations.count,
       unattended: @open_conversations.count - first_response_count
     }
     metric[:unassigned] = @open_conversations.unassigned.count if params[:type].equal?(:account)
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index a774dff33..35a349b56 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -387,18 +387,18 @@
     "LIVE": "Live",
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
-      "LOADING_MESSAGE": "Conversations Loading...",
-      "TOTAL" : "Total",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN" : "Open",
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Unassigned"
     },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
-      "LOADING_MESSAGE": "Agents Loading...",
+      "LOADING_MESSAGE": "Loading agent metrics...",
       "NO_AGENTS": "There are no conversations by agents",
       "TABLE_HEADER": {
         "AGENT": "Agent",
-        "TOTAL": "Total",
+        "OPEN": "OPEN",
         "UNATTENDED": "Unattended",
         "STATUS": "Status"
       }
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 55a93d2fe..2a5694feb 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
@@ -20,8 +20,8 @@
       <ve-pagination
         :total="totalAgents"
         :page-index="pageIndex"
-        :page-size="10"
-        :page-size-option="[10]"
+        :page-size="25"
+        :page-size-option="[25]"
         @on-page-number-change="onPageNumberChange"
       />
     </div>
@@ -70,7 +70,7 @@ export default {
           agent: agent.name,
           email: agent.email,
           thumbnail: agent.thumbnail,
-          total: agent.metric.total || 0,
+          open: agent.metric.open || 0,
           unattended: agent.metric.unattended || 0,
           status: agent.availability,
         };
@@ -103,10 +103,10 @@ export default {
           ),
         },
         {
-          field: 'total',
-          key: 'total',
+          field: 'open',
+          key: 'open',
           title: this.$t(
-            'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.TOTAL'
+            'OVERVIEW_REPORTS.AGENT_CONVERSATIONS.TABLE_HEADER.OPEN'
           ),
           align: 'left',
           width: 10,
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
index 88f04b0f1..1e345fe22 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/constants.js
@@ -123,7 +123,7 @@ export const METRIC_CHART = {
 };
 
 export const OVERVIEW_METRICS = {
-  total: 'TOTAL',
+  open: 'OPEN',
   unattended: 'UNATTENDED',
   unassigned: 'UNASSIGNED',
   online: 'ONLINE',
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index 8c6f989c8..acad237ec 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe 'Reports API', type: :request do
   let(:default_timezone) { ActiveSupport::TimeZone[0]&.name }
   let(:date_timestamp) { Time.current.in_time_zone(default_timezone).beginning_of_day.to_i }
   let(:params) { { timezone_offset: Time.zone.utc_offset } }
+  let(:new_account) { create(:account) }
 
   before do
     create_list(:conversation, 10, account: account, inbox: inbox,
@@ -73,7 +74,7 @@ RSpec.describe 'Reports API', type: :request do
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
 
-        expect(json_response['total']).to eq(11)
+        expect(json_response['open']).to eq(11)
         expect(json_response['unattended']).to eq(11)
         expect(json_response['unassigned']).to eq(1)
       end
@@ -81,6 +82,8 @@ RSpec.describe 'Reports API', type: :request do
       it 'return conversation metrics for user in account level' do
         create_list(:conversation, 2, account: account, inbox: inbox,
                                       assignee: admin, created_at: Time.zone.today)
+        create_list(:conversation, 2, account: new_account, inbox: inbox,
+                                      assignee: admin, created_at: Time.zone.today)
 
         get "/api/v2/accounts/#{account.id}/reports/conversations",
             params: {
@@ -96,7 +99,7 @@ RSpec.describe 'Reports API', type: :request do
         user_metrics = json_response.find { |item| item['name'] == admin[:name] }
         expect(user_metrics.present?).to be true
 
-        expect(user_metrics['metric']['total']).to eq(2)
+        expect(user_metrics['metric']['open']).to eq(2)
         expect(user_metrics['metric']['unattended']).to eq(2)
       end
 
@@ -116,7 +119,7 @@ RSpec.describe 'Reports API', type: :request do
 
         json_response = JSON.parse(response.body)
         expect(json_response.blank?).to be false
-        expect(json_response[0]['metric']['total']).to eq(10)
+        expect(json_response[0]['metric']['open']).to eq(10)
         expect(json_response[0]['metric']['unattended']).to eq(10)
       end
     end

From 3d824855f0d8ceba733092f8048e809a92d5628a Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Wed, 27 Apr 2022 08:12:30 +0530
Subject: [PATCH 076/177] Fix positioning of read ticks on attachment message
 bubbles (#4545)

* Fix positioning of read ticks

* Review fixes

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: iamsivin <iamsivin@gmail.com>
---
 .../widgets/conversation/bubble/Actions.vue         | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index 86f97f400..c1c3440bc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -1,6 +1,8 @@
 <template>
   <div class="message-text--metadata">
-    <span class="time">{{ readableTime }}</span>
+    <span class="time" :class="{ delivered: messageRead }">{{
+      readableTime
+    }}</span>
     <span v-if="showSentIndicator" class="time">
       <fluent-icon
         v-tooltip.top-start="$t('CHAT_LIST.SENT')"
@@ -252,6 +254,15 @@ export default {
       position: absolute;
       right: var(--space-small);
       white-space: nowrap;
+      &.delivered {
+        right: var(--space-medium);
+        line-height: 2;
+      }
+    }
+    .read-tick {
+      position: absolute;
+      bottom: var(--space-small);
+      right: var(--space-small);
     }
   }
 }

From 4250c40d1d550511eb0d9788c7353e94846dca78 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 27 Apr 2022 18:33:22 +0530
Subject: [PATCH 077/177] chore: Upgrade rails to 6.1.5.1 (#4570)

---
 Gemfile.lock | 116 +++++++++++++++++++++++++--------------------------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2789f09da..9edce0f36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,63 +9,63 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actioncable (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionmailbox (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionmailer (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      actionview (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.7)
-      actionview (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionpack (6.1.5.1)
+      actionview (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actiontext (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    actionview (6.1.5.1)
+      activesupport (= 6.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_query_trace (1.8)
-    activejob (6.1.4.7)
-      activesupport (= 6.1.4.7)
+    activejob (6.1.5.1)
+      activesupport (= 6.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.7)
-      activesupport (= 6.1.4.7)
-    activerecord (6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    activemodel (6.1.5.1)
+      activesupport (= 6.1.5.1)
+    activerecord (6.1.5.1)
+      activemodel (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
     activerecord-import (1.3.0)
       activerecord (>= 4.2)
-    activestorage (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
-      marcel (~> 1.0.0)
+    activestorage (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.7)
+    activesupport (6.1.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -136,7 +136,7 @@ GEM
     climate_control (1.0.1)
     coderay (1.1.3)
     commonmarker (0.23.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     connection_pool (2.2.5)
     crack (0.4.5)
       rexml
@@ -349,7 +349,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -419,31 +419,31 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-timeout (0.6.0)
-    rails (6.1.4.7)
-      actioncable (= 6.1.4.7)
-      actionmailbox (= 6.1.4.7)
-      actionmailer (= 6.1.4.7)
-      actionpack (= 6.1.4.7)
-      actiontext (= 6.1.4.7)
-      actionview (= 6.1.4.7)
-      activejob (= 6.1.4.7)
-      activemodel (= 6.1.4.7)
-      activerecord (= 6.1.4.7)
-      activestorage (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    rails (6.1.5.1)
+      actioncable (= 6.1.5.1)
+      actionmailbox (= 6.1.5.1)
+      actionmailer (= 6.1.5.1)
+      actionpack (= 6.1.5.1)
+      actiontext (= 6.1.5.1)
+      actionview (= 6.1.5.1)
+      activejob (= 6.1.5.1)
+      activemodel (= 6.1.5.1)
+      activerecord (= 6.1.5.1)
+      activestorage (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.7)
+      railties (= 6.1.5.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.7)
-      actionpack (= 6.1.4.7)
-      activesupport (= 6.1.4.7)
+    railties (6.1.5.1)
+      actionpack (= 6.1.5.1)
+      activesupport (= 6.1.5.1)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -755,4 +755,4 @@ RUBY VERSION
    ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.8
+   2.3.9

From 95c7a24dd1fc05fb2a692c5b4e14bda8ce85be2b Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Wed, 27 Apr 2022 18:56:35 +0530
Subject: [PATCH 078/177] fix: Unattendeed conversation count in agent metrics
 (#4568)

---
 app/builders/v2/report_builder.rb             |  2 +-
 .../api/v2/accounts/report_controller_spec.rb | 44 ++++++++++++++-----
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/app/builders/v2/report_builder.rb b/app/builders/v2/report_builder.rb
index 475a34ccb..5cd8b4a63 100644
--- a/app/builders/v2/report_builder.rb
+++ b/app/builders/v2/report_builder.rb
@@ -96,7 +96,7 @@ class V2::ReportBuilder
 
   def conversations
     @open_conversations = scope.conversations.where(account_id: @account.id).open
-    first_response_count = scope.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
+    first_response_count = @account.reporting_events.where(name: 'first_response', conversation_id: @open_conversations.pluck('id')).count
     metric = {
       open: @open_conversations.count,
       unattended: @open_conversations.count - first_response_count
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index acad237ec..c14b570d2 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -58,7 +58,11 @@ RSpec.describe 'Reports API', type: :request do
         expect(current_day_metric.length).to eq(1)
         expect(current_day_metric[0]['value']).to eq(10)
       end
+    end
+  end
 
+  describe 'GET /api/v2/accounts/:account_id/reports/conversations' do
+    context 'when it is an authenticated user' do
       it 'return conversation metrics in account level' do
         unassigned_conversation = create(:conversation, account: account, inbox: inbox,
                                                         assignee: nil, created_at: Time.zone.today)
@@ -102,25 +106,45 @@ RSpec.describe 'Reports API', type: :request do
         expect(user_metrics['metric']['open']).to eq(2)
         expect(user_metrics['metric']['unattended']).to eq(2)
       end
+    end
 
-      it 'return conversation metrics for specific user in account level' do
-        create_list(:conversation, 2, account: account, inbox: inbox,
-                                      assignee: admin, created_at: Time.zone.today)
+    context 'when an agent1 associated to conversation having first reply from agent2' do
+      let(:listener) { ReportingEventListener.instance }
+      let(:account) { create(:account) }
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'returns unattended conversation count zero for agent1' do
+        agent1 = create(:user, account: account, role: :agent)
+        agent2 = create(:user, account: account, role: :agent)
+        conversation = create(:conversation, account: account,
+                                             inbox: inbox, assignee: agent2)
+
+        create(:message, message_type: 'incoming', content: 'Hi',
+                         account: account, inbox: inbox,
+                         conversation: conversation)
+        first_reply_message = create(:message, message_type: 'outgoing', content: 'Hi',
+                                               account: account, inbox: inbox, sender: agent2,
+                                               conversation: conversation)
+
+        event = Events::Base.new('first.reply.created', Time.zone.now, message: first_reply_message)
+        listener.first_reply_created(event)
+
+        conversation.assignee_id = agent1.id
+        conversation.save!
 
         get "/api/v2/accounts/#{account.id}/reports/conversations",
             params: {
-              type: :agent,
-              user_id: user.id
+              type: :agent
             },
             headers: admin.create_new_auth_token,
             as: :json
 
-        expect(response).to have_http_status(:success)
-
         json_response = JSON.parse(response.body)
-        expect(json_response.blank?).to be false
-        expect(json_response[0]['metric']['open']).to eq(10)
-        expect(json_response[0]['metric']['unattended']).to eq(10)
+        user_metrics = json_response.find { |item| item['name'] == agent1[:name] }
+        expect(user_metrics.present?).to be true
+
+        expect(user_metrics['metric']['open']).to eq(1)
+        expect(user_metrics['metric']['unattended']).to eq(0)
       end
     end
   end

From 8348392d43b79950bb6c307629201b711aaabe40 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 27 Apr 2022 20:10:40 +0530
Subject: [PATCH 079/177] fix: Disable automation on tweets (#4571)

Fixes #4565
---
 .../automation_rules/action_service.rb        |  10 ++
 .../automation_rule_listener_spec.rb          | 110 +++++++++---------
 2 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index e88ca06dd..12bb95cb9 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -22,6 +22,8 @@ class AutomationRules::ActionService
   private
 
   def send_attachment(blob_ids)
+    return if conversation_a_tweet?
+
     return unless @rule.files.attached?
 
     blob = ActiveStorage::Blob.find(blob_ids)
@@ -61,6 +63,8 @@ class AutomationRules::ActionService
   end
 
   def send_message(message)
+    return if conversation_a_tweet?
+
     params = { content: message[0], private: false, content_attributes: { automation_rule_id: @rule.id } }
     mb = Messages::MessageBuilder.new(nil, @conversation, params)
     mb.perform
@@ -101,4 +105,10 @@ class AutomationRules::ActionService
   def team_belongs_to_account?(team_ids)
     @account.team_ids.include?(team_ids[0])
   end
+
+  def conversation_a_tweet?
+    return false if @conversation.additional_attributes.blank?
+
+    @conversation.additional_attributes['type'] == 'tweet'
+  end
 end
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 6213e4450..6ab931554 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -4,9 +4,8 @@ describe AutomationRuleListener do
   let!(:account) { create(:account) }
   let(:inbox) { create(:inbox, account: account) }
   let(:contact) { create(:contact, account: account, identifier: '123') }
-  let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: inbox) }
-  let(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: inbox, account: account) }
-  let(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
+  let(:conversation) { create(:conversation, inbox: inbox, account: account) }
+  let!(:automation_rule) { create(:automation_rule, account: account, name: 'Test Automation Rule') }
   let(:team) { create(:team, account: account) }
   let(:user_1) { create(:user, role: 0) }
   let(:user_2) { create(:user, role: 0) }
@@ -214,30 +213,23 @@ describe AutomationRuleListener do
     context 'when rule matches' do
       it 'triggers automation rule to assign team' do
         expect(conversation.team_id).not_to eq(team.id)
-
-        automation_rule
         listener.conversation_updated(event)
-
         conversation.reload
+
         expect(conversation.team_id).to eq(team.id)
       end
 
       it 'triggers automation rule to add label' do
         expect(conversation.labels).to eq([])
-
-        automation_rule
         listener.conversation_updated(event)
-
         conversation.reload
+
         expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
       end
 
       it 'triggers automation rule to assign best agents' do
         expect(conversation.assignee).to be_nil
-
-        automation_rule
         listener.conversation_updated(event)
-
         conversation.reload
 
         expect(conversation.assignee).to eq(user_1)
@@ -245,21 +237,14 @@ describe AutomationRuleListener do
 
       it 'triggers automation rule send email transcript to the mentioned email' do
         mailer = double
-
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.conversation_updated(event)
-
         conversation.reload
 
         allow(mailer).to receive(:conversation_transcript)
       end
 
       it 'triggers automation rule send email to the team' do
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
 
         listener.conversation_updated(event)
@@ -267,13 +252,8 @@ describe AutomationRuleListener do
 
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages).to be_empty
-
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.conversation_updated(event)
-
         conversation.reload
 
         expect(conversation.messages.first.content).to eq('Send this message.')
@@ -299,38 +279,26 @@ describe AutomationRuleListener do
     context 'when rule matches' do
       it 'triggers automation rule to assign team' do
         expect(conversation.team_id).not_to eq(team.id)
-
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.message_created(event)
-
         conversation.reload
+
         expect(conversation.team_id).to eq(team.id)
       end
 
       it 'triggers automation rule to add label' do
         expect(conversation.labels).to eq([])
-
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.message_created(event)
-
         conversation.reload
+
         expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
       end
 
       it 'triggers automation rule to assign best agent' do
         expect(conversation.assignee).to be_nil
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.message_created(event)
-
         conversation.reload
 
         expect(conversation.assignee).to eq(user_1)
@@ -338,13 +306,8 @@ describe AutomationRuleListener do
 
       it 'triggers automation rule send email transcript to the mentioned email' do
         mailer = double
-
-        automation_rule
-
         expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
-
         listener.message_created(event)
-
         conversation.reload
 
         allow(mailer).to receive(:conversation_transcript)
@@ -381,21 +344,18 @@ describe AutomationRuleListener do
     context 'when rule matches' do
       it 'triggers automation rule send email transcript to the mentioned email' do
         mailer = double
-
-        automation_rule
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript)
 
         listener.message_created(event)
-
         conversation.reload
 
-        allow(mailer).to receive(:conversation_transcript)
+        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'new_agent@example.com')
       end
 
       it 'triggers automation rule send message to the contacts' do
         expect(conversation.messages.count).to eq(1)
-
         listener.message_created(event)
-
         conversation.reload
 
         expect(conversation.messages.count).to eq(2)
@@ -416,9 +376,7 @@ describe AutomationRuleListener do
 
       it 'triggers automation rule but wont send message' do
         expect(conversation.messages.count).to eq(1)
-
         listener.message_created(event)
-
         conversation.reload
 
         expect(conversation.messages.count).to eq(1)
@@ -455,14 +413,14 @@ describe AutomationRuleListener do
     context 'when rule matches' do
       it 'triggers automation rule send email transcript to the mentioned email' do
         mailer = double
-
-        automation_rule
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript)
 
         listener.conversation_created(event)
 
         conversation.reload
 
-        allow(mailer).to receive(:conversation_transcript)
+        expect(mailer).to have_received(:conversation_transcript).with(conversation, 'new_agent@example.com')
       end
 
       it 'triggers automation rule send message to the contacts' do
@@ -501,4 +459,48 @@ describe AutomationRuleListener do
       end
     end
   end
+
+  describe '#message_created for tweet events' do
+    before do
+      automation_rule.update!(
+        event_name: 'message_created',
+        name: 'Call actions message created',
+        description: 'Send Message in the conversation',
+        conditions: [
+          { attribute_key: 'status', filter_operator: 'equal_to', values: ['open'], query_operator: nil }.with_indifferent_access
+        ],
+        actions: [
+          { 'action_name' => 'send_message', 'action_params' => ['Send this message.'] },
+          { 'action_name' => 'send_attachment', 'action_params' => [123] },
+          { 'action_name' => 'send_email_transcript', 'action_params' => ['new_agent@example.com'] }
+        ]
+      )
+    end
+
+    context 'when rule matches' do
+      let(:tweet) { create(:conversation, additional_attributes: { type: 'tweet' }, inbox: inbox, account: account) }
+      let(:event) { Events::Base.new('message_created', Time.zone.now, { conversation: tweet, message: message }) }
+      let!(:message) { create(:message, account: account, conversation: tweet, message_type: 'incoming') }
+
+      it 'triggers automation rule except send_message and send_attachment' do
+        mailer = double
+        allow(ConversationReplyMailer).to receive(:with).and_return(mailer)
+        allow(mailer).to receive(:conversation_transcript)
+
+        listener.message_created(event)
+        expect(mailer).to have_received(:conversation_transcript).with(tweet, 'new_agent@example.com')
+      end
+
+      it 'does not triggers automation rule send message or send attachment' do
+        expect(tweet.messages.count).to eq(1)
+
+        listener.message_created(event)
+
+        tweet.reload
+
+        expect(tweet.messages.count).to eq(1)
+        expect(tweet.messages.last.content).to eq(message.content)
+      end
+    end
+  end
 end

From cb38ec32679605ed579d680a6b70ae41a5e70da2 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 28 Apr 2022 01:14:03 +0530
Subject: [PATCH 080/177] chore: Allow Facebook channel to receive standby
 messages  (#4511)

---
 app/models/channel/facebook_page.rb           |  2 +-
 lib/integrations/facebook/message_parser.rb   | 19 ++++++++++---------
 .../slack/incoming_message_builder.rb         |  6 +++++-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/models/channel/facebook_page.rb b/app/models/channel/facebook_page.rb
index 6b36a3a54..ed599e6e2 100644
--- a/app/models/channel/facebook_page.rb
+++ b/app/models/channel/facebook_page.rb
@@ -54,7 +54,7 @@ class Channel::FacebookPage < ApplicationRecord
     response = Facebook::Messenger::Subscriptions.subscribe(
       access_token: page_access_token,
       subscribed_fields: %w[
-        messages message_deliveries message_echoes message_reads
+        messages message_deliveries message_echoes message_reads standby messaging_handovers
       ]
     )
   rescue => e
diff --git a/lib/integrations/facebook/message_parser.rb b/lib/integrations/facebook/message_parser.rb
index d2b943c00..ea70ca442 100644
--- a/lib/integrations/facebook/message_parser.rb
+++ b/lib/integrations/facebook/message_parser.rb
@@ -3,43 +3,44 @@
 class Integrations::Facebook::MessageParser
   def initialize(response_json)
     @response = JSON.parse(response_json)
+    @messaging = @response['messaging'] || @response['standby']
   end
 
   def sender_id
-    @response.dig 'messaging', 'sender', 'id'
+    @messaging.dig('sender', 'id')
   end
 
   def recipient_id
-    @response.dig 'messaging', 'recipient', 'id'
+    @messaging.dig('recipient', 'id')
   end
 
   def time_stamp
-    @response.dig 'messaging', 'timestamp'
+    @messaging['timestamp']
   end
 
   def content
-    @response.dig 'messaging', 'message', 'text'
+    @messaging.dig('message', 'text')
   end
 
   def sequence
-    @response.dig 'messaging', 'message', 'seq'
+    @messaging.dig('message', 'seq')
   end
 
   def attachments
-    @response.dig 'messaging', 'message', 'attachments'
+    @messaging.dig('message', 'attachments')
   end
 
   def identifier
-    @response.dig 'messaging', 'message', 'mid'
+    @messaging.dig('message', 'mid')
   end
 
   def echo?
-    @response.dig 'messaging', 'message', 'is_echo'
+    @messaging.dig('message', 'is_echo')
   end
 
   # TODO : i don't think the payload contains app_id. if not remove
   def app_id
-    @response.dig 'messaging', 'message', 'app_id'
+    @messaging.dig('message', 'app_id')
   end
 
   # TODO : does this work ?
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index e655eef45..66d96be4a 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -34,7 +34,11 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def supported_message?
-    SUPPORTED_MESSAGE_TYPES.include?(message[:type]) if message.present?
+    if message.present?
+      SUPPORTED_MESSAGE_TYPES.include?(message[:type])
+    else
+      params[:event][:files].any?
+    end
   end
 
   def hook_verification?

From 8d04894744860c8979936227f9c7017dd7103062 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Thu, 28 Apr 2022 16:58:06 +0530
Subject: [PATCH 081/177] fix: Add index in conversation and reporting event
 (#4577)

Fixes chatwoot/product#422
---
 app/models/conversation.rb                            |  1 +
 app/models/reporting_event.rb                         | 11 ++++++-----
 ...5_add_index_to_conversation_and_reporting_event.rb |  6 ++++++
 db/schema.rb                                          |  4 +++-
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index cf3a4c256..ac02260a5 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -31,6 +31,7 @@
 #  index_conversations_on_assignee_id_and_account_id  (assignee_id,account_id)
 #  index_conversations_on_campaign_id                 (campaign_id)
 #  index_conversations_on_contact_inbox_id            (contact_inbox_id)
+#  index_conversations_on_last_activity_at            (last_activity_at)
 #  index_conversations_on_status_and_account_id       (status,account_id)
 #  index_conversations_on_team_id                     (team_id)
 #
diff --git a/app/models/reporting_event.rb b/app/models/reporting_event.rb
index 02f6e4d20..3568d2a06 100644
--- a/app/models/reporting_event.rb
+++ b/app/models/reporting_event.rb
@@ -17,11 +17,12 @@
 #
 # Indexes
 #
-#  index_reporting_events_on_account_id  (account_id)
-#  index_reporting_events_on_created_at  (created_at)
-#  index_reporting_events_on_inbox_id    (inbox_id)
-#  index_reporting_events_on_name        (name)
-#  index_reporting_events_on_user_id     (user_id)
+#  index_reporting_events_on_account_id       (account_id)
+#  index_reporting_events_on_conversation_id  (conversation_id)
+#  index_reporting_events_on_created_at       (created_at)
+#  index_reporting_events_on_inbox_id         (inbox_id)
+#  index_reporting_events_on_name             (name)
+#  index_reporting_events_on_user_id          (user_id)
 #
 
 class ReportingEvent < ApplicationRecord
diff --git a/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb b/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb
new file mode 100644
index 000000000..f1b982a8b
--- /dev/null
+++ b/db/migrate/20220428101325_add_index_to_conversation_and_reporting_event.rb
@@ -0,0 +1,6 @@
+class AddIndexToConversationAndReportingEvent < ActiveRecord::Migration[6.1]
+  def change
+    add_index :conversations, :last_activity_at
+    add_index :reporting_events, :conversation_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a30f6e6cf..cc619bc18 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_24_081117) do
+ActiveRecord::Schema.define(version: 2022_04_28_101325) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -361,6 +361,7 @@ ActiveRecord::Schema.define(version: 2022_04_24_081117) do
     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"
     t.index ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
+    t.index ["last_activity_at"], name: "index_conversations_on_last_activity_at"
     t.index ["status", "account_id"], name: "index_conversations_on_status_and_account_id"
     t.index ["team_id"], name: "index_conversations_on_team_id"
   end
@@ -662,6 +663,7 @@ ActiveRecord::Schema.define(version: 2022_04_24_081117) do
     t.datetime "event_start_time"
     t.datetime "event_end_time"
     t.index ["account_id"], name: "index_reporting_events_on_account_id"
+    t.index ["conversation_id"], name: "index_reporting_events_on_conversation_id"
     t.index ["created_at"], name: "index_reporting_events_on_created_at"
     t.index ["inbox_id"], name: "index_reporting_events_on_inbox_id"
     t.index ["name"], name: "index_reporting_events_on_name"

From 04194e7247715d53565de8e9c44b3e338c22eca8 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Thu, 28 Apr 2022 21:02:17 +0530
Subject: [PATCH 082/177] Fix: attachment name for incoming messages

Use original_filename to get the name of the file attached to the message.

Had to add the message_type method to the WhatsApp/incoming_message_service due to the Assignment Branch Condition linter error for the attach_files method.

Fixes #4183
---
 app/services/sms/incoming_message_service.rb      | 2 +-
 app/services/telegram/incoming_message_service.rb | 2 +-
 app/services/whatsapp/incoming_message_service.rb | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/services/sms/incoming_message_service.rb b/app/services/sms/incoming_message_service.rb
index eb0b5512b..a21f76b58 100644
--- a/app/services/sms/incoming_message_service.rb
+++ b/app/services/sms/incoming_message_service.rb
@@ -87,7 +87,7 @@ class Sms::IncomingMessageService
         file_type: file_type(attachment_file.content_type),
         file: {
           io: attachment_file,
-          filename: attachment_file,
+          filename: attachment_file.original_filename,
           content_type: attachment_file.content_type
         }
       )
diff --git a/app/services/telegram/incoming_message_service.rb b/app/services/telegram/incoming_message_service.rb
index 1647623be..7ff7a6155 100644
--- a/app/services/telegram/incoming_message_service.rb
+++ b/app/services/telegram/incoming_message_service.rb
@@ -105,7 +105,7 @@ class Telegram::IncomingMessageService
       file_type: file_content_type,
       file: {
         io: attachment_file,
-        filename: attachment_file,
+        filename: attachment_file.original_filename,
         content_type: attachment_file.content_type
       }
     )
diff --git a/app/services/whatsapp/incoming_message_service.rb b/app/services/whatsapp/incoming_message_service.rb
index 1a750b41a..c96e6e771 100644
--- a/app/services/whatsapp/incoming_message_service.rb
+++ b/app/services/whatsapp/incoming_message_service.rb
@@ -77,7 +77,6 @@ class Whatsapp::IncomingMessageService
   end
 
   def attach_files
-    message_type = params[:messages].first[:type]
     return if %w[text button interactive].include?(message_type)
 
     attachment_payload = params[:messages].first[message_type.to_sym]
@@ -89,9 +88,13 @@ class Whatsapp::IncomingMessageService
       file_type: file_content_type(message_type),
       file: {
         io: attachment_file,
-        filename: attachment_file,
+        filename: attachment_file.original_filename,
         content_type: attachment_file.content_type
       }
     )
   end
+
+  def message_type
+    params[:messages].first[:type]
+  end
 end

From e5136c2691da01ec22a5bda7e2b238d348a43eb7 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 28 Apr 2022 21:09:39 +0530
Subject: [PATCH 083/177] Fix: File upload from slack (#4494)

When you upload a file from slack chat it's not appearing in the chatwoot inbox.
This is because Slack updated the webhook event format
---
 spec/support/slack_stubs.rb | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/spec/support/slack_stubs.rb b/spec/support/slack_stubs.rb
index 7644b6872..e37676c92 100644
--- a/spec/support/slack_stubs.rb
+++ b/spec/support/slack_stubs.rb
@@ -22,17 +22,7 @@ module SlackStubs
   end
 
   def slack_attachment_stub
-    {
-      token: '[FILTERED]',
-      team_id: 'TLST3048H',
-      api_app_id: 'A012S5UETV4',
-      event: message_event,
-      type: 'event_callback',
-      event_id: 'Ev013QUX3WV6',
-      event_time: 1_588_623_033,
-      authed_users: '[FILTERED]',
-      webhook: {}
-    }
+    slack_message_stub.merge({ event: message_event_without_blocks })
   end
 
   def slack_message_stub_without_thread_ts
@@ -95,15 +85,26 @@ module SlackStubs
         elements: [
           {
             type: 'rich_text_section',
-            elements: [
-              {
-                type: 'text',
-                text: 'this is test'
-              }
-            ]
+            elements: [{
+              type: 'text',
+              text: 'this is test'
+            }]
           }
         ]
       }
     ]
   end
+
+  def message_event_without_blocks
+    {
+      client_msg_id: 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
+      type: 'message',
+      text: 'this is test <https://chatwoot.com> Hey <@U019KT237LP|Sojan> Test again',
+      user: 'ULYPAKE5S',
+      ts: '1588623033.006000',
+      files: file_stub,
+      thread_ts: '1588623023.005900',
+      channel: 'G01354F6A6Q'
+    }
+  end
 end

From b5e0921d0d9e5831aa477a015bb03fa06c84a994 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Fri, 29 Apr 2022 00:43:10 +0530
Subject: [PATCH 084/177] fix: sidekiq cron deprecation warnings (#4581)

Updates sidekiq-cron to fix the deprecation warnings

Fixes #4090
---
 Gemfile      |  2 +-
 Gemfile.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index e94303f45..9bc330d93 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,7 +104,7 @@ gem 'sentry-sidekiq'
 ##-- background job processing --##
 gem 'sidekiq', '~> 6.4.0'
 # We want cron jobs
-gem 'sidekiq-cron'
+gem 'sidekiq-cron', '~> 1.3'
 
 ##-- Push notification service --##
 gem 'fcm'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9edce0f36..ba8f04ec9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
     email_reply_trimmer (0.1.13)
     erubi (1.10.0)
     erubis (2.7.0)
-    et-orbi (1.2.6)
+    et-orbi (1.2.7)
       tzinfo
     execjs (2.8.1)
     facebook-messenger (2.0.1)
@@ -210,8 +210,8 @@ GEM
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
     foreman (0.87.2)
-    fugit (1.5.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     gapic-common (0.3.4)
       google-protobuf (~> 3.12, >= 3.12.2)
@@ -551,8 +551,8 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.2.0)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
+    sidekiq-cron (1.4.0)
+      fugit (~> 1)
       sidekiq (>= 4.2.1)
     signet (0.16.0)
       addressable (~> 2.8)
@@ -731,7 +731,7 @@ DEPENDENCIES
   sentry-sidekiq
   shoulda-matchers
   sidekiq (~> 6.4.0)
-  sidekiq-cron
+  sidekiq-cron (~> 1.3)
   simplecov (= 0.17.1)
   slack-ruby-client
   spring

From 45099f40f1575c8730e9795a54ea35ca69b395a1 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Fri, 29 Apr 2022 14:38:10 +0530
Subject: [PATCH 085/177] fix: ce spec action for PRs from forks (#4587)

CE spec action was failing for PRs from external forks at the checkout stage. This PR modifies the checkout action to use the full repo name and branch.

#4586
---
 .github/workflows/run_foss_spec.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index 3a6ff5f7b..395e063e7 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -42,7 +42,8 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        ref: ${{ github.head_ref }}
+        ref: ${{ github.event.pull_request.head.ref }}
+        repository: ${{ github.event.pull_request.head.repo.full_name }}
 
     - uses: ruby/setup-ruby@v1
       with:

From c1cc94e37c5da6d553df51f59ab0068e7b53bbc5 Mon Sep 17 00:00:00 2001
From: Shivam Chahar <chahar.shivam@yahoo.com>
Date: Fri, 29 Apr 2022 20:54:12 +0530
Subject: [PATCH 086/177] Fix: Accept phone number in public contact api
 (#4580)

This PR makes it possible to pass a phone number to the public contacts API.

Fixes #4023
---
 .../public/api/v1/inboxes/contacts_controller.rb          | 2 +-
 app/views/public/api/v1/models/_contact.json.jbuilder     | 1 +
 .../public/api/v1/inbox/contacts_controller_spec.rb       | 8 +++++---
 .../request/public/contact/create_update_payload.yml      | 5 ++++-
 swagger/swagger.json                                      | 4 ++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/public/api/v1/inboxes/contacts_controller.rb b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
index 6932386fd..eb794f2a0 100644
--- a/app/controllers/public/api/v1/inboxes/contacts_controller.rb
+++ b/app/controllers/public/api/v1/inboxes/contacts_controller.rb
@@ -43,6 +43,6 @@ class Public::Api::V1::Inboxes::ContactsController < Public::Api::V1::InboxesCon
   end
 
   def permitted_params
-    params.permit(:identifier, :identifier_hash, :email, :name, :avatar_url, custom_attributes: {})
+    params.permit(:identifier, :identifier_hash, :email, :name, :avatar_url, :phone_number, custom_attributes: {})
   end
 end
diff --git a/app/views/public/api/v1/models/_contact.json.jbuilder b/app/views/public/api/v1/models/_contact.json.jbuilder
index c35705c6c..fc9dbb2f2 100644
--- a/app/views/public/api/v1/models/_contact.json.jbuilder
+++ b/app/views/public/api/v1/models/_contact.json.jbuilder
@@ -1,3 +1,4 @@
 json.id resource.id
 json.name resource.name
 json.email resource.email
+json.phone_number resource.phone_number
diff --git a/spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb b/spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb
index 151a2eec5..5e412a65d 100644
--- a/spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb
+++ b/spec/controllers/public/api/v1/inbox/contacts_controller_spec.rb
@@ -10,7 +10,8 @@ RSpec.describe 'Public Inbox Contacts API', type: :request do
       post "/public/api/v1/inboxes/#{api_channel.identifier}/contacts"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
+      expect(data.keys).to include('email', 'id', 'name', 'phone_number', 'pubsub_token', 'source_id')
       expect(data['source_id']).not_to eq nil
       expect(data['pubsub_token']).not_to eq nil
     end
@@ -21,7 +22,8 @@ RSpec.describe 'Public Inbox Contacts API', type: :request do
       get "/public/api/v1/inboxes/#{api_channel.identifier}/contacts/#{contact_inbox.source_id}"
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
+      expect(data.keys).to include('email', 'id', 'name', 'phone_number', 'pubsub_token', 'source_id')
       expect(data['source_id']).to eq contact_inbox.source_id
       expect(data['pubsub_token']).to eq contact_inbox.pubsub_token
     end
@@ -33,7 +35,7 @@ RSpec.describe 'Public Inbox Contacts API', type: :request do
             params: { name: 'John Smith' }
 
       expect(response).to have_http_status(:success)
-      data = JSON.parse(response.body)
+      data = response.parsed_body
       expect(data['name']).to eq 'John Smith'
     end
   end
diff --git a/swagger/definitions/request/public/contact/create_update_payload.yml b/swagger/definitions/request/public/contact/create_update_payload.yml
index 9f1f820de..48c6e4550 100644
--- a/swagger/definitions/request/public/contact/create_update_payload.yml
+++ b/swagger/definitions/request/public/contact/create_update_payload.yml
@@ -10,9 +10,12 @@ properties:
   email:
     type: string
     description: Email of the contact
-  name: 
+  name:
     type: string
     description: Name of the contact
+  phone_number:
+    type: string
+    description: Phone number of the contact
   avatar_url:
     type: string
     description: The url to a jpeg, png file for the user avatar
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 81f19149c..ec1bf8a25 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -5268,6 +5268,10 @@
           "type": "string",
           "description": "Name of the contact"
         },
+        "phone_number": {
+          "type": "string",
+          "description": "Phone number of the contact"
+        },
         "avatar_url": {
           "type": "string",
           "description": "The url to a jpeg, png file for the user avatar"

From b3c8c8383099cc3bd42589e7feda778b25cb005c Mon Sep 17 00:00:00 2001
From: giquieu <giquieu@gmail.com>
Date: Mon, 2 May 2022 04:44:04 -0300
Subject: [PATCH 087/177] fix: unable to send audio messages on Telegram
 (#4493)

- Changed the lib used to record the audio (videojs-record).
- Changed the audio recording format to .ogg, this will keep compatibility with sending to channels, Telegram, Whatsapp, Web Widget and API.
- Changed the visualization of recording waves, it is now using bars, the same format used by applications (Whatsapp and Telegram)


Fixes: #4115
---
 .../assets/scss/widgets/_reply-box.scss       |  10 +
 .../widgets/WootWriter/AudioRecorder.vue      | 295 +++++++++---------
 .../widgets/conversation/ReplyBox.vue         |  32 +-
 .../FluentIcon/dashboard-icons.json           |   6 +-
 app/models/channel/telegram.rb                |   2 +
 config/webpack/environment.js                 |   9 +
 package.json                                  |   5 +-
 7 files changed, 184 insertions(+), 175 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index 8a53545fe..1d2c3f63d 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -27,6 +27,16 @@
       padding: 0 $space-small;
     }
 
+    .video-js {
+      background: transparent;
+      // Override min-height : 50px in foundation
+      //
+      max-height: $space-mega * 2.4;
+      min-height: 4.8rem;
+      padding: var(--space-normal) 0 0;
+      resize: none;
+    }
+
     >textarea {
       @include ghost-input();
       @include margin(0);
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 4d6df7793..8796065ac 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -1,16 +1,29 @@
 <template>
   <div class="audio-wave-wrapper">
-    <div id="audio-wave"></div>
+    <audio id="audio-wave" class="video-js vjs-fill vjs-default-skin"></audio>
   </div>
 </template>
 
 <script>
-import WaveSurfer from 'wavesurfer.js';
-import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js';
-import RecordRTC from 'recordrtc';
+import 'video.js/dist/video-js.css';
+import 'videojs-record/dist/css/videojs.record.css';
+
+import videojs from 'video.js';
+
 import inboxMixin from '../../../../shared/mixins/inboxMixin';
 import alertMixin from '../../../../shared/mixins/alertMixin';
 
+import Recorder from 'opus-recorder';
+import encoderWorker from 'opus-recorder/dist/encoderWorker.min';
+
+import WaveSurfer from 'wavesurfer.js';
+import MicrophonePlugin from 'wavesurfer.js/dist/plugin/wavesurfer.microphone.js';
+import 'videojs-wavesurfer/dist/videojs.wavesurfer.js';
+
+import 'videojs-record/dist/videojs.record.js';
+import 'videojs-record/dist/plugins/videojs.record.opus-recorder.js';
+import { format, addSeconds } from 'date-fns';
+
 WaveSurfer.microphone = MicrophonePlugin;
 
 export default {
@@ -18,104 +31,116 @@ export default {
   mixins: [inboxMixin, alertMixin],
   data() {
     return {
-      wavesurfer: false,
-      recorder: false,
-      recordingInterval: false,
-      recordingDateStarted: new Date().getTime(),
-      timeDuration: '00:00',
+      player: false,
+      recordingDateStarted: new Date(0),
       initialTimeDuration: '00:00',
-      options: {
-        container: '#audio-wave',
-        backend: 'WebAudio',
-        interact: true,
-        cursorWidth: 1,
-        plugins: [
-          WaveSurfer.microphone.create({
-            bufferSize: 4096,
-            numberOfInputChannels: 1,
-            numberOfOutputChannels: 1,
-            constraints: {
-              video: false,
-              audio: true,
-            },
-          }),
-        ],
-      },
-      optionsRecorder: {
-        type: 'audio',
-        mimeType: 'audio/wav',
-        disableLogs: true,
-        recorderType: RecordRTC.StereoAudioRecorder,
-        sampleRate: 44100,
-        numberOfAudioChannels: 2,
-        checkForInactiveTracks: true,
-        bufferSize: 4096,
+      recorderOptions: {
+        debug: true,
+        controls: true,
+        bigPlayButton: false,
+        fluid: false,
+        controlBar: {
+          deviceButton: false,
+          fullscreenToggle: false,
+          cameraButton: false,
+          volumePanel: false,
+        },
+        plugins: {
+          wavesurfer: {
+            backend: 'WebAudio',
+            waveColor: '#1f93ff',
+            progressColor: 'rgb(25, 118, 204)',
+            cursorColor: 'rgba(43, 51, 63, 0.7)',
+            backgroundColor: 'none',
+            barWidth: 1,
+            cursorWidth: 1,
+            hideScrollbar: true,
+            plugins: [
+              WaveSurfer.microphone.create({
+                bufferSize: 4096,
+                numberOfInputChannels: 1,
+                numberOfOutputChannels: 1,
+                constraints: {
+                  video: false,
+                  audio: true,
+                },
+              }),
+            ],
+          },
+          record: {
+            audio: true,
+            video: false,
+            displayMilliseconds: false,
+            maxLength: 300,
+            audioEngine: 'opus-recorder',
+            audioWorkerURL: encoderWorker,
+            audioChannels: 1,
+            audioSampleRate: 48000,
+            audioBitRate: 128,
+          },
+        },
       },
     };
   },
   computed: {
     isRecording() {
-      if (this.recorder) {
-        return this.recorder.getState() === 'recording';
-      }
-      return false;
+      return this.player && this.player.record().isRecording();
     },
   },
   mounted() {
-    this.wavesurfer = WaveSurfer.create(this.options);
-    this.wavesurfer.on('play', this.playingRecorder);
-    this.wavesurfer.on('pause', this.pausedRecorder);
-    this.wavesurfer.microphone.on('deviceReady', this.startRecording);
-    this.wavesurfer.microphone.on('deviceError', this.deviceError);
-    this.wavesurfer.microphone.start();
-    this.fireStateRecorderTimerChanged(this.initialTimeDuration);
+    window.Recorder = Recorder;
+    this.fireProgressRecord(this.initialTimeDuration);
+    this.player = videojs('#audio-wave', this.recorderOptions, () => {
+      this.$nextTick(() => {
+        this.player.record().getDevice();
+      });
+    });
+    this.player.on('deviceReady', this.deviceReady);
+    this.player.on('deviceError', this.deviceError);
+    this.player.on('startRecord', this.startRecord);
+    this.player.on('stopRecord', this.stopRecord);
+    this.player.on('progressRecord', this.progressRecord);
+    this.player.on('finishRecord', this.finishRecord);
+    this.player.on('playbackFinish', this.playbackFinish);
   },
   beforeDestroy() {
-    if (this.recorder) {
-      this.recorder.destroy();
+    if (this.player) {
+      this.player.dispose();
     }
-    if (this.wavesurfer) {
-      this.wavesurfer.destroy();
+    if (window.Recorder) {
+      window.Recorder = undefined;
     }
   },
   methods: {
-    startRecording(stream) {
-      this.recorder = RecordRTC(stream, this.optionsRecorder);
-      this.recorder.onStateChanged = this.onStateRecorderChanged;
-      this.recorder.startRecording();
+    deviceReady() {
+      this.player.record().start();
+    },
+    startRecord() {
+      this.fireStateRecorderChanged('recording');
+    },
+    stopRecord() {
+      this.fireStateRecorderChanged('stopped');
+    },
+    finishRecord() {
+      const file = new File(
+        [this.player.recordedData],
+        this.player.recordedData.name,
+        { type: this.player.recordedData.type }
+      );
+      this.fireRecorderBlob(file);
+    },
+    progressRecord() {
+      this.fireProgressRecord(this.formatTimeProgress());
     },
     stopAudioRecording() {
-      if (this.isRecording) {
-        this.recorder.stopRecording(() => {
-          this.wavesurfer.microphone.stopDevice();
-          this.wavesurfer.loadBlob(this.recorder.getBlob());
-          this.wavesurfer.stop();
-          this.fireRecorderBlob(this.getAudioFile());
-        });
-      }
+      this.player.record().stop();
     },
-    getAudioFile() {
-      if (this.hasAudio()) {
-        return new File([this.recorder.getBlob()], this.getAudioFileName(), {
-          type: 'audio/wav',
-        });
-      }
-      return false;
-    },
-    hasAudio() {
-      return !(this.isRecording || this.wavesurfer.isPlaying());
-    },
-    playingRecorder() {
-      this.fireStateRecorderChanged('playing');
-    },
-    pausedRecorder() {
-      this.fireStateRecorderChanged('paused');
-    },
-    deviceError(err) {
+    deviceError() {
+      const deviceError = this.player.deviceErrorCode;
+      const deviceErrorName = deviceError?.name.toLowerCase();
       if (
-        err?.name &&
-        (err.name.toLowerCase().includes('notallowederror') ||
-          err.name.toLowerCase().includes('permissiondeniederror'))
+        deviceErrorName?.includes('notallowederror') ||
+        deviceErrorName?.includes('permissiondeniederror')
       ) {
         this.showAlert(
           this.$t('CONVERSATION.REPLYBOX.TIP_AUDIORECORDER_PERMISSION')
@@ -127,56 +152,37 @@ export default {
         );
       }
     },
-    onStateRecorderChanged(state) {
-      // recording stopped inactive destroyed
-      switch (state) {
-        case 'recording':
-          this.timerDurationChanged();
-          break;
-        case 'stopped':
-          this.timerDurationChanged();
-          break;
-        default:
-          break;
-      }
-      this.fireStateRecorderChanged(state);
-    },
-    timerDurationChanged() {
-      if (this.isRecording) {
-        this.recordingInterval = setInterval(() => {
-          this.calculateTimeDuration(
-            (new Date().getTime() - this.recordingDateStarted) / 1000
-          );
-          this.fireStateRecorderTimerChanged(this.timeDuration);
-        }, 1000);
-      } else {
-        clearInterval(this.recordingInterval);
-      }
-    },
-    calculateTimeDuration(secs) {
-      let hr = Math.floor(secs / 3600);
-      let min = Math.floor((secs - hr * 3600) / 60);
-      let sec = Math.floor(secs - hr * 3600 - min * 60);
-      if (min < 10) {
-        min = '0' + min;
-      }
-      if (sec < 10) {
-        sec = '0' + sec;
-      }
-      if (hr <= 0) {
-        this.timeDuration = min + ':' + sec;
-      } else {
-        if (hr < 10) {
-          hr = '0' + hr;
-        }
-        this.timeDuration = hr + ':' + min + ':' + sec;
-      }
+    formatTimeProgress() {
+      return format(
+        addSeconds(
+          new Date(this.recordingDateStarted.getTimezoneOffset() * 1000 * 60),
+          this.player.record().getDuration()
+        ),
+        'mm:ss'
+      );
     },
     playPause() {
-      this.wavesurfer.playPause();
+      if (this.player.wavesurfer().surfer.isPlaying()) {
+        this.fireStateRecorderChanged('paused');
+      } else {
+        this.fireStateRecorderChanged('playing');
+      }
+      this.player.wavesurfer().surfer.playPause();
+    },
+    play() {
+      this.fireStateRecorderChanged('playing');
+      this.player.wavesurfer().play();
+    },
+    pause() {
+      this.fireStateRecorderChanged('paused');
+      this.player.wavesurfer().pause();
+    },
+    playbackFinish() {
+      this.fireStateRecorderChanged('paused');
+      this.player.wavesurfer().pause();
     },
     fireRecorderBlob(blob) {
-      this.$emit('recorder-blob', {
+      this.$emit('finish-record', {
         name: blob.name,
         type: blob.type,
         size: blob.size,
@@ -186,29 +192,8 @@ export default {
     fireStateRecorderChanged(state) {
       this.$emit('state-recorder-changed', state);
     },
-    fireStateRecorderTimerChanged(duration) {
-      this.$emit('state-recorder-timer-changed', duration);
-    },
-    getAudioFileName() {
-      const d = new Date();
-      return `audio-${d.getFullYear()}-${d.getMonth()}-${d.getDate()}-${this.getRandomString()}.wav`;
-    },
-    getRandomString() {
-      if (
-        window.crypto &&
-        window.crypto.getRandomValues &&
-        navigator.userAgent.indexOf('Safari') === -1
-      ) {
-        let a = window.crypto.getRandomValues(new Uint32Array(3));
-        let token = '';
-        for (let i = 0, l = a.length; i < l; i += 1) {
-          token += a[i].toString(36);
-        }
-        return token.toLowerCase();
-      }
-      return (Math.random() * new Date().getTime())
-        .toString(36)
-        .replace(/\./g, '');
+    fireProgressRecord(duration) {
+      this.$emit('state-recorder-progress-changed', duration);
     },
   },
 };
@@ -217,7 +202,9 @@ export default {
 <style lang="scss">
 .audio-wave-wrapper {
   min-height: 8rem;
-  max-height: 12rem;
-  overflow: hidden;
+  height: 8rem;
+}
+.video-js .vjs-control-bar {
+  background-color: transparent;
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index ae2b83f2a..9ecb8d15c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -36,9 +36,9 @@
       <woot-audio-recorder
         v-if="showAudioRecorderEditor"
         ref="audioRecorderInput"
-        @state-recorder-timer-changed="onStateRecorderTimerChanged"
+        @state-recorder-progress-changed="onStateProgressRecorderChanged"
         @state-recorder-changed="onStateRecorderChanged"
-        @recorder-blob="onRecorderBlob"
+        @finish-record="onFinishRecorder"
       />
       <resizable-text-area
         v-else-if="!showRichContentEditor"
@@ -103,7 +103,7 @@
       :show-emoji-picker="showEmojiPicker"
       :on-send="sendMessage"
       :is-send-disabled="isReplyButtonDisabled"
-      :recording-audio-duration-text="recordingAudioDuration"
+      :recording-audio-duration-text="recordingAudioDurationText"
       :recording-audio-state="recordingAudioState"
       :is-recording-audio="isRecordingAudio"
       :set-format-mode="setFormatMode"
@@ -193,7 +193,7 @@ export default {
       attachedFiles: [],
       isRecordingAudio: false,
       recordingAudioState: '',
-      recordingAudioDuration: '',
+      recordingAudioDurationText: '',
       isUploading: false,
       replyType: REPLY_EDITOR_MODES.REPLY,
       mentionSearchKey: '',
@@ -585,11 +585,13 @@ export default {
       }
     },
     toggleAudioRecorderPlayPause() {
-      if (this.isRecordingAudio && !this.isRecorderAudioStopped) {
-        this.isRecorderAudioStopped = true;
-        this.$refs.audioRecorderInput.stopAudioRecording();
-      } else if (this.isRecordingAudio && this.isRecorderAudioStopped) {
-        this.$refs.audioRecorderInput.playPause();
+      if (this.isRecordingAudio) {
+        if (!this.isRecorderAudioStopped) {
+          this.isRecorderAudioStopped = true;
+          this.$refs.audioRecorderInput.stopAudioRecording();
+        } else if (this.isRecorderAudioStopped) {
+          this.$refs.audioRecorderInput.playPause();
+        }
       }
     },
     hideEmojiPicker() {
@@ -612,19 +614,17 @@ export default {
     onFocus() {
       this.isFocused = true;
     },
-    onStateRecorderTimerChanged(time) {
-      this.recordingAudioDuration = time;
+    onStateProgressRecorderChanged(duration) {
+      this.recordingAudioDurationText = duration;
     },
     onStateRecorderChanged(state) {
       this.recordingAudioState = state;
-      if (state.includes('notallowederror')) {
+      if (state && 'notallowederror'.includes(state)) {
         this.toggleAudioRecorder();
       }
     },
-    onRecorderBlob(file) {
-      if (file) {
-        this.onFileUpload(file);
-      }
+    onFinishRecorder(file) {
+      return file && this.onFileUpload(file);
     },
     toggleTyping(status) {
       const conversationId = this.currentChat.id;
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 54dc0b627..cd52e47f0 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -90,9 +90,9 @@
   "more-vertical-outline": "M12 7.75a1.75 1.75 0 1 1 0-3.5 1.75 1.75 0 0 1 0 3.5ZM12 13.75a1.75 1.75 0 1 1 0-3.5 1.75 1.75 0 0 1 0 3.5ZM10.25 18a1.75 1.75 0 1 0 3.5 0 1.75 1.75 0 0 0-3.5 0Z",
   "microphone-outline": "M12,2A3,3 0 0,1 15,5V11A3,3 0 0,1 12,14A3,3 0 0,1 9,11V5A3,3 0 0,1 12,2M19,11C19,14.53 16.39,17.44 13,17.93V21H11V17.93C7.61,17.44 5,14.53 5,11H7A5,5 0 0,0 12,16A5,5 0 0,0 17,11H19Z",
   "microphone-off-outline": "M19,11C19,12.19 18.66,13.3 18.1,14.28L16.87,13.05C17.14,12.43 17.3,11.74 17.3,11H19M15,11.16L9,5.18V5A3,3 0 0,1 12,2A3,3 0 0,1 15,5V11L15,11.16M4.27,3L21,19.73L19.73,21L15.54,16.81C14.77,17.27 13.91,17.58 13,17.72V21H11V17.72C7.72,17.23 5,14.41 5,11H6.7C6.7,14 9.24,16.1 12,16.1C12.81,16.1 13.6,15.91 14.31,15.58L12.65,13.92L12,14A3,3 0 0,1 9,11V10.28L3,4.27L4.27,3Z",
-  "microphone-stop-outline": "M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4M9,9V15H15V9",
-  "microphone-pause-outline": "M13,16V8H15V16H13M9,16V8H11V16H9M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22A10,10 0 0,1 2,12A10,10 0 0,1 12,2M12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4Z",
-  "microphone-play-outline": "M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M10,16.5L16,12L10,7.5V16.5Z",
+  "microphone-stop-outline": "M18,18H6V6H18V18Z",
+  "microphone-pause-outline": "M14,19H18V5H14M6,19H10V5H6V19Z",
+  "microphone-play-outline": "M8,5.14V19.14L19,12.14L8,5.14Z",
   "number-symbol-outline": "M10.987 2.89a.75.75 0 1 0-1.474-.28L8.494 7.999 3.75 8a.75.75 0 1 0 0 1.5l4.46-.002-.946 5-4.514.002a.75.75 0 0 0 0 1.5l4.23-.002-.967 5.116a.75.75 0 1 0 1.474.278l1.02-5.395 5.474-.002-.968 5.119a.75.75 0 1 0 1.474.278l1.021-5.398 4.742-.002a.75.75 0 1 0 0-1.5l-4.458.002.946-5 4.512-.002a.75.75 0 1 0 0-1.5l-4.229.002.966-5.104a.75.75 0 0 0-1.474-.28l-1.018 5.385-5.474.002.966-5.107Zm-1.25 6.608 5.474-.003-.946 5-5.474.002.946-5Z",
   "open-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v11.5c0 .966.783 1.75 1.75 1.75h11.5a1.75 1.75 0 0 0 1.75-1.75v-4a.75.75 0 0 1 1.5 0v4A3.25 3.25 0 0 1 17.75 21H6.25A3.25 3.25 0 0 1 3 17.75V6.25A3.25 3.25 0 0 1 6.25 3h4a.75.75 0 0 1 0 1.5h-4ZM13 3.75a.75.75 0 0 1 .75-.75h6.5a.75.75 0 0 1 .75.75v6.5a.75.75 0 0 1-1.5 0V5.56l-5.22 5.22a.75.75 0 0 1-1.06-1.06l5.22-5.22h-4.69a.75.75 0 0 1-.75-.75Z",
   "people-outline": "M4 13.999 13 14a2 2 0 0 1 1.995 1.85L15 16v1.5C14.999 21 11.284 22 8.5 22c-2.722 0-6.335-.956-6.495-4.27L2 17.5v-1.501c0-1.054.816-1.918 1.85-1.995L4 14ZM15.22 14H20c1.054 0 1.918.816 1.994 1.85L22 16v1c-.001 3.062-2.858 4-5 4a7.16 7.16 0 0 1-2.14-.322c.336-.386.607-.827.802-1.327A6.19 6.19 0 0 0 17 19.5l.267-.006c.985-.043 3.086-.363 3.226-2.289L20.5 17v-1a.501.501 0 0 0-.41-.492L20 15.5h-4.051a2.957 2.957 0 0 0-.595-1.34L15.22 14H20h-4.78ZM4 15.499l-.1.01a.51.51 0 0 0-.254.136.506.506 0 0 0-.136.253l-.01.101V17.5c0 1.009.45 1.722 1.417 2.242.826.445 2.003.714 3.266.753l.317.005.317-.005c1.263-.039 2.439-.308 3.266-.753.906-.488 1.359-1.145 1.412-2.057l.005-.186V16a.501.501 0 0 0-.41-.492L13 15.5l-9-.001ZM8.5 3a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm9 2a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm-9-.5c-1.654 0-3 1.346-3 3s1.346 3 3 3 3-1.346 3-3-1.346-3-3-3Zm9 2c-1.103 0-2 .897-2 2s.897 2 2 2 2-.897 2-2-.897-2-2-2Z",
diff --git a/app/models/channel/telegram.rb b/app/models/channel/telegram.rb
index f086ec277..2b9db5679 100644
--- a/app/models/channel/telegram.rb
+++ b/app/models/channel/telegram.rb
@@ -90,6 +90,8 @@ class Channel::Telegram < ApplicationRecord
       telegram_attachment = {}
 
       case attachment[:file_type]
+      when 'audio'
+        telegram_attachment[:type] = 'audio'
       when 'image'
         telegram_attachment[:type] = 'photo'
       when 'file'
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 543fb1a7a..ee3f385f8 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -5,6 +5,15 @@ const vue = require('./loaders/vue');
 
 environment.plugins.prepend('VueLoaderPlugin', new VueLoaderPlugin());
 environment.loaders.prepend('vue', vue);
+
+environment.loaders.append('opus', {
+  test: /encoderWorker\.min\.js$/,
+  loader: 'file-loader',
+  options: {
+    name: '[name].[ext]',
+  },
+});
+
 environment.loaders.append('audio', {
   test: /\.(mp3)(\?.*)?$/,
   loader: 'url-loader',
diff --git a/package.json b/package.json
index 1a528849d..4330cfab4 100644
--- a/package.json
+++ b/package.json
@@ -46,17 +46,18 @@
     "marked": "4.0.10",
     "md5": "^2.3.0",
     "ninja-keys": "^1.1.9",
+    "opus-recorder": "^8.0.5",
     "posthog-js": "^1.13.7",
     "prosemirror-markdown": "1.5.1",
     "prosemirror-state": "1.3.4",
     "prosemirror-view": "1.18.4",
     "query-string": "5",
-    "recordrtc": "^5.6.2",
     "semver": "7.3.5",
     "spinkit": "~1.2.5",
     "tailwindcss": "^1.9.6",
     "url-loader": "^2.0.0",
     "v-tooltip": "~2.1.3",
+    "videojs-record": "^4.5.0",
     "vue": "2.6.12",
     "vue-axios": "~1.2.2",
     "vue-chartjs": "3.5.1",
@@ -75,7 +76,7 @@
     "vuelidate": "0.7.6",
     "vuex": "~2.1.1",
     "vuex-router-sync": "~4.1.2",
-    "wavesurfer.js": "^5.2.0"
+    "wavesurfer.js": "^6.0.4"
   },
   "devDependencies": {
     "@babel/core": "7.13.16",

From c9a8796a36244a18f9f209d602470f125f4e8726 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 5 May 2022 00:31:11 +0530
Subject: [PATCH 088/177] chore: Sentry Issue fixes (#4618)

Address the following sentry issues

fixes: #4616, #4617
---
 app/models/inbox_member.rb                    |  2 +-
 .../slack/incoming_message_builder.rb         |  2 +-
 spec/models/inbox_member_spec.rb              | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 spec/models/inbox_member_spec.rb

diff --git a/app/models/inbox_member.rb b/app/models/inbox_member.rb
index d0b5640d8..38970789c 100644
--- a/app/models/inbox_member.rb
+++ b/app/models/inbox_member.rb
@@ -32,6 +32,6 @@ class InboxMember < ApplicationRecord
   end
 
   def remove_agent_from_round_robin
-    ::RoundRobin::ManageService.new(inbox: inbox).remove_agent_from_queue(user_id)
+    ::RoundRobin::ManageService.new(inbox: inbox).remove_agent_from_queue(user_id) if inbox.present?
   end
 end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index 66d96be4a..b7c235b35 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -37,7 +37,7 @@ class Integrations::Slack::IncomingMessageBuilder
     if message.present?
       SUPPORTED_MESSAGE_TYPES.include?(message[:type])
     else
-      params[:event][:files].any?
+      params.dig(:event, :files).any?
     end
   end
 
diff --git a/spec/models/inbox_member_spec.rb b/spec/models/inbox_member_spec.rb
new file mode 100644
index 000000000..389fe75cb
--- /dev/null
+++ b/spec/models/inbox_member_spec.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe InboxMember do
+  include ActiveJob::TestHelper
+
+  describe '#DestroyAssociationAsyncJob' do
+    let(:inbox_member) { create(:inbox_member) }
+
+    # ref: https://github.com/chatwoot/chatwoot/issues/4616
+    context 'when parent inbox is destroyed' do
+      it 'enques and processes DestroyAssociationAsyncJob' do
+        perform_enqueued_jobs do
+          inbox_member.inbox.destroy!
+        end
+      end
+    end
+  end
+end

From 832a0f24a09fcdf79c909cf7cd2d8f74d0a22930 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 5 May 2022 19:29:51 +0530
Subject: [PATCH 089/177] chore: Update missing packages in yarn.lock (#4627)

---
 config/schedule.yml |   2 +-
 yarn.lock           | 199 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 193 insertions(+), 8 deletions(-)

diff --git a/config/schedule.yml b/config/schedule.yml
index 94aca4896..156a19787 100644
--- a/config/schedule.yml
+++ b/config/schedule.yml
@@ -16,6 +16,6 @@ trigger_scheduled_items_job:
 
 # executed At every 5th minute..
 trigger_imap_email_inboxes_job:
-  cron: '*/1 * * * *'
+  cron: '*/5 * * * *'
   class: 'Inboxes::FetchImapEmailInboxesJob'
   queue: scheduled_jobs
diff --git a/yarn.lock b/yarn.lock
index 959b40c3f..32b1fc9c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2794,6 +2794,47 @@
   dependencies:
     "@types/yargs-parser" "*"
 
+"@videojs/http-streaming@2.13.1":
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-2.13.1.tgz#b7688d91eec969181430e00868b514b16b3b21b7"
+  integrity sha512-1x3fkGSPyL0+iaS3/lTvfnPTtfqzfgG+ELQtPPtTvDwqGol9Mx3TNyZwtSTdIufBrqYRn7XybB/3QNMsyjq13A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "3.0.4"
+    aes-decrypter "3.1.2"
+    global "^4.4.0"
+    m3u8-parser "4.7.0"
+    mpd-parser "0.21.0"
+    mux.js "6.0.1"
+    video.js "^6 || ^7"
+
+"@videojs/vhs-utils@3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.4.tgz#e253eecd8e9318f767e752010d213587f94bb03a"
+  integrity sha512-hui4zOj2I1kLzDgf8QDVxD3IzrwjS/43KiS8IHQO0OeeSsb4pB/lgNt1NG7Dv0wMQfCccUpMVLGcK618s890Yg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
+
+"@videojs/vhs-utils@^3.0.0", "@videojs/vhs-utils@^3.0.2", "@videojs/vhs-utils@^3.0.4":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz#665ba70d78258ba1ab977364e2fe9f4d4799c46c"
+  integrity sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    global "^4.4.0"
+    url-toolkit "^2.2.1"
+
+"@videojs/xhr@2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@videojs/xhr/-/xhr-2.6.0.tgz#cd897e0ad54faf497961bcce3fa16dc15a26bb80"
+  integrity sha512-7J361GiN1tXpm+gd0xz2QWr3xNWBE+rytvo8J3KuggFaLg+U37gZQ2BuPLcnkfGffy2e+ozY70RHC8jt7zjA6Q==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+    global "~4.4.0"
+    is-function "^1.0.1"
+
 "@vue/compiler-core@3.0.11":
   version "3.0.11"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
@@ -3018,6 +3059,11 @@
     "@webassemblyjs/wast-parser" "1.9.0"
     "@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==
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -3100,6 +3146,16 @@ address@1.1.2, address@^1.0.1:
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
   integrity sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==
 
+aes-decrypter@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.1.2.tgz#3545546f8e9f6b878640339a242efe221ba7a7cb"
+  integrity sha512-42nRwfQuPRj9R1zqZBdoxnaAmnIFyDi0MNyTVhjdFOd8fifXKKRfwIHIZ6AMn1or4x5WONzjwRTbTWcsIQ0O4A==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+    pkcs7 "^1.0.4"
+
 aggregate-error@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
@@ -7333,7 +7389,7 @@ global-prefix@^3.0.0:
     kind-of "^6.0.2"
     which "^1.3.1"
 
-global@^4.4.0:
+global@^4.3.1, global@^4.4.0, global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
   integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
@@ -7977,6 +8033,11 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
 
+individual@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
+  integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
+
 infer-owner@^1.0.3, infer-owner@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
@@ -8321,7 +8382,7 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-function@^1.0.2:
+is-function@^1.0.1, is-function@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08"
   integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==
@@ -9347,6 +9408,11 @@ junk@^3.1.0:
   resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1"
   integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==
 
+keycode@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.1.tgz#09c23b2be0611d26117ea2501c2c391a01f39eff"
+  integrity sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -9775,6 +9841,15 @@ lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
+m3u8-parser@4.7.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.7.0.tgz#e01e8ce136098ade1b14ee691ea20fc4dc60abf6"
+  integrity sha512-48l/OwRyjBm+QhNNigEEcRcgbRvnUjL7rxs597HmW9QSNbyNvt+RcZ9T/d9vxi9A9z7EZrB1POtZYhdRlwYQkQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.0"
+    global "^4.4.0"
+
 magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
@@ -10193,6 +10268,16 @@ move-concurrently@^1.0.1:
     rimraf "^2.5.4"
     run-queue "^1.0.3"
 
+mpd-parser@0.21.0:
+  version "0.21.0"
+  resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.21.0.tgz#c2036cce19522383b93c973180fdd82cd646168e"
+  integrity sha512-NbpMJ57qQzFmfCiP1pbL7cGMbVTD0X1hqNgL0VYP1wLlZXLf/HtmvQpNkOA1AHkPVeGQng+7/jEtSvNUzV7Gdg==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/vhs-utils" "^3.0.2"
+    "@xmldom/xmldom" "^0.7.2"
+    global "^4.4.0"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -10231,6 +10316,14 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
+mux.js@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-6.0.1.tgz#65ce0f7a961d56c006829d024d772902d28c7755"
+  integrity sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==
+  dependencies:
+    "@babel/runtime" "^7.11.2"
+    global "^4.4.0"
+
 nan@^2.12.1:
   version "2.14.2"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
@@ -10683,6 +10776,11 @@ optionator@^0.8.1, optionator@^0.8.3:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
+opus-recorder@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/opus-recorder/-/opus-recorder-8.0.5.tgz#06d3e32e15da57ebc3f57e41b93033475fcb4e3e"
+  integrity sha512-tBRXc9Btds7i3bVfA7d5rekAlyOcfsivt5vSIXHxRV1Oa+s6iXFW8omZ0Lm3ABWotVcEyKt96iIIUcgbV07YOw==
+
 orderedmap@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789"
@@ -11077,6 +11175,13 @@ pirates@^4.0.0, pirates@^4.0.1:
   dependencies:
     node-modules-regexp "^1.0.0"
 
+pkcs7@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.4.tgz#6090b9e71160dabf69209d719cbafa538b00a1cb"
+  integrity sha512-afRERtHn54AlwaF2/+LFszyAANTCggGilmcmILUzEjvs3XgFZT+xE6+QWQcAGmu4xajy+Xtj7acLOPdx5/eXWQ==
+  dependencies:
+    "@babel/runtime" "^7.5.5"
+
 pkg-dir@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
@@ -12757,7 +12862,7 @@ recast@^0.18.1:
     private "^0.1.8"
     source-map "~0.6.1"
 
-recordrtc@^5.6.2:
+recordrtc@>=5.6.2:
   version "5.6.2"
   resolved "https://registry.yarnpkg.com/recordrtc/-/recordrtc-5.6.2.tgz#48fc214b35084973ccce82c6251198b5742bc327"
   integrity sha512-1QNKKNtl7+KcwD1lyOgP3ZlbiJ1d0HtXnypUy7yq49xEERxk31PHvE9RCciDrulPCY7WJ+oz0R9hpNxgsIurGQ==
@@ -13192,6 +13297,13 @@ run-queue@^1.0.0, run-queue@^1.0.3:
   dependencies:
     aproba "^1.1.1"
 
+rust-result@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
+  integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
+  dependencies:
+    individual "^2.0.0"
+
 rxjs@^6.3.3, rxjs@^6.5.3, rxjs@^6.6.7:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
@@ -13214,6 +13326,13 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1,
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+safe-json-parse@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
+  integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
+  dependencies:
+    rust-result "^1.0.0"
+
 safe-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
@@ -13315,6 +13434,11 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
+sdp@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/sdp/-/sdp-3.0.3.tgz#669958d54663ea9f4a46cc66518c9d980c52c61e"
+  integrity sha512-8EkfckS+XZQaPLyChu4ey7PghrdcraCVNpJe2Gfdi2ON1ylQ7OasuKX+b37R9slnRChwIAiQgt+oj8xXGD8x+A==
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -14872,6 +14996,11 @@ url-parse@^1.4.3, url-parse@^1.5.1:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url-toolkit@^2.2.1:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.2.5.tgz#58406b18e12c58803e14624df5e374f638b0f607"
+  integrity sha512-mtN6xk+Nac+oyJ/PrI7tzfmomRVNFIWKUbG8jdYFt52hxbiReFAXIjYskvu64/dvuW71IcB7lV8l0HvZMac6Jg==
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -15040,6 +15169,55 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+video.js@>=7.0.5, "video.js@^6 || ^7":
+  version "7.18.1"
+  resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.18.1.tgz#d93cd4992710d4d95574a00e7d29a2518f9b30f7"
+  integrity sha512-mnXdmkVcD5qQdKMZafDjqdhrnKGettZaGSVkExjACiylSB4r2Yt5W1bchsKmjFpfuNfszsMjTUnnoIWSSqoe/Q==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+    "@videojs/http-streaming" "2.13.1"
+    "@videojs/vhs-utils" "^3.0.4"
+    "@videojs/xhr" "2.6.0"
+    aes-decrypter "3.1.2"
+    global "^4.4.0"
+    keycode "^2.2.0"
+    m3u8-parser "4.7.0"
+    mpd-parser "0.21.0"
+    mux.js "6.0.1"
+    safe-json-parse "4.0.0"
+    videojs-font "3.2.0"
+    videojs-vtt.js "^0.15.3"
+
+videojs-font@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.2.0.tgz#212c9d3f4e4ec3fa7345167d64316add35e92232"
+  integrity sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==
+
+videojs-record@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/videojs-record/-/videojs-record-4.5.0.tgz#6156a52e879fecd7b5e371e2ace0c1853133407f"
+  integrity sha512-p/L6UaEZxCXVqzvH0TYCyUujHbymhqrEiF63KIjOatBxOhG7OVu4RiKEbkOlniBKr2sLoVOmC3vBuk+YBD3CXw==
+  dependencies:
+    recordrtc ">=5.6.2"
+    video.js ">=7.0.5"
+    videojs-wavesurfer ">=3.7.0"
+    webrtc-adapter ">=8.0.0"
+
+videojs-vtt.js@^0.15.3:
+  version "0.15.3"
+  resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.15.3.tgz#84260393b79487fcf195d9372f812d7fab83a993"
+  integrity sha512-5FvVsICuMRx6Hd7H/Y9s9GDeEtYcXQWzGMS+sl4UX3t/zoHp3y+isSfIPRochnTH7h+Bh1ILyC639xy9Z6kPag==
+  dependencies:
+    global "^4.3.1"
+
+videojs-wavesurfer@>=3.7.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/videojs-wavesurfer/-/videojs-wavesurfer-3.8.0.tgz#7c32ba65dc35df79681b0c4edd8b3f4ce47e0a63"
+  integrity sha512-qHucCBiEW+4dZ0Zp1k4R1elprUOV+QDw87UDA9QRXtO7GK/MrSdoe/TMFxP9SLnJCiX9xnYdf4OQgrmvJ9UVVw==
+  dependencies:
+    video.js ">=7.0.5"
+    wavesurfer.js ">=5.0.1"
+
 vm-browserify@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
@@ -15308,10 +15486,10 @@ watchpack@^1.7.4:
     chokidar "^3.4.1"
     watchpack-chokidar2 "^2.0.1"
 
-wavesurfer.js@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/wavesurfer.js/-/wavesurfer.js-5.2.0.tgz#efae107b5b561e9bfe3fffc50e6158136a17643e"
-  integrity sha512-SkPlTXfvKy+ZnEA7f7g7jn6iQg5/8mAvWpVV5vRbIS/FF9TB2ak9J7VayQfzfshOLW/CqccTiN6DDR/fZA902g==
+wavesurfer.js@>=5.0.1, wavesurfer.js@^6.0.4:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/wavesurfer.js/-/wavesurfer.js-6.1.0.tgz#c6d4a192cbe2cb60717c88ea3f0a95bedc3dd571"
+  integrity sha512-Ss8d4PC8r1vSE8Qtf3UhC6o4BWXL1J/tr9DFwshFW2pSZBdkzau6FzWGJUul3aoOZSFb+azC5F/m0I9F+vU72w==
 
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
@@ -15487,6 +15665,13 @@ webpack@4, webpack@^4.46.0:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
+webrtc-adapter@>=8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/webrtc-adapter/-/webrtc-adapter-8.1.1.tgz#e4a4dfd1b5085d119da40c4efc0147f7d0961cba"
+  integrity sha512-1yXevP7TeZGmklEXkvQVrZp3fOSJlLeXNGCA7NovQokxgP3/e2T3EVGL0eKU87S9vKppWjvRWqnJeSANEspOBg==
+  dependencies:
+    sdp "^3.0.2"
+
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"

From 66d366f0ff7768d4df154b731d80fb1ac73bc5c9 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 5 May 2022 23:57:55 +0530
Subject: [PATCH 090/177] chore: update newrelic gem to support log forwarding
 (#4626)

Newrelic gem 8.7 has application log forwarding support and
this is enabled by default. Update the gem to make use of this
feature. Chatwoot have turned this off by default though.

Set `NEW_RELIC_APPLICATION_LOGGING_ENABLED` to enable this feature. Make
sure to disable another log forwarding services you have to prevent
duplicated logs.

ref: https://docs.newrelic.com/docs/release-notes/agent-release-notes/ruby-release-notes/ruby-agent-870
Fixes: #4625
---
 .env.example        |  4 +++-
 Gemfile.lock        |  2 +-
 config/newrelic.yml | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index cc7e1c2dd..d46acac9f 100644
--- a/.env.example
+++ b/.env.example
@@ -161,13 +161,15 @@ USE_INBOX_AVATAR_FOR_BOT=true
 ## NewRelic
 # https://docs.newrelic.com/docs/agents/ruby-agent/configuration/ruby-agent-configuration/
 # NEW_RELIC_LICENSE_KEY=
+# Set this to true to allow newrelic apm to send logs.
+# This is turned off by default.
+# NEW_RELIC_APPLICATION_LOGGING_ENABLED=
 
 ## Datadog
 ## 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
diff --git a/Gemfile.lock b/Gemfile.lock
index ba8f04ec9..1e2147bc1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -376,7 +376,7 @@ GEM
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    newrelic_rpm (8.4.0)
+    newrelic_rpm (8.7.0)
     nio4r (2.5.8)
     nokogiri (1.13.4)
       mini_portile2 (~> 2.8.0)
diff --git a/config/newrelic.yml b/config/newrelic.yml
index 3ac93158f..f07ea34e6 100644
--- a/config/newrelic.yml
+++ b/config/newrelic.yml
@@ -24,6 +24,24 @@ common: &default_settings
   # Logging level for log/newrelic_agent.log
   log_level: <%= ENV.fetch('NEW_RELIC_LOG_LEVEL', 'info')  %>
 
+  application_logging:
+    # If `true`, all logging-related features for the agent can be enabled or disabled
+    # independently. If `false`, all logging-related features are disabled.
+    enabled: <%= ENV.fetch('NEW_RELIC_APPLICATION_LOGGING_ENABLED', false) %>
+    forwarding:
+      # If `true`, the agent captures log records emitted by this application.
+      enabled: true
+      # Defines the maximum number of log records to buffer in memory at a time.
+      max_samples_stored: 30000
+    metrics:
+      # If `true`, the agent captures metrics related to logging for this application.
+      enabled: true
+    local_decorating:
+      # If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans.
+      # This requires a log forwarder to send your log files to New Relic.
+      # This should not be used when forwarding is enabled.
+      enabled: false
+
 
 # Environment-specific settings are in this section.
 # RAILS_ENV or RACK_ENV (as appropriate) is used to determine the environment.

From 4f9d41962a3f98206297679ff65d72b9ab3af214 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Fri, 6 May 2022 12:01:34 +0530
Subject: [PATCH 091/177] fix: Pre chat custom fields drag and drop (#4530)

---
 .../dashboard/components/ui/Switch.vue        |  8 ++-----
 .../inbox/PreChatForm/PreChatFields.vue       | 22 ++++++++++++++-----
 .../settings/inbox/PreChatForm/Settings.vue   | 13 +++++++----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index 7dc4bcbfb..b0bc32881 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -17,12 +17,8 @@ export default {
     value: { type: Boolean, default: false },
   },
   methods: {
-    onClick(event) {
-      if (event.pointerId === -1) {
-        event.preventDefault();
-      } else {
-        this.$emit('input', !this.value);
-      }
+    onClick() {
+      this.$emit('input', !this.value);
     },
   },
 };
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
index 9d2691036..b1df3902a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/PreChatFields.vue
@@ -1,6 +1,6 @@
 <template>
-  <draggable v-model="preChatFields" tag="tbody">
-    <tr v-for="(item, index) in preChatFields" :key="index">
+  <draggable v-model="preChatFieldOptions" tag="tbody" @end="onDragEnd">
+    <tr v-for="(item, index) in preChatFieldOptions" :key="index">
       <td class="pre-chat-field"><fluent-icon icon="drag" /></td>
       <td class="pre-chat-field">
         <woot-switch
@@ -51,15 +51,27 @@ export default {
       type: Array,
       default: () => [],
     },
-    handlePreChatFieldOptions: {
-      type: Function,
-      default: () => {},
+  },
+  data() {
+    return {
+      preChatFieldOptions: this.preChatFields,
+    };
+  },
+  watch: {
+    preChatFields() {
+      this.preChatFieldOptions = this.preChatFields;
     },
   },
   methods: {
     isFieldEditable(item) {
       return !!standardFieldKeys[item.name] || !item.enabled;
     },
+    handlePreChatFieldOptions(event, type, item) {
+      this.$emit('update', event, type, item);
+    },
+    onDragEnd() {
+      this.$emit('drag-end', this.preChatFieldOptions);
+    },
   },
 };
 </script>
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 184e16e0f..15bed8dfa 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -26,8 +26,8 @@
             "
           />
         </label>
-        <label class="medium-8 columns">
-          {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}
+        <div class="medium-8 columns">
+          <label>{{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS') }}</label>
           <table class="table table-striped w-full">
             <thead class="thead-dark">
               <tr>
@@ -58,10 +58,11 @@
             </thead>
             <pre-chat-fields
               :pre-chat-fields="preChatFields"
-              :handle-pre-chat-field-options="handlePreChatFieldOptions"
+              @update="handlePreChatFieldOptions"
+              @drag-end="changePreChatFieldFieldsOrder"
             />
           </table>
-        </label>
+        </div>
       </div>
 
       <woot-submit-button
@@ -138,6 +139,10 @@ export default {
       });
     },
 
+    changePreChatFieldFieldsOrder(updatedPreChatFieldOptions) {
+      this.preChatFields = updatedPreChatFieldOptions;
+    },
+
     async updateInbox() {
       try {
         const payload = {

From 8d2b719dc1f3cd9261e0ca0998fdb86943ea11f8 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 6 May 2022 14:50:55 +0530
Subject: [PATCH 092/177] chore: Sentry issues (#4623)

Fixes various issues reported on sentry

- Twilio channel creation validation errors
- Room Channel error with nil class
- Webhook Uri exception
---
 app/builders/contact_builder.rb                              | 5 ++---
 app/builders/messages/facebook/message_builder.rb            | 2 +-
 app/channels/room_channel.rb                                 | 2 ++
 .../api/v1/accounts/channels/twilio_channels_controller.rb   | 1 -
 .../api/v1/accounts/conversations/base_controller.rb         | 2 +-
 app/finders/message_finder.rb                                | 2 +-
 app/jobs/hook_job.rb                                         | 2 +-
 lib/webhooks/trigger.rb                                      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/builders/contact_builder.rb b/app/builders/contact_builder.rb
index b63d72627..10ce8ee26 100644
--- a/app/builders/contact_builder.rb
+++ b/app/builders/contact_builder.rb
@@ -15,11 +15,10 @@ class ContactBuilder
   end
 
   def create_contact_inbox(contact)
-    ::ContactInbox.create!(
+    ::ContactInbox.create_with(hmac_verified: hmac_verified || false).find_or_create_by!(
       contact_id: contact.id,
       inbox_id: inbox.id,
-      source_id: source_id,
-      hmac_verified: hmac_verified || false
+      source_id: source_id
     )
   end
 
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 204b452d6..9c9b5829b 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -43,7 +43,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     return if contact.present?
 
     @contact = Contact.create!(contact_params.except(:remote_avatar_url))
-    @contact_inbox = ContactInbox.create(contact: contact, inbox: @inbox, source_id: @sender_id)
+    @contact_inbox = ContactInbox.find_or_create_by!(contact: contact, inbox: @inbox, source_id: @sender_id)
   end
 
   def build_message
diff --git a/app/channels/room_channel.rb b/app/channels/room_channel.rb
index 05bff5d86..0680f1458 100644
--- a/app/channels/room_channel.rb
+++ b/app/channels/room_channel.rb
@@ -45,6 +45,8 @@ class RoomChannel < ApplicationCable::Channel
   end
 
   def current_account
+    return if current_user.blank?
+
     @current_account ||= if @current_user.is_a? Contact
                            @current_user.account
                          else
diff --git a/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb b/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb
index a53650e65..f5a3c6a6d 100644
--- a/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb
+++ b/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb
@@ -7,7 +7,6 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts:
       build_inbox
       setup_webhooks if @twilio_channel.sms?
     rescue StandardError => e
-      Sentry.capture_exception(e)
       render_could_not_create_error(e.message)
     end
   end
diff --git a/app/controllers/api/v1/accounts/conversations/base_controller.rb b/app/controllers/api/v1/accounts/conversations/base_controller.rb
index b55b72013..da821a3e5 100644
--- a/app/controllers/api/v1/accounts/conversations/base_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/base_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::Base
   private
 
   def conversation
-    @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
+    @conversation ||= Current.account.conversations.find_by!(display_id: params[:conversation_id])
     authorize @conversation.inbox, :show?
   end
 end
diff --git a/app/finders/message_finder.rb b/app/finders/message_finder.rb
index 63c72bd8e..e2581e0ad 100644
--- a/app/finders/message_finder.rb
+++ b/app/finders/message_finder.rb
@@ -22,7 +22,7 @@ class MessageFinder
 
   def current_messages
     if @params[:before].present?
-      messages.reorder('created_at desc').where('id < ?', @params[:before]).limit(20).reverse
+      messages.reorder('created_at desc').where('id < ?', @params[:before].to_i).limit(20).reverse
     else
       messages.reorder('created_at desc').limit(20).reverse
     end
diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index 57c2896a5..9414ba432 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -9,7 +9,7 @@ class HookJob < ApplicationJob
       process_dialogflow_integration(hook, event_name, event_data)
     end
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    Rails.logger.error e
   end
 
   private
diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 6ddd9914b..383994f55 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -7,7 +7,7 @@ class Webhooks::Trigger
       timeout: 5
     )
     Rails.logger.info "Performed Request:  Code - #{response.code}"
-  rescue *ExceptionList::REST_CLIENT_EXCEPTIONS => e
+  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}"

From 77a6893203c85153d730618f27573cdd47c72809 Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan-brough@users.noreply.github.com>
Date: Fri, 6 May 2022 03:25:38 -0600
Subject: [PATCH 093/177] feat: Open "Switch Account" modal when clicking
 account name on dashboard (#4613)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/components/layout/Sidebar.vue   |  1 +
 .../sidebarComponents/AccountContext.vue      | 69 ++++++++++++++++++-
 .../layout/sidebarComponents/Secondary.vue    |  5 +-
 .../dashboard/i18n/locale/en/settings.json    |  1 +
 4 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index c7fda74f1..5017b3d4b 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -19,6 +19,7 @@
       :menu-config="activeSecondaryMenu"
       :current-role="currentRole"
       @add-label="showAddLabelPopup"
+      @toggle-accounts="toggleAccountModal"
     />
   </aside>
 </template>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
index 1438ac7e8..71382d5e6 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/AccountContext.vue
@@ -1,14 +1,34 @@
 <template>
-  <div v-if="showShowCurrentAccountContext" class="account-context--group">
+  <div
+    v-if="showShowCurrentAccountContext"
+    class="account-context--group"
+    @mouseover="setShowSwitch"
+    @mouseleave="resetShowSwitch"
+  >
     {{ $t('SIDEBAR.CURRENTLY_VIEWING_ACCOUNT') }}
     <p class="account-context--name text-ellipsis">
       {{ account.name }}
     </p>
+    <transition name="fade">
+      <div v-if="showSwitchButton" class="account-context--switch-group">
+        <woot-button
+          variant="clear"
+          icon="arrow-swap"
+          class="cursor-pointer"
+          @click="$emit('toggle-accounts')"
+        >
+          {{ $t('SIDEBAR.SWITCH') }}
+        </woot-button>
+      </div>
+    </transition>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 export default {
+  data() {
+    return { showSwitchButton: false };
+  },
   computed: {
     ...mapGetters({
       account: 'getCurrentAccount',
@@ -18,6 +38,14 @@ export default {
       return this.userAccounts.length > 1 && this.account.name;
     },
   },
+  methods: {
+    setShowSwitch() {
+      this.showSwitchButton = true;
+    },
+    resetShowSwitch() {
+      this.showSwitchButton = false;
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
@@ -27,10 +55,49 @@ export default {
   font-size: var(--font-size-mini);
   padding: var(--space-small);
   margin-bottom: var(--space-small);
+  width: 100%;
+  position: relative;
+
+  &:hover {
+    background: var(--b-100);
+  }
 
   .account-context--name {
     font-weight: var(--font-weight-medium);
     margin-bottom: 0;
   }
 }
+
+.account-context--switch-group {
+  --overlay-shadow: linear-gradient(
+    to right,
+    rgba(255, 255, 255, 0) 0%,
+    rgba(255, 255, 255, 1) 50%
+  );
+
+  align-items: center;
+  background-image: var(--overlay-shadow);
+  border-top-left-radius: 0;
+  border-top-right-radius: var(--border-radius-normal);
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: var(--border-radius-normal);
+  display: flex;
+  height: 100%;
+  justify-content: end;
+  opacity: 1;
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 100%;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 300ms ease;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
 </style>
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 8d486a454..724576347 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="hasSecondaryMenu" class="main-nav secondary-menu">
-    <account-context />
+    <account-context @toggle-accounts="toggleAccountModal" />
     <transition-group name="menu-list" tag="ul" class="menu vertical">
       <secondary-nav-item
         v-for="menuItem in accessibleMenuItems"
@@ -224,6 +224,9 @@ export default {
     showAddLabelPopup() {
       this.$emit('add-label');
     },
+    toggleAccountModal() {
+      this.$emit('toggle-accounts');
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 97539d49c..d51ebe6eb 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -147,6 +147,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",

From 80b8f5f915528bac7df92ca6aa7fe56d5e54f73c Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 6 May 2022 16:38:44 +0530
Subject: [PATCH 094/177] chore: Update puma config as per recommendations
 (#3640)

Ability to configure workers for puma

ref:
https://devcenter.heroku.com/articles/concurrency-and-database-connections#threaded-servers
https://www.speedshop.co/2017/10/12/appserver.html
---
 config/puma.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/puma.rb b/config/puma.rb
index 1df88f6db..49cc02d5a 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -25,14 +25,14 @@ pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' }
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
 #
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+workers ENV.fetch('WEB_CONCURRENCY', 1)
 
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
 # process behavior so workers use less memory.
 #
-# preload_app!
+preload_app!
 
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

From ef850eda0fbcb8bf5e555cd8e3d8e55d92ca5665 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Fri, 6 May 2022 19:30:48 +0530
Subject: [PATCH 095/177] feat: Add the SDK method to programatically toggle
 live chat bubble (#4223)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/packs/sdk.js                   | 20 +++++++-
 app/javascript/sdk/IFrameHelper.js            | 48 +++++++++----------
 app/javascript/sdk/bubbleHelpers.js           |  5 +-
 app/javascript/sdk/sdk.js                     |  4 ++
 .../shared/constants/sharedFrameEvents.js     |  1 +
 app/javascript/widget/App.vue                 |  6 +++
 .../widget/store/modules/appConfig.js         |  7 +++
 .../modules/specs/appConfig/actions.spec.js   |  7 +++
 .../modules/specs/appConfig/mutations.spec.js |  8 ++++
 app/javascript/widget/store/types.js          |  1 +
 10 files changed, 79 insertions(+), 28 deletions(-)
 create mode 100644 app/javascript/shared/constants/sharedFrameEvents.js

diff --git a/app/javascript/packs/sdk.js b/app/javascript/packs/sdk.js
index b77b682dd..064033841 100755
--- a/app/javascript/packs/sdk.js
+++ b/app/javascript/packs/sdk.js
@@ -10,7 +10,8 @@ import {
   getUserCookieName,
   hasUserKeys,
 } from '../sdk/cookieHelpers';
-
+import { addClass, removeClass } from '../sdk/DOMHelpers';
+import { SDK_SET_BUBBLE_VISIBILITY } from 'shared/constants/sharedFrameEvents';
 const runSDK = ({ baseUrl, websiteToken }) => {
   if (window.$chatwoot) {
     return;
@@ -36,6 +37,23 @@ const runSDK = ({ baseUrl, websiteToken }) => {
       IFrameHelper.events.toggleBubble(state);
     },
 
+    toggleBubbleVisibility(visibility) {
+      let widgetElm = document.querySelector('.woot--bubble-holder');
+      let widgetHolder = document.querySelector('.woot-widget-holder');
+      if (visibility === 'hide') {
+        addClass(widgetHolder, 'woot-widget--without-bubble');
+        addClass(widgetElm, 'woot-hidden');
+        window.$chatwoot.hideMessageBubble = true;
+      } else if (visibility === 'show') {
+        removeClass(widgetElm, 'woot-hidden');
+        removeClass(widgetHolder, 'woot-widget--without-bubble');
+        window.$chatwoot.hideMessageBubble = false;
+      }
+      IFrameHelper.sendMessage(SDK_SET_BUBBLE_VISIBILITY, {
+        hideMessageBubble: window.$chatwoot.hideMessageBubble,
+      });
+    },
+
     popoutChatWindow() {
       IFrameHelper.events.popoutChatWindow({
         baseUrl: window.$chatwoot.baseUrl,
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 3bc0973fe..9641a4226 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -175,9 +175,6 @@ export const IFrameHelper = {
     },
 
     setBubbleLabel(message) {
-      if (window.$chatwoot.hideMessageBubble) {
-        return;
-      }
       setBubbleText(window.$chatwoot.launcherTitle || message.label);
     },
 
@@ -263,33 +260,32 @@ export const IFrameHelper = {
     if (IFrameHelper.getBubbleHolder().length) {
       return;
     }
-    createBubbleHolder();
+    createBubbleHolder(window.$chatwoot.hideMessageBubble);
     onLocationChangeListener();
-    if (!window.$chatwoot.hideMessageBubble) {
-      let className = 'woot-widget-bubble';
-      let closeBtnClassName = `woot-elements--${window.$chatwoot.position} woot-widget-bubble woot--close woot--hide`;
 
-      if (isFlatWidgetStyle(window.$chatwoot.widgetStyle)) {
-        className += ' woot-widget-bubble--flat';
-        closeBtnClassName += ' woot-widget-bubble--flat';
-      }
+    let className = 'woot-widget-bubble';
+    let closeBtnClassName = `woot-elements--${window.$chatwoot.position} woot-widget-bubble woot--close woot--hide`;
 
-      const chatIcon = createBubbleIcon({
-        className,
-        src: bubbleImg,
-        target: chatBubble,
-      });
-
-      addClass(closeBubble, closeBtnClassName);
-
-      chatIcon.style.background = widgetColor;
-      closeBubble.style.background = widgetColor;
-
-      bubbleHolder.appendChild(chatIcon);
-      bubbleHolder.appendChild(closeBubble);
-      bubbleHolder.appendChild(createNotificationBubble());
-      onClickChatBubble();
+    if (isFlatWidgetStyle(window.$chatwoot.widgetStyle)) {
+      className += ' woot-widget-bubble--flat';
+      closeBtnClassName += ' woot-widget-bubble--flat';
     }
+
+    const chatIcon = createBubbleIcon({
+      className,
+      src: bubbleImg,
+      target: chatBubble,
+    });
+
+    addClass(closeBubble, closeBtnClassName);
+
+    chatIcon.style.background = widgetColor;
+    closeBubble.style.background = widgetColor;
+
+    bubbleHolder.appendChild(chatIcon);
+    bubbleHolder.appendChild(closeBubble);
+    bubbleHolder.appendChild(createNotificationBubble());
+    onClickChatBubble();
   },
   toggleCloseButton: () => {
     let isMobile = false;
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index 18f8e2fbc..b1ef9110f 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -39,7 +39,10 @@ export const createBubbleIcon = ({ className, src, target }) => {
   return target;
 };
 
-export const createBubbleHolder = () => {
+export const createBubbleHolder = hideMessageBubble => {
+  if (hideMessageBubble) {
+    addClass(bubbleHolder, 'woot-hidden');
+  }
   addClass(bubbleHolder, 'woot--bubble-holder');
   body.appendChild(bubbleHolder);
 };
diff --git a/app/javascript/sdk/sdk.js b/app/javascript/sdk/sdk.js
index a13e36d0f..b4d198630 100644
--- a/app/javascript/sdk/sdk.js
+++ b/app/javascript/sdk/sdk.js
@@ -227,4 +227,8 @@ export const SDK_CSS = `
     width: 400px !important;
  }
 }
+
+.woot-hidden {
+  display: none !important;
+}
 `;
diff --git a/app/javascript/shared/constants/sharedFrameEvents.js b/app/javascript/shared/constants/sharedFrameEvents.js
new file mode 100644
index 000000000..6a1d1de9d
--- /dev/null
+++ b/app/javascript/shared/constants/sharedFrameEvents.js
@@ -0,0 +1 @@
+export const SDK_SET_BUBBLE_VISIBILITY = 'sdk-set-bubble-visibility';
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index 723effb81..f31ba57ad 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -38,6 +38,9 @@ import {
   ON_CAMPAIGN_MESSAGE_CLICK,
   ON_UNREAD_MESSAGE_CLICK,
 } from './constants/widgetBusEvents';
+
+import { SDK_SET_BUBBLE_VISIBILITY } from '../shared/constants/sharedFrameEvents';
+
 export default {
   name: 'App',
   components: {
@@ -103,6 +106,7 @@ export default {
       'setAppConfig',
       'setReferrerHost',
       'setWidgetColor',
+      'setBubbleVisibility',
     ]),
     ...mapActions('conversation', ['fetchOldConversations', 'setUserLastSeen']),
     ...mapActions('campaign', [
@@ -285,6 +289,8 @@ export default {
           if (!message.isOpen) {
             this.resetCampaign();
           }
+        } else if (message.event === SDK_SET_BUBBLE_VISIBILITY) {
+          this.setBubbleVisibility(message.hideMessageBubble);
         }
       });
     },
diff --git a/app/javascript/widget/store/modules/appConfig.js b/app/javascript/widget/store/modules/appConfig.js
index 319f86be4..91149a2c3 100644
--- a/app/javascript/widget/store/modules/appConfig.js
+++ b/app/javascript/widget/store/modules/appConfig.js
@@ -1,4 +1,5 @@
 import {
+  SET_BUBBLE_VISIBILITY,
   SET_REFERRER_HOST,
   SET_WIDGET_APP_CONFIG,
   SET_WIDGET_COLOR,
@@ -57,6 +58,9 @@ export const actions = {
   setReferrerHost({ commit }, referrerHost) {
     commit(SET_REFERRER_HOST, referrerHost);
   },
+  setBubbleVisibility({ commit }, hideMessageBubble) {
+    commit(SET_BUBBLE_VISIBILITY, hideMessageBubble);
+  },
 };
 
 export const mutations = {
@@ -76,6 +80,9 @@ export const mutations = {
   [SET_REFERRER_HOST]($state, referrerHost) {
     $state.referrerHost = referrerHost;
   },
+  [SET_BUBBLE_VISIBILITY]($state, hideMessageBubble) {
+    $state.hideMessageBubble = hideMessageBubble;
+  },
 };
 
 export default {
diff --git a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
index 7a5f47e87..58441e0c8 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/actions.spec.js
@@ -11,6 +11,13 @@ describe('#actions', () => {
     });
   });
 
+  describe('#setBubbleVisibility', () => {
+    it('creates actions properly', () => {
+      actions.setBubbleVisibility({ commit }, false);
+      expect(commit.mock.calls).toEqual([['SET_BUBBLE_VISIBILITY', false]]);
+    });
+  });
+
   describe('#setWidgetColor', () => {
     it('creates actions properly', () => {
       actions.setWidgetColor({ commit }, '#eaeaea');
diff --git a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
index 77a8cb096..dc17014fc 100644
--- a/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/appConfig/mutations.spec.js
@@ -9,6 +9,14 @@ describe('#mutations', () => {
     });
   });
 
+  describe('#SET_BUBBLE_VISIBILITY', () => {
+    it('sets bubble visibility properly', () => {
+      const state = { hideMessageBubble: false };
+      mutations.SET_BUBBLE_VISIBILITY(state, true);
+      expect(state.hideMessageBubble).toEqual(true);
+    });
+  });
+
   describe('#SET_WIDGET_COLOR', () => {
     it('sets widget color properly', () => {
       const state = { widgetColor: '' };
diff --git a/app/javascript/widget/store/types.js b/app/javascript/widget/store/types.js
index b7d2da402..dca4d5dc9 100644
--- a/app/javascript/widget/store/types.js
+++ b/app/javascript/widget/store/types.js
@@ -5,3 +5,4 @@ export const SET_WIDGET_COLOR = 'SET_WIDGET_COLOR';
 export const UPDATE_CONVERSATION_ATTRIBUTES = 'UPDATE_CONVERSATION_ATTRIBUTES';
 export const TOGGLE_WIDGET_OPEN = 'TOGGLE_WIDGET_OPEN';
 export const SET_REFERRER_HOST = 'SET_REFERRER_HOST';
+export const SET_BUBBLE_VISIBILITY = 'SET_BUBBLE_VISIBILITY';

From 2e0d43c09373199284437466b111d55c8b1f404c Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 6 May 2022 20:19:36 +0530
Subject: [PATCH 096/177] chore: Use different files for widget and dashboard
 audio alert (#4637)

---
 app/javascript/sdk/IFrameHelper.js               |   2 +-
 .../shared/helpers/AudioNotificationHelper.js    |   4 ++--
 config/environments/development.rb               |   2 +-
 config/environments/production.rb                |   2 +-
 config/environments/staging.rb                   |   2 +-
 config/environments/test.rb                      |   2 +-
 .../audios => audio/dashboard}/ding.mp3          | Bin
 public/audio/widget/ding.mp3                     | Bin 0 -> 2667 bytes
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename public/{dashboard/audios => audio/dashboard}/ding.mp3 (100%)
 create mode 100644 public/audio/widget/ding.mp3

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 9641a4226..2f3ad5cfd 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -121,7 +121,7 @@ export const IFrameHelper = {
 
   setupAudioListeners: () => {
     const { baseUrl = '' } = window.$chatwoot;
-    getAlertAudio(baseUrl).then(() =>
+    getAlertAudio(baseUrl, 'widget').then(() =>
       initOnEvents.forEach(event => {
         document.removeEventListener(
           event,
diff --git a/app/javascript/shared/helpers/AudioNotificationHelper.js b/app/javascript/shared/helpers/AudioNotificationHelper.js
index d4fbc9e2c..c3108f174 100644
--- a/app/javascript/shared/helpers/AudioNotificationHelper.js
+++ b/app/javascript/shared/helpers/AudioNotificationHelper.js
@@ -4,7 +4,7 @@ import { IFrameHelper } from 'widget/helpers/utils';
 import { showBadgeOnFavicon } from './faviconHelper';
 
 export const initOnEvents = ['click', 'touchstart', 'keypress', 'keydown'];
-export const getAlertAudio = async (baseUrl = '') => {
+export const getAlertAudio = async (baseUrl = '', type = 'dashboard') => {
   const audioCtx = new (window.AudioContext || window.webkitAudioContext)();
   const playsound = audioBuffer => {
     window.playAudioAlert = () => {
@@ -17,7 +17,7 @@ export const getAlertAudio = async (baseUrl = '') => {
   };
 
   try {
-    const resourceUrl = `${baseUrl}/dashboard/audios/ding.mp3`;
+    const resourceUrl = `${baseUrl}/audio/${type}/ding.mp3`;
     const audioRequest = new Request(resourceUrl);
 
     fetch(audioRequest)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 67ffa6a52..9791505d9 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -82,7 +82,7 @@ Rails.application.configure do
     allow do
       origins '*'
       resource '/packs/*', headers: :any, methods: [:get, :options]
-      resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
+      resource '/audio/*', headers: :any, methods: [:get, :options]
       resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
     end
   end
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e538e2867..ac0567c62 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -121,7 +121,7 @@ Rails.application.configure do
     allow do
       origins '*'
       resource '/packs/*', headers: :any, methods: [:get, :options]
-      resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
+      resource '/audio/*', headers: :any, methods: [:get, :options]
       if ActiveModel::Type::Boolean.new.cast(ENV.fetch('CW_API_ONLY_SERVER', false))
         resource '*', headers: :any, methods: :any, expose: ['access-token', 'client', 'uid', 'expiry']
       end
diff --git a/config/environments/staging.rb b/config/environments/staging.rb
index 6e9b3dcf8..241b3f9a7 100644
--- a/config/environments/staging.rb
+++ b/config/environments/staging.rb
@@ -87,7 +87,7 @@ Rails.application.configure do
     allow do
       origins '*'
       resource '/packs/*', headers: :any, methods: [:get, :options]
-      resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
+      resource '/audio/*', headers: :any, methods: [:get, :options]
     end
   end
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 43b7108b8..3dfe52c68 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -58,7 +58,7 @@ Rails.application.configure do
     allow do
       origins '*'
       resource '/packs/*', headers: :any, methods: [:get, :options]
-      resource '/dashboard/audios/ding.mp3', headers: :any, methods: [:get, :options]
+      resource '/audio/*', headers: :any, methods: [:get, :options]
     end
   end
 end
diff --git a/public/dashboard/audios/ding.mp3 b/public/audio/dashboard/ding.mp3
similarity index 100%
rename from public/dashboard/audios/ding.mp3
rename to public/audio/dashboard/ding.mp3
diff --git a/public/audio/widget/ding.mp3 b/public/audio/widget/ding.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..7c190424bef8b6ca18378bfeb47edbf3cee6edff
GIT binary patch
literal 2667
zcmeHIYgAKL7Ctw*33&klc?60YAfqTqZ$MEj3>OIq2!atIJX(Uh1q4NkN;<g-RC$Sk
zDj-w^9TclPEYuQlBp@niL=bV*MQLaqL6}xR5tWiVH`8gCf1JNvYu0>g?X~xJ?>^`3
zz0cbF_z9fJKnH$ExVMnd6hfR3CnQ85^m>;Dd-DlOC&Vi$W>0o{`W}2<5l7Jf3Q_XT
zM8d(45EuXk0^Ht%wD;le`+&a>#96@so`K%Zj(h}xmA}QehRY)-1p-K;i=$`^tNrcA
z|E$L6YXrbx3IHhv0FAf>!h~S=i<T(Z(i3y#M+`7tBOd<@Tpb$pdo92JtoKsMb@7g}
zDKOIVu#R$bD?YEi-_)VrJrJ?mS=s+r;l+y3CFioag{DN^NEk4Z;V*XTmXCO+*qdfH
z**vbFBiK*-HcuKLIsV4GdeLq_7r<Vs^TFS4imM90ptBbIezxhpa+{mgcG2g^$-?E<
z!uGkhRPY2enpZDNVm4r(JUx~6NbV@eavW&O&1gMcd#Fp($>nnFIMmH+p!3@_spab!
zsH$fJ7invy6oLeKzs0&ER4177nl3|CTm`?kn009dvzqAzY93lxbE%K~Wk&=xF^F%(
zzP<7E>sND++n0!nA=+wIh$Wc<VcoFU2}M{83XDNlS+&WeA80NUIDV{x8XQH1!2v~P
zc3^f>b~@gH2Sww!wqrKz@{V|$2Z8p3;V;9<s~@zMRH!Yy53C<EtTI3H%>26qr)gOc
zZ#%1VRG0Cu`1|t+>DigE%loCj^7-_T-KismL)oDc^`QKj@kCPgK0$UILLr?5SfjX&
zV`+7bO|v{9r;s59a}`C3^yvF$?1!lwnGaywjh-dhDc9eUp*}Y@e!jUnb0;J&I7+LG
zf&0-1hQ-a}nlZy&c_zA69l}PV!Nzgo)~r#^456woj+%Z`h|!upiY>&r(E1Q7(>=>?
z$3t9%#DZ)Qc0{>!o>{)lOe>uHa&DPPL7hSF)OB*t$L-Q7lBB_26w6rUOIw$*b|F%i
ziK{j-{jHnBP0og{$9BawzkC92&o*hDXN762Cg&nV#rbm|*nmiv1x1bfhlKkqjyvGE
z((f*A=E^rQBI&UclM*5H@U?Gso4o@&*~DLz_~o45<$rsDziJ@W0|=n0cTU~2g#ZQ&
z<reO@F5Mh1nb@T_T#euI&^Futd+{slMIN(KT&>s(W4;iPEl>e2eMw)2g37xTd+>~%
zRa`RF$0;TLOtZ<37O1-}_erI5Ma%JczVVM<QT(loLO(_H^;#GTC1TBpWt9dPVWs=j
zZe60@q~pb*q~IIJO#`G6`PVO)tJ$PH70;Rlsq8wt9RosPO?Um;VoS{ThNPY4mKUI^
zbYQu7O{Y~7Gj=Z>Gf}1Lvp$gdszgAJ?Qx)<fixLn1AM+eZXDCo#06?o1ehb2o~9zk
z@N~4tn+{_zM|#>}MoeZZES7|jMiqe!V81!YZ_(cT?T7;sK=-0+68MV^2ATbJNGOZU
z((w39$d-)$0}0cQr8lE&%qXX9yru57zb!Rm1qH6f+UR-U4aNqQENmQQ%23#s9PE|{
zs{t0TSCrTAus!3L*PubAi7Z*>3+mTLmZzFP@#rFCDQS?*)-S50V$D%ZHA97{k|+T%
zX1Xa7ZDR|E>Jl3pT(+!(5hfjlS>yx~N-O>Wb)iDt=3n<bKYfpU^gxTh=x**)&2a0t
zW{xh;CH_l({#x>t+c!(17v?7qzmR6|Oe8t-@9k_~;`nY;Bb&l{C1k|pZ7Ac_0%NTw
zx+^j*1`z}}Hh0F1Me*~3O1*`FW<Ht8Wg+*^R|Os{IC$=r`()$c1q++3J0Bm7595KY
zun$PlFCy2dYNi#kTV-cAC3D;a)^H_2VnOF&`7)86e50RwySTJaMm4qIm^h&jf?D07
z9SRvnoebRgT~l;^9*J|6?PZZK;~c|crYoZ>A=fHuNdp-wkf~R1S;;JGt$I{?o^!5w
z`mrdtpt|T!RZC#sCqAAl2T~5*zhYZMn;EEC`{pe}&Y;u{zQX;ZDW^s*F#RN7t~mRw
z;=?h|Fd1ek){upQr(bE&pmyxuc9)M<_PH~2Ml9-ETDE)_H4rYL8+6=nygg)I5GJqN
zHtsQ<WgV)#I``>MGdmG{peHWlWkQu@*-%$P1-<HWJ3frh<9MIc^&!b!zvByqM7~&h
z8d2|GzPR|a)XC7klvTs{FVc6~j4=QFLK#~g`Jm<6e?CtP4Mk;T<1_Q+G6$l67~&^1
zh)294o@<1n@RCGaTgP5D;(FrPQe0D!e)9JhciSHX-Hdw;7+drEw3%WquU2{DMm`ZX
Xq_qNo3xLNp48VU-X#YP}SAl;4dn@^{

literal 0
HcmV?d00001


From 5b5a6d89c0cf7f3148a1439d6fcd847784a79b94 Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan-brough@users.noreply.github.com>
Date: Sat, 7 May 2022 06:27:16 -0600
Subject: [PATCH 097/177] chore:  "Channel::TwilioSms" to be unique on
 account_sid+phone_number (#4188)

"Twilio::IncomingMessageService" searches for the correct "Channel::TwilioSms"
by account_sid+phone_number.  If these values are duplicated then which record it
finds is indeterminate and may alternate between queries.

Co-authored-by: Sojan Jose <sojan@pepalo.com>
---
 app/models/channel/twilio_sms.rb              |  7 +++-
 ..._sid_unique_index_to_channel_twilio_sms.rb | 39 +++++++++++++++++++
 db/schema.rb                                  |  3 +-
 3 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb

diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 89e9cbdc8..5f4f26048 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -13,7 +13,8 @@
 #
 # Indexes
 #
-#  index_channel_twilio_sms_on_account_id_and_phone_number  (account_id,phone_number) UNIQUE
+#  index_channel_twilio_sms_on_account_sid_and_phone_number  (account_sid,phone_number) UNIQUE
+#  index_channel_twilio_sms_on_phone_number                  (phone_number) UNIQUE
 #
 
 class Channel::TwilioSms < ApplicationRecord
@@ -23,7 +24,9 @@ class Channel::TwilioSms < ApplicationRecord
 
   validates :account_sid, presence: true
   validates :auth_token, presence: true
-  validates :phone_number, uniqueness: { scope: :account_id }, presence: true
+  # NOTE: allowing nil for future when we suppor twilio messaging services
+  # https://github.com/chatwoot/chatwoot/pull/4242
+  validates :phone_number, uniqueness: true, allow_nil: true
 
   enum medium: { sms: 0, whatsapp: 1 }
 
diff --git a/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb b/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb
new file mode 100644
index 000000000..e9bb5e189
--- /dev/null
+++ b/db/migrate/20220315204137_add_account_sid_unique_index_to_channel_twilio_sms.rb
@@ -0,0 +1,39 @@
+class AddAccountSidUniqueIndexToChannelTwilioSms < ActiveRecord::Migration[6.1]
+  def change
+    clear_possible_duplicates
+
+    has_duplicates = Channel::TwilioSms.select(:phone_number).group(:phone_number).having('count(*) > 1').exists?
+
+    if has_duplicates
+      raise <<~ERR.squish
+        ERROR: You have duplicate values for phone_number in "channel_twilio_sms".
+        This causes Twilio account lookup to behave unpredictably. Please eliminate the duplicates
+        and then re-run this migration.
+      ERR
+    end
+
+    remove_index :channel_twilio_sms, [:account_id, :phone_number], unique: true
+    add_index :channel_twilio_sms, :phone_number, unique: true
+    # since look ups are done via account_sid + phone_number, we need to add a unique index
+    add_index :channel_twilio_sms, [:account_sid, :phone_number], unique: true
+  end
+
+  def clear_possible_duplicates
+    # based on the look up in saas it seems like only the first inbox is used in case of duplicates,
+    # so lets try to clear our inboxes with out conversations
+    duplicate_phone_numbers = Channel::TwilioSms.select(:phone_number).group(:phone_number).having('count(*) > 1').collect(&:phone_number)
+    duplicate_phone_numbers.each do |phone_number|
+      # we are skipping the first inbox that was created
+      Channel::TwilioSms.where(phone_number: phone_number).drop(1).each do |channel|
+        inbox = channel.inbox
+        # skip inboxes with conversations
+        next if inbox.conversations.count.positive?
+
+        inbox.destroy
+      end
+    end
+
+    # clear the accounts created with twilio sandbox whatsapp number
+    # Channel::TwilioSms.where(phone_number: 'whatsapp:+14155238886').each { |channel| channel.inbox.destroy }
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cc619bc18..c998b839b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -257,7 +257,8 @@ ActiveRecord::Schema.define(version: 2022_04_28_101325) do
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.integer "medium", default: 0
-    t.index ["account_id", "phone_number"], name: "index_channel_twilio_sms_on_account_id_and_phone_number", unique: true
+    t.index ["account_sid", "phone_number"], name: "index_channel_twilio_sms_on_account_sid_and_phone_number", unique: true
+    t.index ["phone_number"], name: "index_channel_twilio_sms_on_phone_number", unique: true
   end
 
   create_table "channel_twitter_profiles", force: :cascade do |t|

From 360b438a55582259b8206dbe4872afb858025d75 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Mon, 9 May 2022 14:04:52 +0530
Subject: [PATCH 098/177] Fix: Campaign triggers first_response reporting event
 (#4607)

* Fix: Campaign triggers first_response reporting event

* fix spec failure
---
 .../campaign_conversation_builder.rb          |  3 +-
 app/builders/messages/message_builder.rb      |  6 ++-
 app/models/message.rb                         | 46 ++++++++++---------
 ...39_add_additional_attributes_to_message.rb | 14 ++++++
 db/schema.rb                                  |  4 +-
 .../campaign_conversation_builder_spec.rb     |  1 +
 6 files changed, 49 insertions(+), 25 deletions(-)
 create mode 100644 db/migrate/20220506163839_add_additional_attributes_to_message.rb

diff --git a/app/builders/campaigns/campaign_conversation_builder.rb b/app/builders/campaigns/campaign_conversation_builder.rb
index 9eb640576..b04c6d077 100644
--- a/app/builders/campaigns/campaign_conversation_builder.rb
+++ b/app/builders/campaigns/campaign_conversation_builder.rb
@@ -21,7 +21,8 @@ class Campaigns::CampaignConversationBuilder
 
   def message_params
     ActionController::Parameters.new({
-                                       content: @campaign.message
+                                       content: @campaign.message,
+                                       campaign_id: @campaign.id
                                      })
   end
 
diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index d2936e9f3..5c8cadbcd 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -69,6 +69,10 @@ class Messages::MessageBuilder
     @automation_rule.present? ? { content_attributes: { automation_rule_id: @automation_rule } } : {}
   end
 
+  def campaign_id
+    @params[:campaign_id].present? ? { additional_attributes: { campaign_id: @params[:campaign_id] } } : {}
+  end
+
   def message_sender
     return if @params[:sender_type] != 'AgentBot'
 
@@ -87,6 +91,6 @@ class Messages::MessageBuilder
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id]
-    }.merge(external_created_at).merge(automation_rule_id)
+    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id)
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 13d58db6b..48f58768c 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -2,30 +2,32 @@
 #
 # Table name: messages
 #
-#  id                  :integer          not null, primary key
-#  content             :text
-#  content_attributes  :json
-#  content_type        :integer          default("text"), not null
-#  external_source_ids :jsonb
-#  message_type        :integer          not null
-#  private             :boolean          default(FALSE)
-#  sender_type         :string
-#  status              :integer          default("sent")
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
-#  account_id          :integer          not null
-#  conversation_id     :integer          not null
-#  inbox_id            :integer          not null
-#  sender_id           :bigint
-#  source_id           :string
+#  id                    :integer          not null, primary key
+#  additional_attributes :jsonb
+#  content               :text
+#  content_attributes    :json
+#  content_type          :integer          default("text"), not null
+#  external_source_ids   :jsonb
+#  message_type          :integer          not null
+#  private               :boolean          default(FALSE)
+#  sender_type           :string
+#  status                :integer          default("sent")
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  account_id            :integer          not null
+#  conversation_id       :integer          not null
+#  inbox_id              :integer          not null
+#  sender_id             :bigint
+#  source_id             :string
 #
 # Indexes
 #
-#  index_messages_on_account_id                 (account_id)
-#  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)
-#  index_messages_on_source_id                  (source_id)
+#  index_messages_on_account_id                         (account_id)
+#  index_messages_on_additional_attributes_campaign_id  (((additional_attributes -> 'campaign_id'::text))) 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)
+#  index_messages_on_source_id                          (source_id)
 #
 
 class Message < ApplicationRecord
@@ -168,7 +170,7 @@ class Message < ApplicationRecord
   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.count == 1
+    if outgoing? && conversation.messages.outgoing.where("(additional_attributes->'campaign_id') is null").count == 1
       Rails.configuration.dispatcher.dispatch(FIRST_REPLY_CREATED, Time.zone.now, message: self, performed_by: Current.executed_by)
     end
   end
diff --git a/db/migrate/20220506163839_add_additional_attributes_to_message.rb b/db/migrate/20220506163839_add_additional_attributes_to_message.rb
new file mode 100644
index 000000000..713584c41
--- /dev/null
+++ b/db/migrate/20220506163839_add_additional_attributes_to_message.rb
@@ -0,0 +1,14 @@
+class AddAdditionalAttributesToMessage < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def up
+    add_column :messages, :additional_attributes, :jsonb, default: {}
+    add_index :messages, "((additional_attributes->'campaign_id'))", name: 'index_messages_on_additional_attributes_campaign_id', using: 'gin',
+                                                                     algorithm: :concurrently
+  end
+
+  def down
+    remove_index :messages, name: 'index_messages_on_additional_attributes_campaign_id'
+    remove_column :messages, :additional_attributes
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index c998b839b..157e2ac2f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_28_101325) do
+ActiveRecord::Schema.define(version: 2022_05_06_163839) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -577,6 +577,8 @@ ActiveRecord::Schema.define(version: 2022_04_28_101325) do
     t.string "sender_type"
     t.bigint "sender_id"
     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"], name: "index_messages_on_account_id"
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"
diff --git a/spec/builders/campaigns/campaign_conversation_builder_spec.rb b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
index 3735c0e66..c461337cd 100644
--- a/spec/builders/campaigns/campaign_conversation_builder_spec.rb
+++ b/spec/builders/campaigns/campaign_conversation_builder_spec.rb
@@ -16,6 +16,7 @@ describe ::Campaigns::CampaignConversationBuilder do
 
       expect(campaign_conversation.campaign_id).to eq(campaign.id)
       expect(campaign_conversation.messages.first.content).to eq(campaign.message)
+      expect(campaign_conversation.messages.first.additional_attributes['campaign_id']).to eq(campaign.id)
     end
 
     it 'will not create a conversation with campaign id if another conversation exists' do

From 04dfb034ccb52f4ad85aa66dc5265b95ed60b8c5 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 9 May 2022 14:23:19 +0530
Subject: [PATCH 099/177] chore: Upgrade Exception tracking (#4638)

- Upgrade Sentry Libraries
- Enable provision for account and user info in error tracking
- Add ChatwootExceptionTracker

fixes: #4375
---
 Gemfile                                       |   6 +-
 Gemfile.lock                                  |  32 +++---
 .../messages/facebook/message_builder.rb      |   6 +-
 .../messages/instagram/message_builder.rb     |   2 +-
 .../messages/messenger/message_builder.rb     |  22 ++--
 .../api/v1/accounts/callbacks_controller.rb   |   4 +-
 app/controllers/api/v1/webhooks_controller.rb |   2 +-
 .../concerns/request_exception_handler.rb     |   3 +-
 app/jobs/inboxes/fetch_imap_emails_job.rb     |   2 +-
 .../automation_rules/action_service.rb        |   2 +-
 .../facebook/send_on_facebook_service.rb      |   2 +-
 app/services/instagram/message_text.rb        |   2 +-
 .../instagram/send_on_instagram_service.rb    |   2 +-
 .../template/email_collect.rb                 |   2 +-
 .../message_templates/template/greeting.rb    |   2 +-
 .../template/out_of_office.rb                 |   2 +-
 app/services/twilio/send_on_twilio_service.rb |   2 +-
 config/initializers/sentry.rb                 |   9 ++
 lib/chatwoot_exception_tracker.rb             |  32 ++++++
 lib/chatwoot_hub.rb                           |   8 +-
 lib/integrations/facebook/message_creator.rb  |   2 +-
 lib/webhooks/trigger.rb                       |   2 +-
 package.json                                  |   4 +-
 spec/lib/chatwoot_exception_tracker_spec.rb   |  23 ++++
 yarn.lock                                     | 106 +++++++++---------
 25 files changed, 173 insertions(+), 108 deletions(-)
 create mode 100644 lib/chatwoot_exception_tracker.rb
 create mode 100644 spec/lib/chatwoot_exception_tracker_spec.rb

diff --git a/Gemfile b/Gemfile
index 9bc330d93..55d02d87c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -97,9 +97,9 @@ gem 'brakeman'
 gem 'ddtrace'
 gem 'newrelic_rpm'
 gem 'scout_apm'
-gem 'sentry-rails'
-gem 'sentry-ruby'
-gem 'sentry-sidekiq'
+gem 'sentry-rails', '~> 5.3'
+gem 'sentry-ruby', '~> 5.3'
+gem 'sentry-sidekiq', '~> 5.3'
 
 ##-- background job processing --##
 gem 'sidekiq', '~> 6.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e2147bc1..253c35da6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -349,7 +349,7 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.16.0)
+    loofah (2.17.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -378,14 +378,14 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.7.0)
     nio4r (2.5.8)
-    nokogiri (1.13.4)
+    nokogiri (1.13.5)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.4-arm64-darwin)
+    nokogiri (1.13.5-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-darwin)
+    nokogiri (1.13.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.4-x86_64-linux)
+    nokogiri (1.13.5-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.8)
     orm_adapter (0.5.0)
@@ -533,16 +533,16 @@ GEM
       activesupport (>= 4)
     selectize-rails (0.12.6)
     semantic_range (3.0.0)
-    sentry-rails (5.1.0)
+    sentry-rails (5.3.0)
       railties (>= 5.0)
-      sentry-ruby-core (~> 5.1.0)
-    sentry-ruby (5.1.0)
+      sentry-ruby-core (~> 5.3.0)
+    sentry-ruby (5.3.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      sentry-ruby-core (= 5.1.0)
-    sentry-ruby-core (5.1.0)
+      sentry-ruby-core (= 5.3.0)
+    sentry-ruby-core (5.3.0)
       concurrent-ruby
-    sentry-sidekiq (5.1.0)
-      sentry-ruby-core (~> 5.1.0)
+    sentry-sidekiq (5.3.0)
+      sentry-ruby-core (~> 5.3.0)
       sidekiq (>= 3.0)
     sexp_processor (4.16.0)
     shoulda-matchers (5.1.0)
@@ -726,9 +726,9 @@ DEPENDENCIES
   rubocop-rspec
   scout_apm
   seed_dump
-  sentry-rails
-  sentry-ruby
-  sentry-sidekiq
+  sentry-rails (~> 5.3)
+  sentry-ruby (~> 5.3)
+  sentry-sidekiq (~> 5.3)
   shoulda-matchers
   sidekiq (~> 6.4.0)
   sidekiq-cron (~> 1.3)
@@ -755,4 +755,4 @@ RUBY VERSION
    ruby 3.0.2p107
 
 BUNDLED WITH
-   2.3.9
+   2.3.10
diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 9c9b5829b..3b3248ed1 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -29,7 +29,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
   rescue Koala::Facebook::AuthenticationError
     Rails.logger.error "Facebook Authorization expired for Inbox #{@inbox.id}"
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     true
   end
 
@@ -128,10 +128,10 @@ 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
-      Sentry.capture_exception(e) unless @outgoing_echo
+      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception unless @outgoing_echo
     rescue StandardError => e
       result = {}
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     end
     process_contact_params_result(result)
   end
diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 69475fb16..3b8ead18c 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -24,7 +24,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
     @inbox.channel.authorization_error!
     raise
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     true
   end
 
diff --git a/app/builders/messages/messenger/message_builder.rb b/app/builders/messages/messenger/message_builder.rb
index 2e58825f4..6d3ed0179 100644
--- a/app/builders/messages/messenger/message_builder.rb
+++ b/app/builders/messages/messenger/message_builder.rb
@@ -53,16 +53,7 @@ class Messages::Messenger::MessageBuilder
 
   def fetch_story_link(attachment)
     message = attachment.message
-    begin
-      k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
-      result = k.get_object(message.source_id, fields: %w[story from]) || {}
-    rescue Koala::Facebook::AuthenticationError
-      @inbox.channel.authorization_error!
-      raise
-    rescue StandardError => e
-      result = {}
-      Sentry.capture_exception(e)
-    end
+    result = get_story_object_from_source_id(message.source_id)
     story_id = result['story']['mention']['id']
     story_sender = result['from']['username']
     message.content_attributes[:story_sender] = story_sender
@@ -70,4 +61,15 @@ class Messages::Messenger::MessageBuilder
     message.content = I18n.t('conversations.messages.instagram_story_content', story_sender: story_sender)
     message.save!
   end
+
+  def get_story_object_from_source_id(source_id)
+    k = Koala::Facebook::API.new(@inbox.channel.page_access_token) if @inbox.facebook?
+    k.get_object(source_id, fields: %w[story from]) || {}
+  rescue Koala::Facebook::AuthenticationError
+    @inbox.channel.authorization_error!
+    raise
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
+    {}
+  end
 end
diff --git a/app/controllers/api/v1/accounts/callbacks_controller.rb b/app/controllers/api/v1/accounts/callbacks_controller.rb
index 842930874..8a163f011 100644
--- a/app/controllers/api/v1/accounts/callbacks_controller.rb
+++ b/app/controllers/api/v1/accounts/callbacks_controller.rb
@@ -15,7 +15,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
       set_instagram_id(page_access_token, facebook_channel)
       set_avatar(@facebook_inbox, page_id)
     rescue StandardError => e
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e).capture_exception
     end
   end
 
@@ -60,7 +60,7 @@ class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
       set_instagram_id(access_token, fb_page)
       fb_page&.reauthorized!
     rescue StandardError => e
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e).capture_exception
     end
   end
 
diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index c96ae9a96..4f9f6d55b 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -10,7 +10,7 @@ class Api::V1::WebhooksController < ApplicationController
     twitter_consumer.consume
     head :ok
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e).capture_exception
     head :ok
   end
 
diff --git a/app/controllers/concerns/request_exception_handler.rb b/app/controllers/concerns/request_exception_handler.rb
index 51061017e..6e9ed04cc 100644
--- a/app/controllers/concerns/request_exception_handler.rb
+++ b/app/controllers/concerns/request_exception_handler.rb
@@ -9,8 +9,7 @@ module RequestExceptionHandler
 
   def handle_with_exception
     yield
-  rescue ActiveRecord::RecordNotFound => e
-    Sentry.capture_exception(e)
+  rescue ActiveRecord::RecordNotFound
     render_not_found_error('Resource could not be found')
   rescue Pundit::NotAuthorizedError
     render_unauthorized('You are not authorized to do this action')
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index 0fb22224a..ef24ef4c2 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -11,7 +11,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     channel.authorization_error!
   rescue StandardError => e
     channel.authorization_error!
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
   end
 
   private
diff --git a/app/services/automation_rules/action_service.rb b/app/services/automation_rules/action_service.rb
index 12bb95cb9..1d2e0d4da 100644
--- a/app/services/automation_rules/action_service.rb
+++ b/app/services/automation_rules/action_service.rb
@@ -12,7 +12,7 @@ class AutomationRules::ActionService
       begin
         send(action[:action_name], action[:action_params])
       rescue StandardError => e
-        Sentry.capture_exception(e)
+        ChatwootExceptionTracker.new(e, account: @account).capture_exception
       end
     end
   ensure
diff --git a/app/services/facebook/send_on_facebook_service.rb b/app/services/facebook/send_on_facebook_service.rb
index 7ebab36a3..d85820b48 100644
--- a/app/services/facebook/send_on_facebook_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -9,7 +9,7 @@ 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
-    Sentry.capture_exception(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!
   end
diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index 6905700dd..75c77b540 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -38,7 +38,7 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
       raise
     rescue StandardError => e
       result = {}
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     end
 
     find_or_create_contact(result)
diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index c206c765b..2ad7c9042 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -17,7 +17,7 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
     send_to_facebook_page attachament_message_params if message.attachments.present?
     send_to_facebook_page message_params
   rescue StandardError => e
-    Sentry.capture_exception(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!
   end
diff --git a/app/services/message_templates/template/email_collect.rb b/app/services/message_templates/template/email_collect.rb
index ba49a6c56..3c0e4096f 100644
--- a/app/services/message_templates/template/email_collect.rb
+++ b/app/services/message_templates/template/email_collect.rb
@@ -7,7 +7,7 @@ class MessageTemplates::Template::EmailCollect
       conversation.messages.create!(email_input_box_template_message_params)
     end
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: conversation.account).capture_exception
     true
   end
 
diff --git a/app/services/message_templates/template/greeting.rb b/app/services/message_templates/template/greeting.rb
index 11388ae7d..4b41c84b6 100644
--- a/app/services/message_templates/template/greeting.rb
+++ b/app/services/message_templates/template/greeting.rb
@@ -6,7 +6,7 @@ class MessageTemplates::Template::Greeting
       conversation.messages.create!(greeting_message_params)
     end
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: conversation.account).capture_exception
     true
   end
 
diff --git a/app/services/message_templates/template/out_of_office.rb b/app/services/message_templates/template/out_of_office.rb
index f208f7284..b6fd1b7a1 100644
--- a/app/services/message_templates/template/out_of_office.rb
+++ b/app/services/message_templates/template/out_of_office.rb
@@ -6,7 +6,7 @@ class MessageTemplates::Template::OutOfOffice
       conversation.messages.create!(out_of_office_message_params)
     end
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e, account: conversation.account).capture_exception
     true
   end
 
diff --git a/app/services/twilio/send_on_twilio_service.rb b/app/services/twilio/send_on_twilio_service.rb
index fa480e745..7a1253193 100644
--- a/app/services/twilio/send_on_twilio_service.rb
+++ b/app/services/twilio/send_on_twilio_service.rb
@@ -9,7 +9,7 @@ class Twilio::SendOnTwilioService < Base::SendOnChannelService
     begin
       twilio_message = client.messages.create(**message_params)
     rescue Twilio::REST::TwilioError => e
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e, user: message.sender, account: message.account).capture_exception
     end
     message.update!(source_id: twilio_message.sid) if twilio_message
   end
diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb
index 16670e25d..1b1c557db 100644
--- a/config/initializers/sentry.rb
+++ b/config/initializers/sentry.rb
@@ -2,5 +2,14 @@ if ENV['SENTRY_DSN']
   Sentry.init do |config|
     config.dsn = ENV['SENTRY_DSN']
     config.enabled_environments = %w[staging production]
+
+    # To activate performance monitoring, set one of these options.
+    # We recommend adjusting the value in production:
+    config.traces_sample_rate = 0.1
+
+    config.excluded_exceptions += ['Rack::Timeout::RequestTimeoutException']
+
+    # to track post data in sentry
+    config.send_default_pii = true unless ENV['DISABLE_SENTRY_PII']
   end
 end
diff --git a/lib/chatwoot_exception_tracker.rb b/lib/chatwoot_exception_tracker.rb
new file mode 100644
index 000000000..5e08d2dad
--- /dev/null
+++ b/lib/chatwoot_exception_tracker.rb
@@ -0,0 +1,32 @@
+###############
+# One library to capture_exception and send to the specific service.
+# # e as exception, u for user and a for account (user and account are optional)
+# Usage: ChatwootExceptionTracker(e, user: u, account: a).capture_exception
+############
+
+class ChatwootExceptionTracker
+  def initialize(exception, user: nil, account: nil)
+    @exception = exception
+    @user = user
+    @account = account
+  end
+
+  def capture_exception
+    capture_exception_with_sentry if ENV['SENTRY_DSN'].present?
+    # Implement other providers like honeybadger, rollbar etc in future
+  end
+
+  private
+
+  def capture_exception_with_sentry
+    Sentry.with_scope do |scope|
+      if @account.present?
+        scope.set_context('account', { id: @account.id, name: @account.name })
+        scope.set_tags(account_id: @account.id)
+      end
+
+      scope.set_user(id: @user.id, email: @user.email) if @user.is_a?(User)
+      Sentry.capture_exception(@exception)
+    end
+  end
+end
diff --git a/lib/chatwoot_hub.rb b/lib/chatwoot_hub.rb
index 86f296f79..273a399d9 100644
--- a/lib/chatwoot_hub.rb
+++ b/lib/chatwoot_hub.rb
@@ -42,7 +42,7 @@ class ChatwootHub
     rescue *ExceptionList::REST_CLIENT_EXCEPTIONS => e
       Rails.logger.error "Exception: #{e.message}"
     rescue StandardError => e
-      Sentry.capture_exception(e)
+      ChatwootExceptionTracker.new(e).capture_exception
     end
     version
   end
@@ -53,7 +53,7 @@ class ChatwootHub
   rescue *ExceptionList::REST_CLIENT_EXCEPTIONS => e
     Rails.logger.error "Exception: #{e.message}"
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e).capture_exception
   end
 
   def self.send_browser_push(fcm_token_list, fcm_options)
@@ -62,7 +62,7 @@ class ChatwootHub
   rescue *ExceptionList::REST_CLIENT_EXCEPTIONS => e
     Rails.logger.error "Exception: #{e.message}"
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e).capture_exception
   end
 
   def self.emit_event(event_name, event_data)
@@ -73,6 +73,6 @@ class ChatwootHub
   rescue *ExceptionList::REST_CLIENT_EXCEPTIONS => e
     Rails.logger.error "Exception: #{e.message}"
   rescue StandardError => e
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e).capture_exception
   end
 end
diff --git a/lib/integrations/facebook/message_creator.rb b/lib/integrations/facebook/message_creator.rb
index 3b71460b1..cf28743f9 100644
--- a/lib/integrations/facebook/message_creator.rb
+++ b/lib/integrations/facebook/message_creator.rb
@@ -15,7 +15,7 @@ class Integrations::Facebook::MessageCreator
       create_contact_message
     end
     # rescue => e
-    # Sentry.capture_exception(e)
+    # ChatwootExceptionTracker.new(e).capture_exception
     # end
   end
 
diff --git a/lib/webhooks/trigger.rb b/lib/webhooks/trigger.rb
index 383994f55..517f6862a 100644
--- a/lib/webhooks/trigger.rb
+++ b/lib/webhooks/trigger.rb
@@ -11,6 +11,6 @@ class Webhooks::Trigger
     Rails.logger.error "Exception: invalid webhook url #{url} : #{e.message}"
   rescue StandardError => e
     Rails.logger.error "Exception: invalid webhook url #{url} : #{e.message}"
-    Sentry.capture_exception(e)
+    ChatwootExceptionTracker.new(e).capture_exception
   end
 end
diff --git a/package.json b/package.json
index 4330cfab4..8bfdaf74a 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
     "@hcaptcha/vue-hcaptcha": "^0.3.2",
     "@rails/actioncable": "6.1.3",
     "@rails/webpacker": "5.3.0",
-    "@sentry/tracing": "^6.4.1",
-    "@sentry/vue": "^6.4.1",
+    "@sentry/tracing": "^6.19.7",
+    "@sentry/vue": "^6.19.7",
     "activestorage": "^5.2.6",
     "axios": "^0.21.2",
     "babel-plugin-syntax-jsx": "^6.18.0",
diff --git a/spec/lib/chatwoot_exception_tracker_spec.rb b/spec/lib/chatwoot_exception_tracker_spec.rb
new file mode 100644
index 000000000..5e8164d6d
--- /dev/null
+++ b/spec/lib/chatwoot_exception_tracker_spec.rb
@@ -0,0 +1,23 @@
+require 'rails_helper'
+
+describe ChatwootExceptionTracker do
+  it 'returns nil if no tracker is configured' do
+    expect(described_class.new('random').capture_exception).to eq(nil)
+  end
+
+  context 'with sentry DSN' do
+    before do
+      # since sentry is not initated in test, we need to do it manually
+      Sentry.init do |config|
+        config.dsn = 'test'
+      end
+    end
+
+    it 'will call sentry capture exception' do
+      with_modified_env SENTRY_DSN: 'random dsn' do
+        expect(Sentry).to receive(:capture_exception).with('random')
+        described_class.new('random').capture_exception
+      end
+    end
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index 32b1fc9c7..82d266618 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1688,84 +1688,84 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@sentry/browser@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.4.1.tgz#b6c62736caaade7fdf6638513d9aad138abde2ac"
-  integrity sha512-3cDud6GWutnJqcnheIq0lPNTsUJbrRLevQ+g1YfawVXFUxfmmY2bOsGd/Mxq17LxYeBHgKTitXv3DU1bsQ+WBQ==
+"@sentry/browser@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.7.tgz#a40b6b72d911b5f1ed70ed3b4e7d4d4e625c0b5f"
+  integrity sha512-oDbklp4O3MtAM4mtuwyZLrgO1qDVYIujzNJQzXmi9YzymJCuzMLSRDvhY83NNDCRxf0pds4DShgYeZdbSyKraA==
   dependencies:
-    "@sentry/core" "6.4.1"
-    "@sentry/types" "6.4.1"
-    "@sentry/utils" "6.4.1"
+    "@sentry/core" "6.19.7"
+    "@sentry/types" "6.19.7"
+    "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/core@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.4.1.tgz#789b0071996de5c1a20673f879408926aa3b4fa6"
-  integrity sha512-Lx13oTiP+Tjvm5VxulcCszNVd2S1wY4viSnr+ygq62ySVERR+t7uOZDSARZ0rZ259GwW6nkbMh9dDmD0d6VCGQ==
+"@sentry/core@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.7.tgz#156aaa56dd7fad8c89c145be6ad7a4f7209f9785"
+  integrity sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==
   dependencies:
-    "@sentry/hub" "6.4.1"
-    "@sentry/minimal" "6.4.1"
-    "@sentry/types" "6.4.1"
-    "@sentry/utils" "6.4.1"
+    "@sentry/hub" "6.19.7"
+    "@sentry/minimal" "6.19.7"
+    "@sentry/types" "6.19.7"
+    "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/hub@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.4.1.tgz#fa9c05ca32674e2e8477120b71084a1c91a5e023"
-  integrity sha512-7IZRP5buDE6s/c3vWzzPR/ySE+8GUuHPgTEPiDCPOCWwUN11zXDafJDKkJqY3muJfebUKmC/JG67RyBx+XlnlQ==
+"@sentry/hub@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11"
+  integrity sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==
   dependencies:
-    "@sentry/types" "6.4.1"
-    "@sentry/utils" "6.4.1"
+    "@sentry/types" "6.19.7"
+    "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/minimal@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.4.1.tgz#d3f968c060c3d3cc997071756659e24047b5dd97"
-  integrity sha512-4x/PRbDZACCKJqjta9EkhiIMyGMf7VgBX13EEWEDVWLP7ymFukBuTr4ap/Tz9429kB/yXZuDGGMIZp/G618H3g==
+"@sentry/minimal@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4"
+  integrity sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==
   dependencies:
-    "@sentry/hub" "6.4.1"
-    "@sentry/types" "6.4.1"
+    "@sentry/hub" "6.19.7"
+    "@sentry/types" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/tracing@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.4.1.tgz#3a9119e1ef5206ea565854c325b19a317cc1cca7"
-  integrity sha512-EPRadE9n/wpUjx4jqP/8vXdOAZBk7vjlzRKniJgKgQUO3v03i0ui6xydaal2mvhplIyOCI2muXdGhjUO7ga4uw==
+"@sentry/tracing@^6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.19.7.tgz#54bb99ed5705931cd33caf71da347af769f02a4c"
+  integrity sha512-ol4TupNnv9Zd+bZei7B6Ygnr9N3Gp1PUrNI761QSlHtPC25xXC5ssSD3GMhBgyQrcvpuRcCFHVNNM97tN5cZiA==
   dependencies:
-    "@sentry/hub" "6.4.1"
-    "@sentry/minimal" "6.4.1"
-    "@sentry/types" "6.4.1"
-    "@sentry/utils" "6.4.1"
+    "@sentry/hub" "6.19.7"
+    "@sentry/minimal" "6.19.7"
+    "@sentry/types" "6.19.7"
+    "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/types@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.4.1.tgz#7c0a4355a1d04321b901197723a8f55c263226e9"
-  integrity sha512-sTu/GaLsLYk1AkAqpkMT4+4q665LtZjhV0hkgiTD4N3zPl5uSf1pCIzxPRYjOpe7NEANmWv8U4PaGKGtc2eMfA==
+"@sentry/types@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7"
+  integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==
 
 "@sentry/types@^6.11.0":
   version "6.12.0"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.12.0.tgz#b7395688a79403c6df8d8bb8d81deb8222519853"
   integrity sha512-urtgLzE4EDMAYQHYdkgC0Ei9QvLajodK1ntg71bGn0Pm84QUpaqpPDfHRU+i6jLeteyC7kWwa5O5W1m/jrjGXA==
 
-"@sentry/utils@6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.4.1.tgz#55fa7da58898773cbd538e4895fc2e4ec695ecab"
-  integrity sha512-xJ1uVa5fvg23pXQfulvCIBb9pQ3p1awyd1PapK2AYi+wKjTuYl4B9edmhjRREEQEExznl/d2OVm78fRXLq7M9Q==
+"@sentry/utils@6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79"
+  integrity sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==
   dependencies:
-    "@sentry/types" "6.4.1"
+    "@sentry/types" "6.19.7"
     tslib "^1.9.3"
 
-"@sentry/vue@^6.4.1":
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-6.4.1.tgz#776a05be1accf251ec7c74d01be0bba57ff995a9"
-  integrity sha512-Bq7HVbhXqcJlVd9cLs4gnCi+mwPksZ0K4E7w6ZZH1jpNYVziymL5EdhM28o83aD4YfgxEf3PHnOLBmfLfg7izA==
+"@sentry/vue@^6.19.7":
+  version "6.19.7"
+  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-6.19.7.tgz#3f3a880caef777a79fd1e2245768979642cf6885"
+  integrity sha512-TW2yrbNebpWDN9CcQQuDNWZ3BCM/noDS1jz91W0bcsaAeoZwG0xgcHZqFwL+ms0G/yQmRc2Joe0fKPYp03IBGg==
   dependencies:
-    "@sentry/browser" "6.4.1"
-    "@sentry/core" "6.4.1"
-    "@sentry/minimal" "6.4.1"
-    "@sentry/types" "6.4.1"
-    "@sentry/utils" "6.4.1"
+    "@sentry/browser" "6.19.7"
+    "@sentry/core" "6.19.7"
+    "@sentry/minimal" "6.19.7"
+    "@sentry/types" "6.19.7"
+    "@sentry/utils" "6.19.7"
     tslib "^1.9.3"
 
 "@sinonjs/commons@^1.7.0":

From 5ce29a7bebd4b661aa06dbeeb6fb78b02c91ed7b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 9 May 2022 18:57:05 +0530
Subject: [PATCH 100/177] chore: Update translations from Crowdin (#4652)

---
 .../dashboard/i18n/locale/ar/automation.json  |  11 +-
 .../dashboard/i18n/locale/ar/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ar/contact.json     |   8 +
 .../i18n/locale/ar/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |  31 +-
 .../i18n/locale/ar/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ar/report.json      |  75 ++-
 .../i18n/locale/ar/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ar/settings.json    |  12 +-
 .../dashboard/i18n/locale/ar/signup.json      |   3 +-
 .../dashboard/i18n/locale/bg/automation.json  |  11 +-
 .../dashboard/i18n/locale/bg/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/bg/contact.json     |   8 +
 .../i18n/locale/bg/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |  33 +-
 .../i18n/locale/bg/integrations.json          |  48 +-
 .../dashboard/i18n/locale/bg/report.json      |  85 ++-
 .../i18n/locale/bg/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/bg/settings.json    |  10 +-
 .../dashboard/i18n/locale/bg/signup.json      |   3 +-
 .../i18n/locale/bg/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/ca/automation.json  |  11 +-
 .../dashboard/i18n/locale/ca/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ca/contact.json     |   8 +
 .../i18n/locale/ca/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  33 +-
 .../i18n/locale/ca/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ca/report.json      |  85 ++-
 .../i18n/locale/ca/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ca/settings.json    |  10 +-
 .../dashboard/i18n/locale/ca/signup.json      |   3 +-
 .../i18n/locale/ca/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/cs/automation.json  |  11 +-
 .../dashboard/i18n/locale/cs/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/cs/contact.json     |   8 +
 .../i18n/locale/cs/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |  33 +-
 .../i18n/locale/cs/integrations.json          |  48 +-
 .../dashboard/i18n/locale/cs/report.json      |  85 ++-
 .../i18n/locale/cs/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/cs/settings.json    |  10 +-
 .../dashboard/i18n/locale/cs/signup.json      |   3 +-
 .../i18n/locale/cs/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/da/automation.json  |  11 +-
 .../dashboard/i18n/locale/da/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/da/contact.json     |   8 +
 .../i18n/locale/da/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/da/inboxMgmt.json   |  33 +-
 .../i18n/locale/da/integrations.json          |  48 +-
 .../dashboard/i18n/locale/da/report.json      |  85 ++-
 .../i18n/locale/da/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/da/settings.json    |  10 +-
 .../dashboard/i18n/locale/da/signup.json      |   3 +-
 .../i18n/locale/da/teamsSettings.json         |   2 +-
 .../i18n/locale/de/advancedFilters.json       |   4 +-
 .../i18n/locale/de/attributesMgmt.json        |   4 +-
 .../dashboard/i18n/locale/de/automation.json  |  21 +-
 .../dashboard/i18n/locale/de/campaign.json    |   4 +-
 .../dashboard/i18n/locale/de/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/de/contact.json     |  22 +-
 .../i18n/locale/de/contactFilters.json        |   2 +-
 .../i18n/locale/de/conversation.json          |   2 +-
 .../i18n/locale/de/generalSettings.json       |  16 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  37 +-
 .../i18n/locale/de/integrationApps.json       |  10 +-
 .../i18n/locale/de/integrations.json          |  48 +-
 .../dashboard/i18n/locale/de/report.json      | 117 ++--
 .../i18n/locale/de/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/de/settings.json    |  12 +-
 .../dashboard/i18n/locale/de/signup.json      |   3 +-
 .../i18n/locale/de/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/el/automation.json  |  11 +-
 .../dashboard/i18n/locale/el/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/el/contact.json     |   8 +
 .../i18n/locale/el/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  31 +-
 .../i18n/locale/el/integrations.json          |  48 +-
 .../dashboard/i18n/locale/el/report.json      |  75 ++-
 .../i18n/locale/el/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/el/settings.json    |  10 +-
 .../dashboard/i18n/locale/el/signup.json      |   3 +-
 .../dashboard/i18n/locale/es/automation.json  |  11 +-
 .../dashboard/i18n/locale/es/chatlist.json    |   5 +-
 .../dashboard/i18n/locale/es/contact.json     |   8 +
 .../i18n/locale/es/conversation.json          |  10 +-
 .../i18n/locale/es/generalSettings.json       |  10 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |  33 +-
 .../i18n/locale/es/integrations.json          |  48 +-
 .../dashboard/i18n/locale/es/report.json      |  85 ++-
 .../i18n/locale/es/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/es/settings.json    |  10 +-
 .../dashboard/i18n/locale/es/signup.json      |   3 +-
 .../i18n/locale/es/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/fa/automation.json  |  11 +-
 .../dashboard/i18n/locale/fa/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/fa/contact.json     |   8 +
 .../i18n/locale/fa/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  33 +-
 .../i18n/locale/fa/integrations.json          |  48 +-
 .../dashboard/i18n/locale/fa/report.json      |  85 ++-
 .../i18n/locale/fa/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/fa/settings.json    |  10 +-
 .../dashboard/i18n/locale/fa/signup.json      |   3 +-
 .../dashboard/i18n/locale/fi/automation.json  |  11 +-
 .../dashboard/i18n/locale/fi/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/fi/contact.json     |   8 +
 .../i18n/locale/fi/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |  33 +-
 .../i18n/locale/fi/integrations.json          |  48 +-
 .../dashboard/i18n/locale/fi/report.json      |  85 ++-
 .../i18n/locale/fi/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/fi/settings.json    |  10 +-
 .../dashboard/i18n/locale/fi/signup.json      |   3 +-
 .../i18n/locale/fi/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/fr/automation.json  |  27 +-
 .../dashboard/i18n/locale/fr/campaign.json    |  12 +-
 .../dashboard/i18n/locale/fr/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/fr/chatlist.json    |   5 +-
 .../dashboard/i18n/locale/fr/contact.json     |  14 +-
 .../i18n/locale/fr/conversation.json          |  30 +-
 .../i18n/locale/fr/generalSettings.json       |  10 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   | 129 +++--
 .../i18n/locale/fr/integrations.json          |  48 +-
 .../dashboard/i18n/locale/fr/report.json      | 127 ++--
 .../i18n/locale/fr/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/fr/settings.json    |  54 +-
 .../dashboard/i18n/locale/fr/signup.json      |   3 +-
 .../i18n/locale/fr/teamsSettings.json         |   4 +-
 .../dashboard/i18n/locale/he/automation.json  |  11 +-
 .../dashboard/i18n/locale/he/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/he/contact.json     |   8 +
 .../i18n/locale/he/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/he/inboxMgmt.json   |  33 +-
 .../i18n/locale/he/integrations.json          |  48 +-
 .../dashboard/i18n/locale/he/report.json      |  85 ++-
 .../i18n/locale/he/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/he/settings.json    |  10 +-
 .../dashboard/i18n/locale/he/signup.json      |   3 +-
 .../i18n/locale/he/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/hi/automation.json  |  11 +-
 .../dashboard/i18n/locale/hi/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/hi/contact.json     |   8 +
 .../i18n/locale/hi/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |  33 +-
 .../i18n/locale/hi/integrations.json          |  48 +-
 .../dashboard/i18n/locale/hi/report.json      |  85 ++-
 .../i18n/locale/hi/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/hi/settings.json    |  10 +-
 .../dashboard/i18n/locale/hi/signup.json      |   3 +-
 .../i18n/locale/hi/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/hu/automation.json  |  11 +-
 .../dashboard/i18n/locale/hu/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/hu/contact.json     |   8 +
 .../i18n/locale/hu/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |  33 +-
 .../i18n/locale/hu/integrations.json          |  48 +-
 .../dashboard/i18n/locale/hu/report.json      |  85 ++-
 .../i18n/locale/hu/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/hu/settings.json    |  10 +-
 .../dashboard/i18n/locale/hu/signup.json      |   3 +-
 .../i18n/locale/hu/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/id/automation.json  |  11 +-
 .../dashboard/i18n/locale/id/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/id/contact.json     |   8 +
 .../i18n/locale/id/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/id/inboxMgmt.json   |  33 +-
 .../i18n/locale/id/integrations.json          |  48 +-
 .../dashboard/i18n/locale/id/report.json      |  85 ++-
 .../i18n/locale/id/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/id/settings.json    |  10 +-
 .../dashboard/i18n/locale/id/signup.json      |   3 +-
 .../i18n/locale/id/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/it/automation.json  |  21 +-
 .../dashboard/i18n/locale/it/campaign.json    |   2 +-
 .../dashboard/i18n/locale/it/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/it/contact.json     | 196 ++++---
 .../i18n/locale/it/conversation.json          | 200 +++----
 .../i18n/locale/it/generalSettings.json       |  10 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   | 327 ++++++-----
 .../i18n/locale/it/integrations.json          |  48 +-
 .../dashboard/i18n/locale/it/report.json      |  75 ++-
 .../i18n/locale/it/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/it/settings.json    |  10 +-
 .../dashboard/i18n/locale/it/signup.json      |   3 +-
 .../dashboard/i18n/locale/ja/automation.json  |  11 +-
 .../dashboard/i18n/locale/ja/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ja/contact.json     |   8 +
 .../i18n/locale/ja/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |  33 +-
 .../i18n/locale/ja/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ja/report.json      |  85 ++-
 .../i18n/locale/ja/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ja/settings.json    |  10 +-
 .../dashboard/i18n/locale/ja/signup.json      |   3 +-
 .../i18n/locale/ja/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/ko/automation.json  |  11 +-
 .../dashboard/i18n/locale/ko/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ko/contact.json     |   8 +
 .../i18n/locale/ko/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |  33 +-
 .../i18n/locale/ko/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ko/report.json      |  85 ++-
 .../i18n/locale/ko/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ko/settings.json    |  10 +-
 .../dashboard/i18n/locale/ko/signup.json      |   3 +-
 .../i18n/locale/ko/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/lv/automation.json  |  11 +-
 .../dashboard/i18n/locale/lv/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/lv/contact.json     |   8 +
 .../i18n/locale/lv/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |  33 +-
 .../i18n/locale/lv/integrations.json          |  48 +-
 .../dashboard/i18n/locale/lv/report.json      |  85 ++-
 .../i18n/locale/lv/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/lv/settings.json    |  10 +-
 .../dashboard/i18n/locale/lv/signup.json      |   3 +-
 .../i18n/locale/lv/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/ml/automation.json  |  11 +-
 .../dashboard/i18n/locale/ml/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ml/contact.json     |   8 +
 .../i18n/locale/ml/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  33 +-
 .../i18n/locale/ml/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ml/report.json      |  85 ++-
 .../i18n/locale/ml/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ml/settings.json    |  10 +-
 .../dashboard/i18n/locale/ml/signup.json      |   3 +-
 .../i18n/locale/ml/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/ne/automation.json  |  11 +-
 .../dashboard/i18n/locale/ne/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ne/contact.json     |   8 +
 .../i18n/locale/ne/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |  33 +-
 .../i18n/locale/ne/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ne/report.json      |  85 ++-
 .../i18n/locale/ne/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ne/settings.json    |  10 +-
 .../dashboard/i18n/locale/ne/signup.json      |   3 +-
 .../i18n/locale/ne/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/nl/automation.json  |  11 +-
 .../dashboard/i18n/locale/nl/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/nl/contact.json     |   8 +
 .../i18n/locale/nl/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  33 +-
 .../i18n/locale/nl/integrations.json          |  48 +-
 .../dashboard/i18n/locale/nl/report.json      |  85 ++-
 .../i18n/locale/nl/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/nl/settings.json    |  10 +-
 .../dashboard/i18n/locale/nl/signup.json      |   3 +-
 .../i18n/locale/nl/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/no/automation.json  |  11 +-
 .../dashboard/i18n/locale/no/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/no/contact.json     |   8 +
 .../i18n/locale/no/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/no/inboxMgmt.json   |  33 +-
 .../i18n/locale/no/integrations.json          |  48 +-
 .../dashboard/i18n/locale/no/report.json      |  85 ++-
 .../i18n/locale/no/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/no/settings.json    |  10 +-
 .../dashboard/i18n/locale/no/signup.json      |   3 +-
 .../i18n/locale/no/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/pl/automation.json  |  11 +-
 .../dashboard/i18n/locale/pl/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/pl/contact.json     |   8 +
 .../i18n/locale/pl/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |  33 +-
 .../i18n/locale/pl/integrations.json          |  48 +-
 .../dashboard/i18n/locale/pl/report.json      |  85 ++-
 .../i18n/locale/pl/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/pl/settings.json    |  10 +-
 .../dashboard/i18n/locale/pl/signup.json      |   3 +-
 .../i18n/locale/pl/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/pt/automation.json  |  11 +-
 .../dashboard/i18n/locale/pt/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/pt/contact.json     |  10 +-
 .../i18n/locale/pt/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  33 +-
 .../i18n/locale/pt/integrations.json          |  48 +-
 .../dashboard/i18n/locale/pt/report.json      |  85 ++-
 .../i18n/locale/pt/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/pt/settings.json    |  10 +-
 .../dashboard/i18n/locale/pt/signup.json      |   3 +-
 .../i18n/locale/pt/teamsSettings.json         |   2 +-
 .../i18n/locale/pt_BR/advancedFilters.json    |   4 +-
 .../i18n/locale/pt_BR/automation.json         |  11 +-
 .../dashboard/i18n/locale/pt_BR/chatlist.json |   3 +-
 .../dashboard/i18n/locale/pt_BR/contact.json  |   8 +
 .../i18n/locale/pt_BR/contactFilters.json     |   4 +-
 .../i18n/locale/pt_BR/generalSettings.json    |  10 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  35 +-
 .../i18n/locale/pt_BR/integrations.json       |  48 +-
 .../dashboard/i18n/locale/pt_BR/report.json   |  85 ++-
 .../i18n/locale/pt_BR/setNewPassword.json     |   3 +
 .../dashboard/i18n/locale/pt_BR/settings.json |  12 +-
 .../dashboard/i18n/locale/pt_BR/signup.json   |   3 +-
 .../i18n/locale/pt_BR/teamsSettings.json      |   2 +-
 .../i18n/locale/ro/advancedFilters.json       |  98 ++--
 .../dashboard/i18n/locale/ro/agentMgmt.json   |  12 +-
 .../i18n/locale/ro/attributesMgmt.json        |  10 +-
 .../dashboard/i18n/locale/ro/automation.json  |  85 +--
 .../dashboard/i18n/locale/ro/campaign.json    |  16 +-
 .../dashboard/i18n/locale/ro/cannedMgmt.json  |   8 +-
 .../dashboard/i18n/locale/ro/chatlist.json    |   9 +-
 .../dashboard/i18n/locale/ro/contact.json     |  36 +-
 .../i18n/locale/ro/contactFilters.json        |  54 +-
 .../i18n/locale/ro/conversation.json          |  86 +--
 .../i18n/locale/ro/generalSettings.json       | 116 ++--
 .../dashboard/i18n/locale/ro/inboxMgmt.json   | 305 +++++-----
 .../i18n/locale/ro/integrationApps.json       |  30 +-
 .../i18n/locale/ro/integrations.json          |  54 +-
 .../dashboard/i18n/locale/ro/labelsMgmt.json  |   6 +-
 .../dashboard/i18n/locale/ro/report.json      | 213 ++++---
 .../i18n/locale/ro/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ro/settings.json    | 138 ++---
 .../dashboard/i18n/locale/ro/signup.json      |  21 +-
 .../i18n/locale/ro/teamsSettings.json         |  94 +--
 .../dashboard/i18n/locale/ru/automation.json  |  11 +-
 .../dashboard/i18n/locale/ru/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ru/contact.json     |   8 +
 .../i18n/locale/ru/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  33 +-
 .../i18n/locale/ru/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ru/report.json      |  75 ++-
 .../i18n/locale/ru/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ru/settings.json    |  10 +-
 .../dashboard/i18n/locale/ru/signup.json      |   3 +-
 .../dashboard/i18n/locale/sk/automation.json  |  11 +-
 .../dashboard/i18n/locale/sk/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/sk/contact.json     |   8 +
 .../i18n/locale/sk/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  33 +-
 .../i18n/locale/sk/integrations.json          |  48 +-
 .../dashboard/i18n/locale/sk/report.json      |  85 ++-
 .../i18n/locale/sk/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/sk/settings.json    |  10 +-
 .../dashboard/i18n/locale/sk/signup.json      |   3 +-
 .../i18n/locale/sk/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/sr/automation.json  |  11 +-
 .../dashboard/i18n/locale/sr/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/sr/contact.json     |   8 +
 .../i18n/locale/sr/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |  33 +-
 .../i18n/locale/sr/integrations.json          |  48 +-
 .../dashboard/i18n/locale/sr/report.json      |  85 ++-
 .../i18n/locale/sr/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/sr/settings.json    |  10 +-
 .../dashboard/i18n/locale/sr/signup.json      |   3 +-
 .../i18n/locale/sr/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/sv/automation.json  |  11 +-
 .../dashboard/i18n/locale/sv/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/sv/contact.json     |   8 +
 .../i18n/locale/sv/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |  33 +-
 .../i18n/locale/sv/integrations.json          |  48 +-
 .../dashboard/i18n/locale/sv/report.json      |  85 ++-
 .../i18n/locale/sv/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/sv/settings.json    |  10 +-
 .../dashboard/i18n/locale/sv/signup.json      |   3 +-
 .../i18n/locale/sv/teamsSettings.json         |   2 +-
 .../dashboard/i18n/locale/ta/automation.json  |  11 +-
 .../dashboard/i18n/locale/ta/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/ta/contact.json     |   8 +
 .../i18n/locale/ta/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |  33 +-
 .../i18n/locale/ta/integrations.json          |  48 +-
 .../dashboard/i18n/locale/ta/report.json      |  85 ++-
 .../i18n/locale/ta/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/ta/settings.json    |  10 +-
 .../dashboard/i18n/locale/ta/signup.json      |   3 +-
 .../i18n/locale/ta/teamsSettings.json         |   2 +-
 .../i18n/locale/th/advancedFilters.json       | 104 ++--
 .../dashboard/i18n/locale/th/agentMgmt.json   |  14 +-
 .../i18n/locale/th/attributesMgmt.json        |  60 +-
 .../dashboard/i18n/locale/th/automation.json  |  93 +--
 .../dashboard/i18n/locale/th/campaign.json    |  30 +-
 .../dashboard/i18n/locale/th/cannedMgmt.json  |  10 +-
 .../dashboard/i18n/locale/th/chatlist.json    |   9 +-
 .../dashboard/i18n/locale/th/contact.json     |  70 ++-
 .../i18n/locale/th/contactFilters.json        |  56 +-
 .../i18n/locale/th/conversation.json          | 114 ++--
 .../dashboard/i18n/locale/th/csatMgmt.json    |   4 +-
 .../i18n/locale/th/generalSettings.json       | 122 ++--
 .../dashboard/i18n/locale/th/inboxMgmt.json   | 341 +++++------
 .../i18n/locale/th/integrationApps.json       |  34 +-
 .../i18n/locale/th/integrations.json          |  80 +--
 .../dashboard/i18n/locale/th/labelsMgmt.json  |  48 +-
 .../dashboard/i18n/locale/th/login.json       |   6 +-
 .../dashboard/i18n/locale/th/report.json      | 335 ++++++-----
 .../i18n/locale/th/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/th/settings.json    | 274 ++++-----
 .../dashboard/i18n/locale/th/signup.json      |  31 +-
 .../i18n/locale/th/teamsSettings.json         | 110 ++--
 .../dashboard/i18n/locale/th/webhooks.json    |   2 +-
 .../i18n/locale/tr/advancedFilters.json       |  96 +--
 .../i18n/locale/tr/attributesMgmt.json        |   6 +-
 .../dashboard/i18n/locale/tr/automation.json  |  89 +--
 .../dashboard/i18n/locale/tr/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/tr/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/tr/contact.json     |  56 +-
 .../i18n/locale/tr/contactFilters.json        |  52 +-
 .../i18n/locale/tr/conversation.json          |  48 +-
 .../i18n/locale/tr/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |  31 +-
 .../i18n/locale/tr/integrations.json          |  48 +-
 .../dashboard/i18n/locale/tr/labelsMgmt.json  |   6 +-
 .../dashboard/i18n/locale/tr/report.json      |  85 ++-
 .../i18n/locale/tr/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/tr/settings.json    |  10 +-
 .../dashboard/i18n/locale/tr/signup.json      |   3 +-
 .../i18n/locale/uk/advancedFilters.json       | 100 ++--
 .../dashboard/i18n/locale/uk/agentMgmt.json   |   8 +-
 .../i18n/locale/uk/attributesMgmt.json        |  48 +-
 .../dashboard/i18n/locale/uk/automation.json  |  83 +--
 .../dashboard/i18n/locale/uk/campaign.json    |  42 +-
 .../dashboard/i18n/locale/uk/cannedMgmt.json  |   6 +-
 .../dashboard/i18n/locale/uk/chatlist.json    |   7 +-
 .../dashboard/i18n/locale/uk/contact.json     | 140 ++---
 .../i18n/locale/uk/contactFilters.json        |  56 +-
 .../i18n/locale/uk/conversation.json          | 108 ++--
 .../dashboard/i18n/locale/uk/csatMgmt.json    |   4 +-
 .../i18n/locale/uk/generalSettings.json       | 130 +++--
 .../dashboard/i18n/locale/uk/inboxMgmt.json   | 243 ++++----
 .../i18n/locale/uk/integrationApps.json       |  14 +-
 .../i18n/locale/uk/integrations.json          |  48 +-
 .../dashboard/i18n/locale/uk/report.json      | 163 ++++--
 .../i18n/locale/uk/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/uk/settings.json    | 104 ++--
 .../dashboard/i18n/locale/uk/signup.json      |  21 +-
 .../i18n/locale/uk/teamsSettings.json         |  70 +--
 .../i18n/locale/ur/advancedFilters.json       |  93 +++
 .../dashboard/i18n/locale/ur/agentMgmt.json   | 113 ++++
 .../i18n/locale/ur/attributesMgmt.json        |  99 ++++
 .../dashboard/i18n/locale/ur/automation.json  | 116 ++++
 .../dashboard/i18n/locale/ur/campaign.json    | 126 ++++
 .../dashboard/i18n/locale/ur/cannedMgmt.json  |  76 +++
 .../dashboard/i18n/locale/ur/chatlist.json    |  87 +++
 .../dashboard/i18n/locale/ur/contact.json     | 338 +++++++++++
 .../i18n/locale/ur/contactFilters.json        |  49 ++
 .../i18n/locale/ur/conversation.json          | 204 +++++++
 .../dashboard/i18n/locale/ur/csatMgmt.json    |   6 +
 .../i18n/locale/ur/generalSettings.json       | 140 +++++
 .../dashboard/i18n/locale/ur/inboxMgmt.json   | 545 ++++++++++++++++++
 .../i18n/locale/ur/integrationApps.json       |  62 ++
 .../i18n/locale/ur/integrations.json          |  89 +++
 .../dashboard/i18n/locale/ur/labelsMgmt.json  |  70 +++
 .../dashboard/i18n/locale/ur/login.json       |  21 +
 .../dashboard/i18n/locale/ur/report.json      | 445 ++++++++++++++
 .../i18n/locale/ur/resetPassword.json         |  15 +
 .../i18n/locale/ur/setNewPassword.json        |  23 +
 .../dashboard/i18n/locale/ur/settings.json    | 236 ++++++++
 .../dashboard/i18n/locale/ur/signup.json      |  39 ++
 .../i18n/locale/ur/teamsSettings.json         | 125 ++++
 .../dashboard/i18n/locale/ur/webhooks.json    |   5 +
 .../i18n/locale/vi/advancedFilters.json       |   4 +-
 .../dashboard/i18n/locale/vi/automation.json  |  11 +-
 .../dashboard/i18n/locale/vi/chatlist.json    |   3 +-
 .../dashboard/i18n/locale/vi/contact.json     |   8 +
 .../i18n/locale/vi/generalSettings.json       |   8 +
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |  33 +-
 .../i18n/locale/vi/integrations.json          |  48 +-
 .../dashboard/i18n/locale/vi/report.json      |  85 ++-
 .../i18n/locale/vi/setNewPassword.json        |   3 +
 .../dashboard/i18n/locale/vi/settings.json    |  10 +-
 .../dashboard/i18n/locale/vi/signup.json      |   3 +-
 .../i18n/locale/vi/teamsSettings.json         |   2 +-
 .../i18n/locale/zh_CN/advancedFilters.json    |   2 +-
 .../i18n/locale/zh_CN/attributesMgmt.json     |  26 +-
 .../i18n/locale/zh_CN/automation.json         |  15 +-
 .../dashboard/i18n/locale/zh_CN/chatlist.json |  11 +-
 .../dashboard/i18n/locale/zh_CN/contact.json  |  34 +-
 .../i18n/locale/zh_CN/generalSettings.json    |   8 +
 .../i18n/locale/zh_CN/inboxMgmt.json          |  33 +-
 .../i18n/locale/zh_CN/integrations.json       |  48 +-
 .../dashboard/i18n/locale/zh_CN/report.json   |  75 ++-
 .../i18n/locale/zh_CN/setNewPassword.json     |   3 +
 .../dashboard/i18n/locale/zh_CN/settings.json |  12 +-
 .../dashboard/i18n/locale/zh_CN/signup.json   |   3 +-
 .../i18n/locale/zh_CN/teamsSettings.json      |   2 +-
 .../i18n/locale/zh_TW/automation.json         |  11 +-
 .../dashboard/i18n/locale/zh_TW/chatlist.json |   3 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |   8 +
 .../i18n/locale/zh_TW/generalSettings.json    |   8 +
 .../i18n/locale/zh_TW/inboxMgmt.json          |  33 +-
 .../i18n/locale/zh_TW/integrations.json       |  48 +-
 .../dashboard/i18n/locale/zh_TW/report.json   |  85 ++-
 .../i18n/locale/zh_TW/setNewPassword.json     |   3 +
 .../dashboard/i18n/locale/zh_TW/settings.json |  10 +-
 .../dashboard/i18n/locale/zh_TW/signup.json   |   3 +-
 .../i18n/locale/zh_TW/teamsSettings.json      |   2 +-
 app/javascript/survey/i18n/locale/ar.json     |   2 +-
 app/javascript/survey/i18n/locale/de.json     |   2 +-
 app/javascript/survey/i18n/locale/fr.json     |  10 +-
 app/javascript/survey/i18n/locale/ro.json     |  12 +-
 app/javascript/survey/i18n/locale/th.json     |  14 +-
 app/javascript/survey/i18n/locale/uk.json     |  10 +-
 app/javascript/survey/i18n/locale/ur.json     |  19 +
 app/javascript/survey/i18n/locale/zh_CN.json  |  12 +-
 app/javascript/widget/i18n/locale/ar.json     |  14 +-
 app/javascript/widget/i18n/locale/bg.json     |  14 +-
 app/javascript/widget/i18n/locale/ca.json     |  14 +-
 app/javascript/widget/i18n/locale/cs.json     |  14 +-
 app/javascript/widget/i18n/locale/da.json     |  14 +-
 app/javascript/widget/i18n/locale/de.json     |  14 +-
 app/javascript/widget/i18n/locale/el.json     |  14 +-
 app/javascript/widget/i18n/locale/es.json     |  14 +-
 app/javascript/widget/i18n/locale/fa.json     |  14 +-
 app/javascript/widget/i18n/locale/fi.json     |  14 +-
 app/javascript/widget/i18n/locale/fr.json     |  22 +-
 app/javascript/widget/i18n/locale/he.json     |  14 +-
 app/javascript/widget/i18n/locale/hi.json     |  14 +-
 app/javascript/widget/i18n/locale/hu.json     |  14 +-
 app/javascript/widget/i18n/locale/id.json     |  14 +-
 app/javascript/widget/i18n/locale/it.json     |  14 +-
 app/javascript/widget/i18n/locale/ja.json     |  14 +-
 app/javascript/widget/i18n/locale/ko.json     |  14 +-
 app/javascript/widget/i18n/locale/lv.json     |  14 +-
 app/javascript/widget/i18n/locale/ml.json     |  14 +-
 app/javascript/widget/i18n/locale/ne.json     |  14 +-
 app/javascript/widget/i18n/locale/nl.json     |  14 +-
 app/javascript/widget/i18n/locale/no.json     |  14 +-
 app/javascript/widget/i18n/locale/pl.json     |  14 +-
 app/javascript/widget/i18n/locale/pt.json     |  14 +-
 app/javascript/widget/i18n/locale/pt_BR.json  |  16 +-
 app/javascript/widget/i18n/locale/ro.json     |  56 +-
 app/javascript/widget/i18n/locale/ru.json     |  14 +-
 app/javascript/widget/i18n/locale/sk.json     |  14 +-
 app/javascript/widget/i18n/locale/sr.json     |  14 +-
 app/javascript/widget/i18n/locale/sv.json     |  14 +-
 app/javascript/widget/i18n/locale/ta.json     |  14 +-
 app/javascript/widget/i18n/locale/th.json     |  66 ++-
 app/javascript/widget/i18n/locale/tr.json     |  22 +-
 app/javascript/widget/i18n/locale/uk.json     |  22 +-
 app/javascript/widget/i18n/locale/ur.json     |  86 +++
 app/javascript/widget/i18n/locale/vi.json     |  14 +-
 app/javascript/widget/i18n/locale/zh_CN.json  |  16 +-
 app/javascript/widget/i18n/locale/zh_TW.json  |  14 +-
 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.ro.yml                  |   2 +-
 config/locales/devise.th.yml                  |   2 +-
 config/locales/devise.uk.yml                  |  26 +-
 config/locales/devise.ur.yml                  |  61 ++
 config/locales/el.yml                         |   2 +
 config/locales/es.yml                         |   8 +-
 config/locales/fa.yml                         |   2 +
 config/locales/fi.yml                         |   2 +
 config/locales/fr.yml                         |   8 +-
 config/locales/he.yml                         |   2 +
 config/locales/hi.yml                         |   2 +
 config/locales/hu.yml                         |   2 +
 config/locales/id.yml                         |   2 +
 config/locales/it.yml                         |   2 +
 config/locales/ja.yml                         |   2 +
 config/locales/ko.yml                         |   2 +
 config/locales/lv.yml                         |   2 +
 config/locales/ml.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                      |   8 +-
 config/locales/ro.yml                         |  82 +--
 config/locales/ru.yml                         |   4 +-
 config/locales/sk.yml                         |   2 +
 config/locales/sr.yml                         |   2 +
 config/locales/sv.yml                         |   2 +
 config/locales/ta.yml                         |   2 +
 config/locales/th.yml                         |   4 +-
 config/locales/tr.yml                         |  10 +-
 config/locales/uk.yml                         |  58 +-
 config/locales/ur.yml                         | 108 ++++
 config/locales/vi.yml                         |   2 +
 config/locales/zh_CN.yml                      |   2 +
 config/locales/zh_TW.yml                      |   2 +
 579 files changed, 12847 insertions(+), 5195 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/automation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/campaign.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/contactFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/csatMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/teamsSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/webhooks.json
 create mode 100644 app/javascript/survey/i18n/locale/ur.json
 create mode 100644 app/javascript/widget/i18n/locale/ur.json
 create mode 100644 config/locales/devise.ur.yml
 create mode 100644 config/locales/ur.yml

diff --git a/app/javascript/dashboard/i18n/locale/ar/automation.json b/app/javascript/dashboard/i18n/locale/ar/automation.json
index ea9144a51..45c629c2d 100644
--- a/app/javascript/dashboard/i18n/locale/ar/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ"
+      "DELETE_MESSAGE": "يجب أن يكون لديك على الأقل شرط واحد للحفظ",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "اكتب رسالتك هنا",
+      "TEAM_DROPDOWN_PLACEHOLDER": "اختيار فريق"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "تفعيل قاعدة الأتمتة",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "تعذر إلغاء تنشيط قاعدة الأتمتة، الرجاء المحاولة مرة أخرى لاحقاً",
       "CONFIRMATION_LABEL": "نعم",
       "CANCEL_LABEL": "لا"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "تعذر تحميل المرفق، الرجاء المحاولة مرة أخرى",
+      "LABEL_IDLE": "ارفع المرفق",
+      "LABEL_UPLOADING": "جاري الرفع...",
+      "LABEL_UPLOADED": "تم الرفع بنجاح",
+      "LABEL_UPLOAD_FAILED": "فشل الرفع"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index d3a664f7b..59acf4738 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "لا توجد رسائل",
     "NO_CONTENT": "لم يتم العثور على محتوى",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "قرائة"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
index 151fcb856..90e9d4e93 100644
--- a/app/javascript/dashboard/i18n/locale/ar/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "تم حفظ جهة الاتصال بنجاح",
     "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "تأكيد الحذف",
+      "MESSAGE": "هل أنت متأكد من حذف هذه الملاحظة؟",
+      "YES": "نعم، احذف",
+      "NO": "لا، احتفظ به"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "حذف جهة الاتصال",
     "TITLE": "حذف جهة الاتصال",
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
index dc98821c0..5ef582b88 100644
--- a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "الإشعارات",
     "MARK_ALL_DONE": "وضع علامة على جميع المنجز",
+    "DELETE_TITLE": "تم الحذف",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "إشعارات غير مقروءة",
+      "ALL_NOTIFICATIONS": "عرض جميع الإشعارات",
+      "LOADING_UNREAD_MESSAGE": "تحميل الإشعارات الغير مقروءة...",
+      "EMPTY_MESSAGE": "ليس لديك إشعارات غير مقروءة"
+    },
     "LIST": {
       "LOADING_MESSAGE": "جاري تحميل الإشعارات...",
       "404": "لا يوجد إشعارات",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "الذهاب إلى لوحة المحادثة",
       "GO_TO_CONTACTS_DASHBOARD": "الذهاب إلى لوحة جهات الاتصال",
       "GO_TO_REPORTS_OVERVIEW": "الذهاب إلى نظرة التقارير",
+      "GO_TO_CONVERSATION_REPORTS": "الذهاب إلى تقارير المحادثات",
       "GO_TO_AGENT_REPORTS": "الذهاب إلى تقارير الوكيل",
       "GO_TO_LABEL_REPORTS": "انتقل إلى تقارير التسمية",
       "GO_TO_INBOX_REPORTS": "الذهاب إلى تقارير صندوق الوارد",
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index a19091051..42f2a45fb 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "الخصائص",
       "DISPLAY_FILE_PICKER": "عرض أداة انتقاء الملفات في الـ widget",
-      "DISPLAY_EMOJI_PICKER": "عرض منتقي الرموز التعبيرية على الـ widget"
+      "DISPLAY_EMOJI_PICKER": "عرض منتقي الرموز التعبيرية على الـ widget",
+      "ALLOW_END_CONVERSATION": "السماح للمستخدمين بإنهاء المحادثة من عنصر واجهة المستخدم"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "كود \"الماسنجر\"",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "نماذج ما قبل الدردشة تمكنك من التقاط معلومات المستخدم قبل بدء المحادثة معك.",
+      "SET_FIELDS": "حقول نموذج الدردشة السابقة",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "الحقول",
+        "LABEL": "الوسم",
+        "PLACE_HOLDER": "المحتوى",
+        "KEY": "المفتاح",
+        "TYPE": "النوع",
+        "REQUIRED": "مطلوب"
+      },
       "ENABLE": {
         "LABEL": "تمكين نموذج الدردشة السابقة",
         "OPTIONS": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "تعيين تفاصيل IMAP الخاصة بك",
+      "NOTE_TEXT": "لتمكين SMTP ، الرجاء تكوين IMAP.",
       "UPDATE": "تحديث الإعدادات",
       "TOGGLE_AVAILABILITY": "تمكين تكوين IMAP لهذا البريد الوارد",
       "TOGGLE_HELP": "تمكين IMAP سيساعد المستخدم على تلقي البريد الإلكتروني",
@@ -483,9 +494,9 @@
         "LABEL": "المنفذ",
         "PLACE_HOLDER": "المنفذ"
       },
-      "EMAIL": {
-        "LABEL": "البريد الإلكتروني",
-        "PLACE_HOLDER": "البريد الإلكتروني"
+      "LOGIN": {
+        "LABEL": "تسجيل الدخول",
+        "PLACE_HOLDER": "تسجيل الدخول"
       },
       "PASSWORD": {
         "LABEL": "كلمة المرور",
@@ -511,9 +522,9 @@
         "LABEL": "المنفذ",
         "PLACE_HOLDER": "المنفذ"
       },
-      "EMAIL": {
-        "LABEL": "البريد الإلكتروني",
-        "PLACE_HOLDER": "البريد الإلكتروني"
+      "LOGIN": {
+        "LABEL": "تسجيل الدخول",
+        "PLACE_HOLDER": "تسجيل الدخول"
       },
       "PASSWORD": {
         "LABEL": "كلمة المرور",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "التشفير",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "فتح وضع التحقق من SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "فتح وضع التحقق من SSL",
+      "AUTH_MECHANISM": "المصادقة"
+    },
+    "NOTE": "ملاحظة: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
index 001fffe8d..13d23fdd8 100644
--- a/app/javascript/dashboard/i18n/locale/ar/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "خيارات الربط",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "الأحداث المشتركة",
+      "FORM": {
+        "CANCEL": "إلغاء",
+        "DESC": "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. الرجاء إدخال عنوان URL صالح لتكوين callback.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "الأحداث",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "تم إنشاء المحادثة",
+            "CONVERSATION_STATUS_CHANGED": "تم تغيير حالة المحادثة",
+            "CONVERSATION_UPDATED": "تم تحديث المحادثة",
+            "MESSAGE_CREATED": "تم إنشاء رسالة",
+            "MESSAGE_UPDATED": "تم تحديث الرسالة",
+            "WEBWIDGET_TRIGGERED": "أداة الدردشة المباشرة مفتوحة من قبل المستخدم"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "رابط Webhook",
+          "PLACEHOLDER": "مثال: https://example/api/webhook",
+          "ERROR": "الرجاء إدخال عنوان URL صالح"
+        },
+        "EDIT_SUBMIT": "تحديث الويبهوك",
+        "ADD_SUBMIT": "إنشاء webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "تهيئة",
       "HEADER": "إعدادات الـ Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "تعديل",
         "TITLE": "تعديل webhook",
-        "CANCEL": "إلغاء",
-        "DESC": "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. الرجاء إدخال عنوان URL صالح لتكوين callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "رابط Webhook",
-            "PLACEHOLDER": "مثال: https://example/api/webhook",
-            "ERROR": "الرجاء إدخال عنوان URL صالح"
-          },
-          "SUBMIT": "تعديل webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "تم تحديث رابط Webhook بنجاح",
+          "SUCCESS_MESSAGE": "تم تحديث تكوين ويبهوك بنجاح",
           "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
         }
       },
       "ADD": {
         "CANCEL": "إلغاء",
         "TITLE": "إضافة webhook جديد",
-        "DESC": "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. الرجاء إدخال عنوان URL صالح لتكوين callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "رابط Webhook",
-            "PLACEHOLDER": "مثال: https://example/api/webhook",
-            "ERROR": "الرجاء إدخال عنوان URL صالح"
-          },
-          "SUBMIT": "إنشاء webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "تم إضافة Webhook بنجاح",
+          "SUCCESS_MESSAGE": "تم إضافة إعدادات Webhook بنجاح",
           "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "تأكيد الحذف",
-          "MESSAGE": "هل أنت متأكد من الحذف ",
+          "MESSAGE": "هل أنت متأكد من حذف webhook؟ (%{webhookURL})",
           "YES": "نعم، احذف ",
           "NO": "لا، احتفظ به"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
index 501acc38e..b690b7036 100644
--- a/app/javascript/dashboard/i18n/locale/ar/report.json
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "نظرة عامة",
+    "HEADER": "المحادثات",
     "LOADING_CHART": "تحميل بيانات الرسم البياني...",
     "NO_ENOUGH_DATA": "لم يتم جمع بيانات بقدر كافي لإنشاء التقرير، الرجاء المحاولة مرة أخرى لاحقاً.",
     "DOWNLOAD_AGENT_REPORTS": "تنزيل تقارير الوكيل",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "وقت الاستجابة الأولى",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الرد الأول هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_TIME": {
         "NAME": "وقت إغلاق المحادثات",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الحل هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "عدد مرات الإغلاق",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "السنة"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "ساعات العمل"
   },
   "AGENT_REPORTS": {
     "HEADER": "نظرة عامة للوكلاء",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "وقت الاستجابة الأولى",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الرد الأول هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_TIME": {
         "NAME": "وقت إغلاق المحادثات",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الحل هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "عدد مرات الإغلاق",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "وقت الاستجابة الأولى",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الرد الأول هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_TIME": {
         "NAME": "وقت إغلاق المحادثات",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الحل هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "عدد مرات الإغلاق",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "وقت الاستجابة الأولى",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الرد الأول هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_TIME": {
         "NAME": "وقت إغلاق المحادثات",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الحل هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "عدد مرات الإغلاق",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "وقت الاستجابة الأولى",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الرد الأول هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_TIME": {
         "NAME": "وقت إغلاق المحادثات",
-        "DESC": "(متوسط)"
+        "DESC": "(متوسط)",
+        "INFO_TEXT": "العدد الإجمالي للمحادثات المستخدمة في الحساب:",
+        "TOOLTIP_TEXT": "وقت الحل هو %{metricValue} (على أساس %{conversationCount} محادثات)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "عدد مرات الإغلاق",
@@ -392,5 +413,33 @@
         "TOOLTIP": "العدد الإجمالي للردود / العدد الإجمالي لرسائل الاستقصاء التي أرسلتها CSAT * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "نظرة عامة",
+    "LIVE": "مباشر",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "المحادثات المفتوحة",
+      "LOADING_MESSAGE": "جارٍ تحميل مقاييس المحادثات...",
+      "OPEN": "فتح",
+      "UNATTENDED": "بدون حضور",
+      "UNASSIGNED": "غير مسند"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "المحادثات من قبل الوكلاء",
+      "LOADING_MESSAGE": "جاري تحميل مقاييس الوكيل...",
+      "NO_AGENTS": "لا توجد أي محادثات من قبل الوكلاء",
+      "TABLE_HEADER": {
+        "AGENT": "موظف الدعم",
+        "OPEN": "افتتحت",
+        "UNATTENDED": "بدون حضور",
+        "STATUS": "الحالة"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "حالة الوكيل",
+      "ONLINE": "متصل",
+      "BUSY": "مشغول",
+      "OFFLINE": "غير متصل"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
index 446658b1f..8ab16c39e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "تم تغيير كلمة المرور بنجاح",
       "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
     },
+    "CAPTCHA": {
+      "ERROR": "انتهت صلاحية التحقق. الرجاء حل كلمة التحقق مرة أخرى."
+    },
     "SUBMIT": "إرسال"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index fdf9e62b9..45ea1db14 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "نسخ",
       "COPY_SUCCESSFUL": "تم نسخ الكود إلى الحافظة بنجاح"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "إظهار المزيد",
+      "SHOW_LESS": "إظهار أقل"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "تنزيل",
       "UPLOADING": "جاري الرفع..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "مشاهدة حاليا:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "المحادثات",
     "ALL_CONVERSATIONS": "كل المحادثات",
     "MENTIONED_CONVERSATIONS": "الإشارات",
@@ -173,8 +178,8 @@
     "NEW_LABEL": "علامة جديدة",
     "NEW_TEAM": "فريق جديد",
     "NEW_INBOX": "صندوق الوارد الجديد",
-    "REPORTS_OVERVIEW": "نظرة عامة",
-    "CSAT": "CSAT",
+    "REPORTS_CONVERSATION": "المحادثات",
+    "CSAT": "تقييم رضاء العملاء",
     "CAMPAIGNS": "الحملات",
     "ONGOING": "جارية",
     "ONE_OFF": "إيقاف واحد",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "صندوق الوارد",
     "REPORTS_TEAM": "الفريق",
     "SET_AVAILABILITY_TITLE": "تعيين نفسك كـ",
-    "BETA": "تجريبي"
+    "BETA": "تجريبي",
+    "REPORTS_OVERVIEW": "نظرة عامة"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "أوه! لم نتمكن من العثور على الحساب. الرجاء إنشاء حساب جديد للمتابعة.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/signup.json b/app/javascript/dashboard/i18n/locale/ar/signup.json
index 97e077946..c7e2820ab 100644
--- a/app/javascript/dashboard/i18n/locale/ar/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ar/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "كلمة المرور",
       "PLACEHOLDER": "كلمة المرور",
-      "ERROR": "كلمة المرور قصيرة جداً"
+      "ERROR": "كلمة المرور قصيرة جداً",
+      "IS_INVALID_PASSWORD": "يجب أن تحتوي كلمة المرور على الأقل على حرف كبير واحد وحرف صغير واحد ورقم واحد وحرف خاص واحد"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "تأكيد كلمة المرور",
diff --git a/app/javascript/dashboard/i18n/locale/bg/automation.json b/app/javascript/dashboard/i18n/locale/bg/automation.json
index 9f9241b9e..00cfb5bac 100644
--- a/app/javascript/dashboard/i18n/locale/bg/automation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Качване...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/chatlist.json b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
index 3b2047e6d..f6b3b480f 100644
--- a/app/javascript/dashboard/i18n/locale/bg/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Няма съобщения",
     "NO_CONTENT": "Няма налично съдържание",
     "HIDE_QUOTED_TEXT": "Скриване на цитирания текст",
-    "SHOW_QUOTED_TEXT": "Показване на цитирания текст"
+    "SHOW_QUOTED_TEXT": "Показване на цитирания текст",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/contact.json b/app/javascript/dashboard/i18n/locale/bg/contact.json
index 15203bd8b..0cec34425 100644
--- a/app/javascript/dashboard/i18n/locale/bg/contact.json
+++ b/app/javascript/dashboard/i18n/locale/bg/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Успешно запазване на контактите",
     "ERROR_MESSAGE": "Възникна грешка, моля опитайте отново"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Потвърди изтриването",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "No, Keep it"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Изтриване на контакта",
     "TITLE": "Изтриване на контакта",
diff --git a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
index 421f01861..6bc65e426 100644
--- a/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index dbb76c441..94110fae8 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": "Ключ",
+        "TYPE": "Тип",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Enable pre chat form",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/integrations.json b/app/javascript/dashboard/i18n/locale/bg/integrations.json
index 2ac2ca82e..88c663eb0 100644
--- a/app/javascript/dashboard/i18n/locale/bg/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/bg/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrations",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "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"
+          }
+        },
+        "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",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Редактирай",
         "TITLE": "Edit webhook",
-        "CANCEL": "Отмени",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
         }
       },
       "ADD": {
         "CANCEL": "Отмени",
         "TITLE": "Add new webhook",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Потвърди изтриването",
-          "MESSAGE": "Сигурни ли сте за изтриването ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Да, изтрий ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/bg/report.json b/app/javascript/dashboard/i18n/locale/bg/report.json
index 4c3a03243..1d4f82066 100644
--- a/app/javascript/dashboard/i18n/locale/bg/report.json
+++ b/app/javascript/dashboard/i18n/locale/bg/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Разговори",
     "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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": "Отворен",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Неназначен"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Агент",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Статус"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Busy",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json b/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
index addbdedbc..c2653e5c3 100644
--- a/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/bg/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Successfully changed the password",
       "ERROR_MESSAGE": "Не можа да се свърже с Woot сървър. Моля, опитайте отново по-късно"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Изпращане"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index c845163e0..2c5909d8b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Качване..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Разговори",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Споменавания",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Разговори",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Входяща кутия",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/signup.json b/app/javascript/dashboard/i18n/locale/bg/signup.json
index 359e9e18b..d64f7b77e 100644
--- a/app/javascript/dashboard/i18n/locale/bg/signup.json
+++ b/app/javascript/dashboard/i18n/locale/bg/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json b/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
index 76578ba45..008676de7 100644
--- a/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/ca/automation.json b/app/javascript/dashboard/i18n/locale/ca/automation.json
index a087fa4f7..260b480b9 100644
--- a/app/javascript/dashboard/i18n/locale/ca/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Si",
       "CANCEL_LABEL": "No"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "S'està carregant...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index 2a3529a46..fcba4a38e 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Cap Missatge",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index 658dae4f0..6c567213a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "S'ha produït un error; tornau-ho a provar"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirma l'esborrat",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "No, manten-la"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index f0947fd42..b8830883d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificacions",
     "MARK_ALL_DONE": "Marca Tot Fet",
+    "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": "Carregant notificacions...",
       "404": "Cap Notificació",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 02d0d2316..06f934430 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Característiques",
       "DISPLAY_FILE_PICKER": "Mostra el selector de fitxers al widget",
-      "DISPLAY_EMOJI_PICKER": "Mostra el selector d'emoji al widget"
+      "DISPLAY_EMOJI_PICKER": "Mostra el selector d'emoji al widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script del missatger",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Correu electrònic",
-        "PLACE_HOLDER": "Correu electrònic"
+      "LOGIN": {
+        "LABEL": "Inicia la sessió",
+        "PLACE_HOLDER": "Inicia la sessió"
       },
       "PASSWORD": {
         "LABEL": "Contrasenya",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Correu electrònic",
-        "PLACE_HOLDER": "Correu electrònic"
+      "LOGIN": {
+        "LABEL": "Inicia la sessió",
+        "PLACE_HOLDER": "Inicia la sessió"
       },
       "PASSWORD": {
         "LABEL": "Contrasenya",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index af8cd6b59..055024af1 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integracions",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Cancel·la",
+        "DESC": "Els esdeveniments de Webhook us proporcionen informació en temps real sobre el que passa al vostre compte de Chatwoot. Introduïu una URL vàlid per configurar un 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL del webhook",
+          "PLACEHOLDER": "Exemple: https://example/api/webhook",
+          "ERROR": "Introduïu una URL vàlid"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Crear webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configura",
       "HEADER": "Configuració Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edita",
         "TITLE": "Edit webhook",
-        "CANCEL": "Cancel·la",
-        "DESC": "Els esdeveniments de Webhook us proporcionen informació en temps real sobre el que passa al vostre compte de Chatwoot. Introduïu una URL vàlid per configurar un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL del webhook",
-            "PLACEHOLDER": "Exemple: https://example/api/webhook",
-            "ERROR": "Introduïu una URL vàlid"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
         }
       },
       "ADD": {
         "CANCEL": "Cancel·la",
         "TITLE": "Afegir un nou webhook",
-        "DESC": "Els esdeveniments de Webhook us proporcionen informació en temps real sobre el que passa al vostre compte de Chatwoot. Introduïu una URL vàlid per configurar un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL del webhook",
-            "PLACEHOLDER": "Exemple: https://example/api/webhook",
-            "ERROR": "Introduïu una URL vàlid"
-          },
-          "SUBMIT": "Crear webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "S'ha afegit el Webhook correctament",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "No s'ha pogut connectar amb el servidor Woot. Torna-ho a provar més endavant"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirma l'esborrat",
-          "MESSAGE": "N'estàs segur ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Si, esborra ",
           "NO": "No, manten-la"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index d87fa5ddd..32d8c2625 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Converses",
     "LOADING_CHART": "S'estan carregant dades del gràfic...",
     "NO_ENOUGH_DATA": "No hem rebut suficients punts de dades per generar l'informe. Torneu-ho a provar més endavant.",
     "DOWNLOAD_AGENT_REPORTS": "Descarregar Informes d'Agent",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primer temps de resposta",
-        "DESC": "( Promig )"
+        "NAME": "First Response Time",
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de resolució",
-        "DESC": "( Promig )"
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Total de resolucions",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primer temps de resposta",
-        "DESC": "( Promig )"
+        "NAME": "First Response Time",
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de resolució",
-        "DESC": "( Promig )"
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Total de resolucions",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primer temps de resposta",
-        "DESC": "( Promig )"
+        "NAME": "First Response Time",
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de resolució",
-        "DESC": "( Promig )"
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Total de resolucions",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primer temps de resposta",
-        "DESC": "( Promig )"
+        "NAME": "First Response Time",
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de resolució",
-        "DESC": "( Promig )"
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Total de resolucions",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primer temps de resposta",
-        "DESC": "( Promig )"
+        "NAME": "First Response Time",
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de resolució",
-        "DESC": "( Promig )"
+        "DESC": "( Promig )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Total de resolucions",
@@ -392,5 +413,33 @@
         "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": "Obrir",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Sense assignar"
+    },
+    "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": "Estat"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "En línia",
+      "BUSY": "Ocupat",
+      "OFFLINE": "Fora de línia"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
index 7d1ce9ac8..8098a7271 100644
--- a/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ca/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "S'ha canviat la contrasenya correctament",
       "ERROR_MESSAGE": "No s'ha pogut connectar amb Woot Server. Torneu-ho a provar més endavant"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Envia"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 745dffbb3..4eef74bb8 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copia",
       "COPY_SUCCESSFUL": "El codi s'ha copiat al porta-retalls amb èxit"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descarrega",
       "UPLOADING": "S'està carregant..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Converses",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Converses",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/signup.json b/app/javascript/dashboard/i18n/locale/ca/signup.json
index 578dfde7a..4b725f886 100644
--- a/app/javascript/dashboard/i18n/locale/ca/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ca/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Contrasenya",
       "PLACEHOLDER": "Contrasenya",
-      "ERROR": "La contrasenya és massa curta"
+      "ERROR": "La contrasenya és massa curta",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirma la contrasenya",
diff --git a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
index 70290bc6a..6ec12d43d 100644
--- a/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Afegir agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/cs/automation.json b/app/javascript/dashboard/i18n/locale/cs/automation.json
index 3080666bb..57557defc 100644
--- a/app/javascript/dashboard/i18n/locale/cs/automation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Ano",
       "CANCEL_LABEL": "Ne"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Nahrávání...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index a0372703d..1e5dc3228 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Žádné zprávy",
     "NO_CONTENT": "Žádný obsah k dispozici",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 54e4231d3..b9006fe35 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "Došlo k chybě, zkuste to prosím znovu"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Potvrdit odstranění",
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
index ca15ee3d0..521650b93 100644
--- a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Oznámení",
     "MARK_ALL_DONE": "Označit vše dokončeno",
+    "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": "Načítání upozornění...",
       "404": "Žádná upozornění",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 10318613f..3e1142191 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funkce",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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 skript",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Zpráva před chatem",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mailová adresa",
-        "PLACE_HOLDER": "E-mailová adresa"
+      "LOGIN": {
+        "LABEL": "Přihlásit se",
+        "PLACE_HOLDER": "Přihlásit se"
       },
       "PASSWORD": {
         "LABEL": "Heslo",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mailová adresa",
-        "PLACE_HOLDER": "E-mailová adresa"
+      "LOGIN": {
+        "LABEL": "Přihlásit se",
+        "PLACE_HOLDER": "Přihlásit se"
       },
       "PASSWORD": {
         "LABEL": "Heslo",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 7cf53accb..03d09efce 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrace",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Zrušit",
+        "DESC": "Události webhooku vám poskytují reálné informace o tom, co se děje ve vašem Chatwoot účtu. Zadejte prosím platnou URL pro nastavení hovoru.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL webového háčku",
+          "PLACEHOLDER": "Příklad: https://example/api/webhook",
+          "ERROR": "Zadejte prosím platnou URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create webhook"
+      },
       "TITLE": "Webový háček",
       "CONFIGURE": "Konfigurace",
       "HEADER": "Nastavení webhooku",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Upravit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Zrušit",
-        "DESC": "Události webhooku vám poskytují reálné informace o tom, co se děje ve vašem Chatwoot účtu. Zadejte prosím platnou URL pro nastavení hovoru.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL webového háčku",
-            "PLACEHOLDER": "Příklad: https://example/api/webhook",
-            "ERROR": "Zadejte prosím platnou URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
         }
       },
       "ADD": {
         "CANCEL": "Zrušit",
         "TITLE": "Přidat nový webový háček",
-        "DESC": "Události webhooku vám poskytují reálné informace o tom, co se děje ve vašem Chatwoot účtu. Zadejte prosím platnou URL pro nastavení hovoru.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL webového háčku",
-            "PLACEHOLDER": "Příklad: https://example/api/webhook",
-            "ERROR": "Zadejte prosím platnou URL"
-          },
-          "SUBMIT": "Vytvořit webový háček"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webový háček byl úspěšně přidán",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Potvrdit odstranění",
-          "MESSAGE": "Opravdu chcete odstranit ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ano, odstranit ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/cs/report.json b/app/javascript/dashboard/i18n/locale/cs/report.json
index f78967276..204327bf9 100644
--- a/app/javascript/dashboard/i18n/locale/cs/report.json
+++ b/app/javascript/dashboard/i18n/locale/cs/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Konverzace",
     "LOADING_CHART": "Načítání dat mapy...",
     "NO_ENOUGH_DATA": "Pro vytvoření hlášení jsme neobdrželi dostatek dat, zkuste to prosím později.",
     "DOWNLOAD_AGENT_REPORTS": "Stáhnout reporty agentů",
@@ -18,12 +18,16 @@
         "DESC": "( celkem)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas první odpovědi",
-        "DESC": "(Průměrný)"
+        "NAME": "First Response Time",
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas rozlišení",
-        "DESC": "(Průměrný)"
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet rozlišení",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Pracovní doba"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( celkem)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas první odpovědi",
-        "DESC": "(Průměrný)"
+        "NAME": "First Response Time",
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas rozlišení",
-        "DESC": "(Průměrný)"
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet rozlišení",
@@ -193,12 +202,16 @@
         "DESC": "( celkem)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas první odpovědi",
-        "DESC": "(Průměrný)"
+        "NAME": "First Response Time",
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas rozlišení",
-        "DESC": "(Průměrný)"
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet rozlišení",
@@ -256,12 +269,16 @@
         "DESC": "( celkem)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas první odpovědi",
-        "DESC": "(Průměrný)"
+        "NAME": "First Response Time",
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas rozlišení",
-        "DESC": "(Průměrný)"
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet rozlišení",
@@ -319,12 +336,16 @@
         "DESC": "( celkem)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas první odpovědi",
-        "DESC": "(Průměrný)"
+        "NAME": "First Response Time",
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas rozlišení",
-        "DESC": "(Průměrný)"
+        "DESC": "(Průměrný)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet rozlišení",
@@ -392,5 +413,33 @@
         "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": "Otevřít",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Nepřiřazeno"
+    },
+    "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": "Stav"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Zaneprázdněn",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
index e6de5ca19..5c81bea0a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Heslo bylo úspěšně změněno",
       "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Odeslat"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index a39994efa..ee18bc901 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopírovat",
       "COPY_SUCCESSFUL": "Kód byl úspěšně zkopírován do schránky"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Stáhnout",
       "UPLOADING": "Nahrávání..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Konverzace",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Konverzace",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampaně",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/signup.json b/app/javascript/dashboard/i18n/locale/cs/signup.json
index a58deda07..994da4444 100644
--- a/app/javascript/dashboard/i18n/locale/cs/signup.json
+++ b/app/javascript/dashboard/i18n/locale/cs/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo",
-      "ERROR": "Heslo je příliš krátké"
+      "ERROR": "Heslo je příliš krátké",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Potvrzení hesla",
diff --git a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
index 33c6168ac..ca5aa7b61 100644
--- a/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Přidat agenty",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/da/automation.json b/app/javascript/dashboard/i18n/locale/da/automation.json
index 383fc3592..1f8c4617b 100644
--- a/app/javascript/dashboard/i18n/locale/da/automation.json
+++ b/app/javascript/dashboard/i18n/locale/da/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Uploader...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
index 2584b0438..2be5e379e 100644
--- a/app/javascript/dashboard/i18n/locale/da/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
index 1774df12e..9b2cb889c 100644
--- a/app/javascript/dashboard/i18n/locale/da/contact.json
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "Der opstod en fejl. Prøv venligst igen"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Bekræft Sletning",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nej, behold det"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
index 7d6c1ff3d..6da4fa87d 100644
--- a/app/javascript/dashboard/i18n/locale/da/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index b9d6c4de7..1a199e343 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funktioner",
       "DISPLAY_FILE_PICKER": "Vis filvælger på widget'en",
-      "DISPLAY_EMOJI_PICKER": "Vis emoji-vælger på widget'en"
+      "DISPLAY_EMOJI_PICKER": "Vis emoji-vælger på widget'en",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger- Script",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Log Ind",
+        "PLACE_HOLDER": "Log Ind"
       },
       "PASSWORD": {
         "LABEL": "Adgangskode",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Log Ind",
+        "PLACE_HOLDER": "Log Ind"
       },
       "PASSWORD": {
         "LABEL": "Adgangskode",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
index 3d8b0629c..47cb211a2 100644
--- a/app/javascript/dashboard/i18n/locale/da/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrationer",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Annuller",
+        "DESC": "Webhook-begivenheder giver dig realtidsoplysninger om, hvad der sker på din Chatwoot-konto. Angiv en gyldig URL for at konfigurere et 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Eksempel: https://example/api/webhook",
+          "ERROR": "Angiv en gyldig URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Opret webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Konfigurer",
       "HEADER": "Webhook indstillinger",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Rediger",
         "TITLE": "Edit webhook",
-        "CANCEL": "Annuller",
-        "DESC": "Webhook-begivenheder giver dig realtidsoplysninger om, hvad der sker på din Chatwoot-konto. Angiv en gyldig URL for at konfigurere et callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
-            "ERROR": "Angiv en gyldig URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
         }
       },
       "ADD": {
         "CANCEL": "Annuller",
         "TITLE": "Tilføj ny webhook",
-        "DESC": "Webhook-begivenheder giver dig realtidsoplysninger om, hvad der sker på din Chatwoot-konto. Angiv en gyldig URL for at konfigurere et callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
-            "ERROR": "Angiv en gyldig URL"
-          },
-          "SUBMIT": "Opret webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook blev tilføjet",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Bekræft Sletning",
-          "MESSAGE": "Er du sikker på du vil slette ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ja, Slet ",
           "NO": "Nej, behold det"
         }
diff --git a/app/javascript/dashboard/i18n/locale/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
index 6f75e4fa0..2f46ee1ef 100644
--- a/app/javascript/dashboard/i18n/locale/da/report.json
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Samtaler",
     "LOADING_CHART": "Indlæser diagramdata...",
     "NO_ENOUGH_DATA": "Vi har ikke modtaget nok datapunkter til at generere rapport. Prøv igen senere.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gns. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsnings Tid",
-        "DESC": "( Gns. )"
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal Afsluttede",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gns. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsnings Tid",
-        "DESC": "( Gns. )"
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal Afsluttede",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gns. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsnings Tid",
-        "DESC": "( Gns. )"
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal Afsluttede",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gns. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsnings Tid",
-        "DESC": "( Gns. )"
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal Afsluttede",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gns. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsnings Tid",
-        "DESC": "( Gns. )"
+        "DESC": "( Gns. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal Afsluttede",
@@ -392,5 +413,33 @@
         "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": "Åbn",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Ikke Tildelt"
+    },
+    "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": "Optaget",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
index 2c170f823..087624091 100644
--- a/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Adgangskoden blev ændret",
       "ERROR_MESSAGE": "Kunne ikke oprette forbindelse til Woot Server, Prøv igen senere"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Send"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index 5779e8367..c356d7011 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopiér",
       "COPY_SUCCESSFUL": "Kode kopieret til udklipsholder med succes"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Uploader..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Samtaler",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Samtaler",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/da/signup.json b/app/javascript/dashboard/i18n/locale/da/signup.json
index 3998d458b..416db5f8c 100644
--- a/app/javascript/dashboard/i18n/locale/da/signup.json
+++ b/app/javascript/dashboard/i18n/locale/da/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Adgangskode",
       "PLACEHOLDER": "Adgangskode",
-      "ERROR": "Adgangskoden er for kort"
+      "ERROR": "Adgangskoden er for kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Bekræft Adgangskode",
diff --git a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
index e40300b20..1c9faa6bc 100644
--- a/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/da/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Tilføj agenter",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
index 01b6804b0..e9dd89be2 100644
--- a/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/de/advancedFilters.json
@@ -5,7 +5,7 @@
     "ADD_NEW_FILTER": "Filter hinzufügen",
     "FILTER_DELETE_ERROR": "Sie sollten mindestens einen Filter zum Speichern haben",
     "SUBMIT_BUTTON_LABEL": "Filter übernehmen",
-    "CANCEL_BUTTON_LABEL": "Stornieren",
+    "CANCEL_BUTTON_LABEL": "Abbrechen",
     "CLEAR_BUTTON_LABEL": "Filter zurücksetzen",
     "EMPTY_VALUE_ERROR": "Wert ist erforderlich",
     "TOOLTIP_LABEL": "Gespräche filtern",
@@ -59,7 +59,7 @@
         "PLACEHOLDER": "Geben Sie einen Namen für diesen Filter ein",
         "ERROR_MESSAGE": "Name wird benötigt",
         "SAVE_BUTTON": "Filter speichern",
-        "CANCEL_BUTTON": "Stornieren",
+        "CANCEL_BUTTON": "Abbrechen",
         "API_FOLDERS": {
           "SUCCESS_MESSAGE": "Ordner erfolgreich erstellt",
           "ERROR_MESSAGE": "Fehler beim Erstellen des Ordners"
diff --git a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
index a95d55f2b..d16090052 100644
--- a/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/attributesMgmt.json
@@ -7,7 +7,7 @@
     "ADD": {
       "TITLE": "Benutzerdefiniertes Attribut hinzufügen",
       "SUBMIT": "Erstellen",
-      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CANCEL_BUTTON_TEXT": "Abbrechen",
       "FORM": {
         "NAME": {
           "LABEL": "Anzeigename",
@@ -57,7 +57,7 @@
         "PLACE_HOLDER": "Bitte geben Sie {attributeName} zur Bestätigung ein",
         "MESSAGE": "Beim Löschen wird das benutzerdefinierte Attribut entfernt",
         "YES": "Löschen ",
-        "NO": "Stornieren"
+        "NO": "Abbrechen"
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/automation.json b/app/javascript/dashboard/i18n/locale/de/automation.json
index d8b7539f4..4c7b3bfb2 100644
--- a/app/javascript/dashboard/i18n/locale/de/automation.json
+++ b/app/javascript/dashboard/i18n/locale/de/automation.json
@@ -7,7 +7,7 @@
     "ADD": {
       "TITLE": "Automatisierungsregel hinzufügen",
       "SUBMIT": "Erstellen",
-      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CANCEL_BUTTON_TEXT": "Abbrechen",
       "FORM": {
         "NAME": {
           "LABEL": "Regelname",
@@ -50,10 +50,10 @@
     "DELETE": {
       "TITLE": "Automatisierungsregel löschen",
       "SUBMIT": "Löschen",
-      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CANCEL_BUTTON_TEXT": "Abbrechen",
       "CONFIRM": {
         "TITLE": "Löschung bestätigen",
-        "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
+        "MESSAGE": "Bist du sicher, dass du das löschen möchtest ",
         "YES": "Ja, löschen ",
         "NO": "Nein, behalten "
       },
@@ -65,7 +65,7 @@
     "EDIT": {
       "TITLE": "Automatisierungsregel bearbeiten",
       "SUBMIT": "Aktualisieren",
-      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CANCEL_BUTTON_TEXT": "Abbrechen",
       "API": {
         "SUCCESS_MESSAGE": "Automatisierungsregel erfolgreich aktualisiert",
         "ERROR_MESSAGE": "Die Automatisierungsregel konnte nicht aktualisiert werden. Bitte versuchen Sie es später erneut"
@@ -82,14 +82,16 @@
       "EDIT": "Bearbeiten",
       "CREATE": "Erstellen",
       "DELETE": "Löschen",
-      "CANCEL": "Stornieren",
+      "CANCEL": "Abbrechen",
       "RESET_MESSAGE": "Durch das Ändern des Ereignistyps werden die unten hinzugefügten Bedingungen und Ereignisse zurückgesetzt"
     },
     "CONDITION": {
       "DELETE_MESSAGE": "Du musst mindestens eine Bedingung zum Speichern haben"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Zum Speichern ist mindestens eine Aktion erforderlich"
+      "DELETE_MESSAGE": "Zum Speichern ist mindestens eine Aktion erforderlich",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Geben Sie hier Ihre Nachricht ein",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Teams auswählen"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Automatisierungsregel aktivieren",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Die Automatisierung konnte nicht deaktiviert werden. Bitte versuchen Sie es später erneut",
       "CONFIRMATION_LABEL": "Ja",
       "CANCEL_LABEL": "Nein"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Anhang konnte nicht hochgeladen werden, bitte versuchen Sie es erneut",
+      "LABEL_IDLE": "Anhang hochladen",
+      "LABEL_UPLOADING": "Hochladen...",
+      "LABEL_UPLOADED": "Erfolgreich hochgeladen",
+      "LABEL_UPLOAD_FAILED": "Upload fehlgeschlagen"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/campaign.json b/app/javascript/dashboard/i18n/locale/de/campaign.json
index 52021e151..ed7737ed2 100644
--- a/app/javascript/dashboard/i18n/locale/de/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/de/campaign.json
@@ -29,8 +29,8 @@
           "ERROR": "Zielgruppe ist erforderlich"
         },
         "INBOX": {
-          "LABEL": "Eingang auswählen",
-          "PLACEHOLDER": "Eingang auswählen",
+          "LABEL": "Posteingang auswählen",
+          "PLACEHOLDER": "Posteingang auswählen",
           "ERROR": "Posteingang ist erforderlich"
         },
         "MESSAGE": {
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index 5db40c317..1570a1c19 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Keine Nachrichten",
     "NO_CONTENT": "Kein Inhalt verfügbar",
     "HIDE_QUOTED_TEXT": "Zitierten Text ausblenden",
-    "SHOW_QUOTED_TEXT": "Zitierten Text anzeigen"
+    "SHOW_QUOTED_TEXT": "Zitierten Text anzeigen",
+    "MESSAGE_READ": "Lesen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index 12a082095..2ea99f0ae 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -44,7 +44,7 @@
     "SIDEBAR_SECTIONS": {
       "CUSTOM_ATTRIBUTES": "Benutzerdefinierte Attribute",
       "CONTACT_LABELS": "Kontakt-Labels",
-      "PREVIOUS_CONVERSATIONS": "Vorherige Gespräche"
+      "PREVIOUS_CONVERSATIONS": "Vorherige Konversationen"
     }
   },
   "EDIT_CONTACT": {
@@ -65,18 +65,26 @@
     "FORM": {
       "LABEL": "CSV-Datei",
       "SUBMIT": "Importieren",
-      "CANCEL": "Stornieren"
+      "CANCEL": "Abbrechen"
     },
     "SUCCESS_MESSAGE": "Kontakte erfolgreich gespeichert",
     "ERROR_MESSAGE": "Es ist ein Fehler aufgetreten, bitte versuchen Sie es erneut"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Löschung bestätigen",
+      "MESSAGE": "Möchten Sie diese Notiz wirklich löschen?",
+      "YES": "Ja, löschen",
+      "NO": "Nein, behalte es"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Kontakt löschen",
     "TITLE": "Kontakt löschen",
     "DESC": "Kontakt-Details bearbeiten",
     "CONFIRM": {
       "TITLE": "Löschung bestätigen",
-      "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
+      "MESSAGE": "Sind SIe sicher, dass Sie das löschen möchten ",
       "YES": "Ja, löschen",
       "NO": "Nein, behalten"
     },
@@ -168,7 +176,7 @@
       "SUBMIT": "Nachricht senden",
       "CANCEL": "Abbrechen",
       "SUCCESS_MESSAGE": "Nachricht gesendet!",
-      "GO_TO_CONVERSATION": "Aussicht",
+      "GO_TO_CONVERSATION": "Ansehen",
       "ERROR_MESSAGE": "Senden fehlgeschlagen! Bitte erneut versuchen"
     }
   },
@@ -244,7 +252,7 @@
     "ADD_BUTTON_TEXT": "Attribute hinzufügen",
     "BUTTON": "Eigenes Attribut hinzufügen",
     "NOT_AVAILABLE": "Für diesen Kontakt sind keine benutzerdefinierten Attribute verfügbar.",
-    "COPY_SUCCESSFUL": "Der Code wurde erfolgreich in die Zwischenablage kopiert",
+    "COPY_SUCCESSFUL": "Erfolgreich in die Zwischenablage kopiert",
     "ACTIONS": {
       "COPY": "Attribut kopieren",
       "DELETE": "Attribut löschen",
@@ -256,7 +264,7 @@
     },
     "FORM": {
       "CREATE": "Attribut hinzufügen",
-      "CANCEL": "Stornieren",
+      "CANCEL": "Abbrechen",
       "NAME": {
         "LABEL": "Benutzerdefinierter Attributname",
         "PLACEHOLDER": "Beispiel: Shopify-ID",
@@ -319,7 +327,7 @@
     },
     "FORM": {
       "SUBMIT": " Kontakte zusammenführen",
-      "CANCEL": "Stornieren",
+      "CANCEL": "Abbrechen",
       "CHILD_CONTACT": {
         "ERROR": "Wählen Sie einen Kontakt zum Zusammenführen"
       },
diff --git a/app/javascript/dashboard/i18n/locale/de/contactFilters.json b/app/javascript/dashboard/i18n/locale/de/contactFilters.json
index 0fc26effb..09aeff426 100644
--- a/app/javascript/dashboard/i18n/locale/de/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/de/contactFilters.json
@@ -6,7 +6,7 @@
         "CLEAR_ALL_FILTERS": "Alle Filter löschen",
         "FILTER_DELETE_ERROR": "Sie sollten mindestens einen Filter zum Speichern haben",
         "SUBMIT_BUTTON_LABEL": "Einreichen",
-        "CANCEL_BUTTON_LABEL": "Stornieren",
+        "CANCEL_BUTTON_LABEL": "Abbrechen",
         "CLEAR_BUTTON_LABEL": "Filter zurücksetzen",
         "EMPTY_VALUE_ERROR": "Wert ist erforderlich",
         "TOOLTIP_LABEL": "Kontakte filtern",
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index 17196122d..a8b2b5770 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -170,7 +170,7 @@
       "CONVERSATION_LABELS": "Konversationslabels",
       "CONVERSATION_INFO": "Konversationsinformationen",
       "CONTACT_ATTRIBUTES": "Kontakt-Attribute",
-      "PREVIOUS_CONVERSATION": "Vorherige Gespräche"
+      "PREVIOUS_CONVERSATION": "Vorherige Konversationen"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 93a0cefb2..dcb571904 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -1,14 +1,14 @@
 {
   "GENERAL_SETTINGS": {
     "TITLE": "Kontoeinstellungen",
-    "SUBMIT": "Update Einstellungen",
+    "SUBMIT": "Einstellungen aktualisieren",
     "BACK": "Zurück",
     "UPDATE": {
       "ERROR": "Einstellungen konnten nicht aktualisiert werden, versuchen Sie es erneut!",
       "SUCCESS": "Kontoeinstellungen erfolgreich aktualisiert"
     },
     "FORM": {
-      "ERROR": "Bitte korrigieren Sie Formularfehler",
+      "ERROR": "Bitte Formularfehler korrigieren",
       "GENERAL_SECTION": {
         "TITLE": "Allgemeine Einstellungen",
         "NOTE": ""
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Push-Benachrichtigungen",
     "MARK_ALL_DONE": "Alle als Erledigt markieren",
+    "DELETE_TITLE": "Gelöscht",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Ungelesene Benachrichtigungen",
+      "ALL_NOTIFICATIONS": "Alle Benachrichtigungen anzeigen",
+      "LOADING_UNREAD_MESSAGE": "Ungelesene Benachrichtigungen werden geladen...",
+      "EMPTY_MESSAGE": "Sie haben keine ungelesenen Benachrichtigungen"
+    },
     "LIST": {
       "LOADING_MESSAGE": "Benachrichtigungen werden geladen...",
       "404": "Keine Benachrichtigungen",
@@ -95,12 +102,13 @@
       "CHANGE_TEAM": "Team wechseln",
       "ADD_LABEL": "Label zur Konversation hinzufügen",
       "REMOVE_LABEL": "Label aus der Konversation entfernen",
-      "SETTINGS": "die Einstellungen"
+      "SETTINGS": "Einstellungen"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Zur Konversationsübersicht gehen",
+      "GO_TO_CONVERSATION_DASHBOARD": "Zur Konversationsübersicht",
       "GO_TO_CONTACTS_DASHBOARD": "Zur Kontaktübersicht",
       "GO_TO_REPORTS_OVERVIEW": "Zur Berichtsübersicht",
+      "GO_TO_CONVERSATION_REPORTS": "Gehen Sie zu Konversationsberichten",
       "GO_TO_AGENT_REPORTS": "Zu den Agentenberichten",
       "GO_TO_LABEL_REPORTS": "Zu den Label-Berichten",
       "GO_TO_INBOX_REPORTS": "Zu den Posteingangsberichten",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 4b7b90b74..ea61c99c1 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -268,7 +268,7 @@
         },
         "LINE_CHANNEL_SECRET": {
           "LABEL": "LINE-Kanal-Geheimnis",
-          "PLACEHOLDER": "LINE-Kanal-Geheimnis"
+          "PLACEHOLDER": "LINE-Kanal-Secret"
         },
         "LINE_CHANNEL_TOKEN": {
           "LABEL": "LINE-Kanal-Token",
@@ -390,11 +390,12 @@
       "PRE_CHAT_FORM": "Pre-Chat-Formular",
       "BUSINESS_HOURS": "Öffnungszeiten"
     },
-    "SETTINGS": "die Einstellungen",
+    "SETTINGS": "Einstellungen",
     "FEATURES": {
       "LABEL": "Funktionen",
       "DISPLAY_FILE_PICKER": "Dateiauswahl im Widget anzeigen",
-      "DISPLAY_EMOJI_PICKER": "Emoji-Auswahl im Widget anzeigen"
+      "DISPLAY_EMOJI_PICKER": "Emoji-Auswahl im Widget anzeigen",
+      "ALLOW_END_CONVERSATION": "Benutzern erlauben, die Konversation vom Widget zu beenden"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger-Skript",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Pre-Chat-Formulare ermöglichen es Ihnen, Benutzerinformationen zu erfassen, bevor sie mit Ihnen ins Gespräch kommen.",
+      "SET_FIELDS": "Formularfelder vor dem Chat",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Felder",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Platzhalter",
+        "KEY": "Schlüssel",
+        "TYPE": "Typ",
+        "REQUIRED": "Benötigt"
+      },
       "ENABLE": {
         "LABEL": "Vorab Chatformulare aktivieren",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Vorab Chat-Nachricht",
+        "LABEL": "Pre-Chat-Nachricht",
         "PLACEHOLDER": "Diese Nachricht ist für alle Benutzer dieses Formulars sichtbar"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Setzen Sie Ihre IMAP-Daten",
+      "NOTE_TEXT": "Um SMTP zu aktivieren, konfigurieren Sie bitte IMAP.",
       "UPDATE": "IMAP-Einstellungen aktualisieren",
       "TOGGLE_AVAILABILITY": "IMAP-Konfiguration für diesen Posteingang aktivieren",
       "TOGGLE_HELP": "Die Aktivierung von IMAP hilft dem Benutzer, E-Mails zu empfangen",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-Mail",
-        "PLACE_HOLDER": "E-Mail"
+      "LOGIN": {
+        "LABEL": "Einloggen",
+        "PLACE_HOLDER": "Einloggen"
       },
       "PASSWORD": {
         "LABEL": "Passwort",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-Mail",
-        "PLACE_HOLDER": "E-Mail"
+      "LOGIN": {
+        "LABEL": "Einloggen",
+        "PLACE_HOLDER": "Einloggen"
       },
       "PASSWORD": {
         "LABEL": "Passwort",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Verschlüsselung",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "SSL-Überprüfungsmodus öffnen"
-    }
+      "OPEN_SSL_VERIFY_MODE": "SSL-Überprüfungsmodus öffnen",
+      "AUTH_MECHANISM": "Authentifizierung"
+    },
+    "NOTE": "Hinweis: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/integrationApps.json b/app/javascript/dashboard/i18n/locale/de/integrationApps.json
index 723482950..10c210ea3 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrationApps.json
@@ -22,10 +22,10 @@
         "INBOX": "Ja, löschen",
         "ACCOUNT": "Ja, Verbindung trennen"
       },
-      "CANCEL_BUTTON_TEXT": "Stornieren",
+      "CANCEL_BUTTON_TEXT": "Abbrechen",
       "API": {
         "SUCCESS_MESSAGE": "Hook wurde erfolgreich gelöscht",
-        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot-Server hergestellt werden. Bitte versuchen Sie es später erneut"
       }
     },
     "LIST": {
@@ -39,14 +39,14 @@
       "FORM": {
         "INBOX": {
           "LABEL": "Eingang auswählen",
-          "PLACEHOLDER": "Eingang auswählen"
+          "PLACEHOLDER": "Posteingang auswählen"
         },
         "SUBMIT": "Erstellen",
-        "CANCEL": "Stornieren"
+        "CANCEL": "Abbrechen"
       },
       "API": {
         "SUCCESS_MESSAGE": "Integrations-Hook erfolgreich hinzugefügt",
-        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+        "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot-Server hergestellt werden. Bitte versuchen Sie es später erneut"
       }
     },
     "CONNECT": {
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 7d5e2a699..f41292441 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrationen",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Abonnierte Events",
+      "FORM": {
+        "CANCEL": "Stornieren",
+        "DESC": "Webhook-Ereignisse bieten Ihnen Echtzeitinformationen darüber, was in Ihrem Chatwoot-Konto passiert. Bitte geben Sie eine gültige URL ein, um einen Rückruf zu konfigurieren.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Events",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Konversation erstellt",
+            "CONVERSATION_STATUS_CHANGED": "Konversationsstatus geändert",
+            "CONVERSATION_UPDATED": "Konversation aktualisiert",
+            "MESSAGE_CREATED": "Nachricht erstellt",
+            "MESSAGE_UPDATED": "Nachricht aktualisiert",
+            "WEBWIDGET_TRIGGERED": "Vom Benutzer geöffnetes Live-Chat-Widget"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook-URL",
+          "PLACEHOLDER": "Beispiel: https://beispiel/api/webhook",
+          "ERROR": "Bitte geben Sie eine gültige URL ein"
+        },
+        "EDIT_SUBMIT": "Webhook aktualisieren",
+        "ADD_SUBMIT": "Webhook erstellen"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Konfigurieren",
       "HEADER": "Webhook-Einstellungen",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Bearbeiten",
         "TITLE": "Webhook bearbeiten",
-        "CANCEL": "Stornieren",
-        "DESC": "Webhook-Ereignisse bieten Ihnen Echtzeitinformationen darüber, was in Ihrem Chatwoot-Konto passiert. Bitte geben Sie eine gültige URL ein, um einen Rückruf zu konfigurieren.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook-URL",
-            "PLACEHOLDER": "Beispiel: https://example/api/webhook",
-            "ERROR": "Bitte geben Sie eine gültige URL ein"
-          },
-          "SUBMIT": "Webhook bearbeiten"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL erfolgreich aktualisiert",
+          "SUCCESS_MESSAGE": "Webhook-Konfiguration erfolgreich aktualisiert",
           "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
         }
       },
       "ADD": {
         "CANCEL": "Stornieren",
         "TITLE": "Neuen Webhook hinzufügen",
-        "DESC": "Webhook-Ereignisse bieten Ihnen Echtzeitinformationen darüber, was in Ihrem Chatwoot-Konto passiert. Bitte geben Sie eine gültige URL ein, um einen Rückruf zu konfigurieren.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook-URL",
-            "PLACEHOLDER": "Beispiel: https://example/api/webhook",
-            "ERROR": "Bitte geben Sie eine gültige URL ein"
-          },
-          "SUBMIT": "Webhook erstellen"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook erfolgreich hinzugefügt",
+          "SUCCESS_MESSAGE": "Webhook-Konfiguration erfolgreich hinzugefügt",
           "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Löschung bestätigen",
-          "MESSAGE": "Bist du sicher, das du das löschen möchtest",
+          "MESSAGE": "Möchten Sie den Webhook wirklich löschen? (%{webhookURL})",
           "YES": "Ja, löschen ",
           "NO": "Nein, behalte es"
         }
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index 773f067c3..d289fd131 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Übersicht",
+    "HEADER": "Gespräche",
     "LOADING_CHART": "Diagrammdaten laden ...",
     "NO_ENOUGH_DATA": "Wir haben nicht genügend Datenpunkte erhalten, um einen Bericht zu erstellen. Bitte versuchen Sie es später erneut.",
     "DOWNLOAD_AGENT_REPORTS": "Agenten-Berichte herunterladen",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Erste Antwortzeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Zeit bis zur ersten Reaktion beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösungszeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Lösungszeit beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Auflösungsanzahl",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Jahr"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Öffnungszeiten"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agenten-Übersicht",
@@ -118,7 +123,7 @@
     "FILTER_DROPDOWN_LABEL": "Agent auswählen",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Gespräche",
+        "NAME": "Konversationen",
         "DESC": "( Gesamt )"
       },
       "INCOMING_MESSAGES": {
@@ -131,21 +136,25 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Erste Antwortzeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Zeit bis zur ersten Reaktion beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösungszeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Lösungszeit beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Auflösungsanzahl",
+        "NAME": "Lösungsanzahl",
         "DESC": "( Gesamt )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Letzten 7 Tage"
+        "name": "Letzte 7 Tage"
       },
       {
         "id": 1,
@@ -153,11 +162,11 @@
       },
       {
         "id": 2,
-        "name": "Die letzten 3 Monate"
+        "name": "Letzte 3 Monate"
       },
       {
         "id": 3,
-        "name": "Die letzten 6 Monate"
+        "name": "Letzte 6 Monate"
       },
       {
         "id": 4,
@@ -175,13 +184,13 @@
   },
   "LABEL_REPORTS": {
     "HEADER": "Label-Übersicht",
-    "LOADING_CHART": "Diagrammdaten laden ...",
+    "LOADING_CHART": "Diagrammdaten laden...",
     "NO_ENOUGH_DATA": "Wir haben nicht genügend Datenpunkte erhalten, um einen Bericht zu erstellen. Bitte versuchen Sie es später erneut.",
     "DOWNLOAD_LABEL_REPORTS": "Label-Berichte herunterladen",
     "FILTER_DROPDOWN_LABEL": "Label auswählen",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Gespräche",
+        "NAME": "Konversationen",
         "DESC": "( Gesamt )"
       },
       "INCOMING_MESSAGES": {
@@ -194,21 +203,25 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Erste Antwortzeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Zeit bis zur ersten Reaktion beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösungszeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Lösungszeit beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Auflösungsanzahl",
+        "NAME": "Lösungsanzahl",
         "DESC": "( Gesamt )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Letzten 7 Tage"
+        "name": "Letzte 7 Tage"
       },
       {
         "id": 1,
@@ -216,11 +229,11 @@
       },
       {
         "id": 2,
-        "name": "Die letzten 3 Monate"
+        "name": "Letzte 3 Monate"
       },
       {
         "id": 3,
-        "name": "Die letzten 6 Monate"
+        "name": "Letzte 6 Monate"
       },
       {
         "id": 4,
@@ -244,7 +257,7 @@
     "FILTER_DROPDOWN_LABEL": "Eingang auswählen",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Gespräche",
+        "NAME": "Konversationen",
         "DESC": "( Gesamt )"
       },
       "INCOMING_MESSAGES": {
@@ -257,21 +270,25 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Erste Antwortzeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Zeit bis zur ersten Reaktion beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösungszeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Lösungszeit beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Auflösungsanzahl",
+        "NAME": "Lösungsanzahl",
         "DESC": "( Gesamt )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Letzten 7 Tage"
+        "name": "Letzte 7 Tage"
       },
       {
         "id": 1,
@@ -279,11 +296,11 @@
       },
       {
         "id": 2,
-        "name": "Die letzten 3 Monate"
+        "name": "Letzte 3 Monate"
       },
       {
         "id": 3,
-        "name": "Die letzten 6 Monate"
+        "name": "Letzte 6 Monate"
       },
       {
         "id": 4,
@@ -307,7 +324,7 @@
     "FILTER_DROPDOWN_LABEL": "Team auswählen",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Gespräche",
+        "NAME": "Konversationen",
         "DESC": "( Gesamt )"
       },
       "INCOMING_MESSAGES": {
@@ -320,21 +337,25 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Erste Antwortzeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Zeit bis zur ersten Reaktion beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösungszeit",
-        "DESC": "( Durchschnitt )"
+        "DESC": "( Durchschnitt )",
+        "INFO_TEXT": "Gesamtzahl der Konversationen, die für die Berechnung verwendet wurden:",
+        "TOOLTIP_TEXT": "Die Lösungszeit beträgt %{metricValue} (basierend auf %{conversationCount} Konversationen)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Auflösungsanzahl",
+        "NAME": "Lösungsanzahl",
         "DESC": "( Gesamt )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Letzten 7 Tage"
+        "name": "Letzte 7 Tage"
       },
       {
         "id": 1,
@@ -342,11 +363,11 @@
       },
       {
         "id": 2,
-        "name": "Die letzten 3 Monate"
+        "name": "Letzte 3 Monate"
       },
       {
         "id": 3,
-        "name": "Die letzten 6 Monate"
+        "name": "Letzte 6 Monate"
       },
       {
         "id": 4,
@@ -392,5 +413,33 @@
         "TOOLTIP": "Anzahl aller Antworten / Anzahl der gesendeten CSAT-Umfrage * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Übersicht",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Offene Konversationen",
+      "LOADING_MESSAGE": "Konversationsdaten werden geladen...",
+      "OPEN": "Offen",
+      "UNATTENDED": "Unbeaufsichtigt",
+      "UNASSIGNED": "Nicht zugewiesen"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Konversationen von Agenten",
+      "LOADING_MESSAGE": "Agent-Daten werden geladen...",
+      "NO_AGENTS": "Es existieren keine Konversationen von Agenten",
+      "TABLE_HEADER": {
+        "AGENT": "Agent",
+        "OPEN": "OFFEN",
+        "UNATTENDED": "Unbeaufsichtigt",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agentenstatus",
+      "ONLINE": "Online",
+      "BUSY": "Beschäftigt",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
index 1ba4c192c..4eb8b36e0 100644
--- a/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/de/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Das Passwort wurde erfolgreich geändert",
       "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
     },
+    "CAPTCHA": {
+      "ERROR": "Verifizierung abgelaufen. Bitte Captcha erneut lösen."
+    },
     "SUBMIT": "Einreichen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index b49864d95..dd8e21231 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopieren",
       "COPY_SUCCESSFUL": "Code erfolgreich in die Zwischenablage kopiert"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Mehr zeigen",
+      "SHOW_LESS": "Weniger zeigen"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Herunterladen",
       "UPLOADING": "Wird hochgeladen..."
@@ -147,8 +151,9 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Wird gerade angezeigt:",
+    "SWITCH": "Wechseln",
     "CONVERSATIONS": "Gespräche",
-    "ALL_CONVERSATIONS": "Alle Unterhaltungen",
+    "ALL_CONVERSATIONS": "Alle Konversationen",
     "MENTIONED_CONVERSATIONS": "Erwähnungen",
     "REPORTS": "Berichte",
     "SETTINGS": "Einstellungen",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Neues Label",
     "NEW_TEAM": "Neues Team",
     "NEW_INBOX": "Neuer Posteingang",
-    "REPORTS_OVERVIEW": "Übersicht",
+    "REPORTS_CONVERSATION": "Gespräche",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampagnen",
     "ONGOING": "Im Gange",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Posteingang",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Setzen Sie sich als",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Übersicht"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh! Wir konnten keine Chatwoot-Konten finden. Bitte erstellen Sie ein neues Konto um fortzufahren.",
diff --git a/app/javascript/dashboard/i18n/locale/de/signup.json b/app/javascript/dashboard/i18n/locale/de/signup.json
index 2c5cf8eda..a3a47df85 100644
--- a/app/javascript/dashboard/i18n/locale/de/signup.json
+++ b/app/javascript/dashboard/i18n/locale/de/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Passwort",
       "PLACEHOLDER": "Passwort",
-      "ERROR": "Das Passwort ist zu kurz"
+      "ERROR": "Das Passwort ist zu kurz",
+      "IS_INVALID_PASSWORD": "Das Passwort sollte mindestens 1 Großbuchstaben, 1 Kleinbuchstaben, 1 Ziffer und 1 Sonderzeichen enthalten"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Bestätige das Passwort",
diff --git a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
index 9ebe08e75..849aff390 100644
--- a/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "Alle Agenten auswählen",
       "SELECTED_COUNT": "%{selected} von %{total} Agenten ausgewählt.",
       "BUTTON_TEXT": "Agenten hinzufügen",
-      "AGENT_VALIDATION_ERROR": "Mindestens einen Agenten auswählen."
+      "AGENT_VALIDATION_ERROR": "Wählen Sie mindestens einen Agenten aus."
     },
     "FINISH": {
       "TITLE": "Ihr Team ist bereit!",
diff --git a/app/javascript/dashboard/i18n/locale/el/automation.json b/app/javascript/dashboard/i18n/locale/el/automation.json
index b70c75bba..5db9eb67a 100644
--- a/app/javascript/dashboard/i18n/locale/el/automation.json
+++ b/app/javascript/dashboard/i18n/locale/el/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία συνθήκη για να αποθηκεύσετε"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία ενέργεια για να αποθηκεύσετε"
+      "DELETE_MESSAGE": "Πρέπει να έχετε τουλάχιστον μία ενέργεια για να αποθηκεύσετε",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Γράψτε το μήνυμά σας εδώ",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Επιλογή ομάδων"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Ενεργοποίηση Κανόνα Αυτοματισμού",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Δεν ήταν δυνατή η απενεργοποίηση του Αυτοματισμού, παρακαλώ προσπαθήστε ξανά αργότερα",
       "CONFIRMATION_LABEL": "Ναι",
       "CANCEL_LABEL": "Όχι"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Δεν ήταν δυνατή η μεταφόρτωση συνημμένου, παρακαλώ προσπαθήστε ξανά",
+      "LABEL_IDLE": "Ανέβασμα επισυναπτόμενου",
+      "LABEL_UPLOADING": "Ανέβασμα...",
+      "LABEL_UPLOADED": "Επιτυχής Μεταφόρτωση",
+      "LABEL_UPLOAD_FAILED": "Αποτυχία Μεταφόρτωσης"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/chatlist.json b/app/javascript/dashboard/i18n/locale/el/chatlist.json
index 485824ed9..de7179517 100644
--- a/app/javascript/dashboard/i18n/locale/el/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/el/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Κανένα Μήνυμα",
     "NO_CONTENT": "Μη διαθέσιμο περιεχόμενο",
     "HIDE_QUOTED_TEXT": "Απόκρυψη Κειμένου Παράθεσης",
-    "SHOW_QUOTED_TEXT": "Απόκρυψη Κειμένου Παράθεσης"
+    "SHOW_QUOTED_TEXT": "Απόκρυψη Κειμένου Παράθεσης",
+    "MESSAGE_READ": "Ανάγνωση"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 9920ee344..6e612edc1 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Οι επαφές αποθηκεύτηκαν με επιτυχία",
     "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Επιβεβαίωση Διαγραφής",
+      "MESSAGE": "Θέλετε να διαγράψετε τη σημείωση;",
+      "YES": "Ναι, Διέγραψε την",
+      "NO": "Όχι, Κράτησε τον/την"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Διαγραφή Επαφής",
     "TITLE": "Διαγραφή Επαφής",
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 362f5d340..8d155a663 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Ειδοποιήσεις",
     "MARK_ALL_DONE": "Όλες ολοκληρωμένες",
+    "DELETE_TITLE": "διαγράφηκε",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Μη Αναγνωσμένες Ειδοποιήσεις",
+      "ALL_NOTIFICATIONS": "Προβολή όλων των ειδοποιήσεων",
+      "LOADING_UNREAD_MESSAGE": "Φόρτωση μη αναγνωσμένων ειδοποιήσεων...",
+      "EMPTY_MESSAGE": "Δεν έχετε μη αναγνωσμένες ειδοποιήσεις"
+    },
     "LIST": {
       "LOADING_MESSAGE": "Φόρτωση ειδοποιήσεων...",
       "404": "Καμία Ειδοποίηση",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Μεταβείτε στον Πίνακα Συνομιλίων",
       "GO_TO_CONTACTS_DASHBOARD": "Μετάβαση στον Πίνακα Επαφών",
       "GO_TO_REPORTS_OVERVIEW": "Μετάβαση στις Αναφορές",
+      "GO_TO_CONVERSATION_REPORTS": "Μετάβαση στις Αναφορές Συνομιλίας",
       "GO_TO_AGENT_REPORTS": "Μεταβείτε στις Αναφορές Πράκτορα",
       "GO_TO_LABEL_REPORTS": "Μεταβείτε στις Αναφορές Ετικετών",
       "GO_TO_INBOX_REPORTS": "Μεταβείτε στις Αναφορές Εισερχομένων",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 21c5943c6..ac7d25e5a 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Χαρακτηριστικά",
       "DISPLAY_FILE_PICKER": "Να εμφανίζεται η επιλογή αρχείου στο widget",
-      "DISPLAY_EMOJI_PICKER": "Να εμφανίζεται ο επιλογές emoji στο widget"
+      "DISPLAY_EMOJI_PICKER": "Να εμφανίζεται ο επιλογές emoji στο widget",
+      "ALLOW_END_CONVERSATION": "Επιτρέψτε στους χρήστες να τερματίσουν τη συνομιλία από το widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Κώδικας (Script)",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Οι προ-φόρμες συνομιλίας σας επιτρέπουν να συλλέξετε πληροφορίες για τον χρήστη πριν να ξεκινήσει τη συνομιλία μαζί σας.",
+      "SET_FIELDS": "Πεδία προ συνομιλίας",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Πεδία",
+        "LABEL": "Ετικέτα",
+        "PLACE_HOLDER": "Τοποθέτηση",
+        "KEY": "Κλειδί",
+        "TYPE": "Τύπος",
+        "REQUIRED": "Υποχρεωτικό"
+      },
       "ENABLE": {
         "LABEL": "Ενεργοποίηση προ-φόρμας συνομιλίας",
         "OPTIONS": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Ορισμός λεπτομερειών IMAP",
+      "NOTE_TEXT": "Για να ενεργοποιήσετε το SMTP, παρακαλώ ρυθμίστε το IMAP.",
       "UPDATE": "Ενημέρωση ρυθμίσεων IMAP",
       "TOGGLE_AVAILABILITY": "Ενεργοποίηση ρυθμίσεων IMAP για αυτά τα εισερχόμενα",
       "TOGGLE_HELP": "Η ενεργοποίηση του IMAP θα βοηθήσει το χρήστη να λάβει email",
@@ -483,9 +494,9 @@
         "LABEL": "Θύρα",
         "PLACE_HOLDER": "Θύρα"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Είσοδος",
+        "PLACE_HOLDER": "Είσοδος"
       },
       "PASSWORD": {
         "LABEL": "Κωδικός",
@@ -511,9 +522,9 @@
         "LABEL": "Θύρα",
         "PLACE_HOLDER": "Θύρα"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Είσοδος",
+        "PLACE_HOLDER": "Είσοδος"
       },
       "PASSWORD": {
         "LABEL": "Κωδικός",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Κρυπτογράφηση",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Λειτουργία Επιβεβαίωσης SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Λειτουργία Επιβεβαίωσης SSL",
+      "AUTH_MECHANISM": "Πιστοποίηση"
+    },
+    "NOTE": "Σημείωση: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 4ed7d9729..9d5bb3940 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Ενοποιήσεις",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Εγγεγραμμένα Συμβάντα",
+      "FORM": {
+        "CANCEL": "Άκυρο",
+        "DESC": "Τα συμβάντα Webhook μας εφοδιάζουν με πληροφορίες πραγματικού χρόνου σχετικά με το τι συμβαίνει στο λογαριασμό σας στο Chatwoot. Παρακαλώ εισάγετε ένα έγκυρο URL στην σχετική ρύθμιση.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Συμβάντα",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Δημιουργήθηκε Συνομιλία",
+            "CONVERSATION_STATUS_CHANGED": "Η κατάσταση της συνομιλίας άλλαξε",
+            "CONVERSATION_UPDATED": "Η Συνομιλία Ενημερώθηκε",
+            "MESSAGE_CREATED": "Δημιουργήθηκε Μήνυμα",
+            "MESSAGE_UPDATED": "Το μήνυμα ενημερώθηκε",
+            "WEBWIDGET_TRIGGERED": "Το widget συνομιλίας άνοιξε από τον χρήστη"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Σύνδεσμος Webhook",
+          "PLACEHOLDER": "Παράδειγμα: https://www.hmu.gr/api/webhook",
+          "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο URL"
+        },
+        "EDIT_SUBMIT": "Ενημέρωση Webhook",
+        "ADD_SUBMIT": "Δημιουργία Webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Διαμόρφωση",
       "HEADER": "Ρυθμίσεις Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Επεξεργασία",
         "TITLE": "Επεξεργασία webhook",
-        "CANCEL": "Άκυρο",
-        "DESC": "Τα συμβάντα Webhook μας εφοδιάζουν με πληροφορίες πραγματικού χρόνου σχετικά με το τι συμβαίνει στο λογαριασμό σας στο Chatwoot. Παρακαλώ εισάγετε ένα έγκυρο URL στην σχετική ρύθμιση.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Σύνδεσμος Webhook",
-            "PLACEHOLDER": "Παράδειγμα: https://www.hmu.gr/api/webhook",
-            "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο URL"
-          },
-          "SUBMIT": "Επεξεργασία webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Το URL Webhook ενημερώθηκε με επιτυχία",
+          "SUCCESS_MESSAGE": "Οι ρυθμίσεις του Webhook ενημερώθηκαν με επιτυχία",
           "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
         }
       },
       "ADD": {
         "CANCEL": "Άκυρο",
         "TITLE": "Προσθήκη Νέου webhook",
-        "DESC": "Τα συμβάντα Webhook μας εφοδιάζουν με πληροφορίες πραγματικού χρόνου σχετικά με το τι συμβαίνει στο λογαριασμό σας στο Chatwoot. Παρακαλώ εισάγετε ένα έγκυρο URL στην σχετική ρύθμιση.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Σύνδεσμος Webhook",
-            "PLACEHOLDER": "Παράδειγμα: https://www.hmu.gr/api/webhook",
-            "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο URL"
-          },
-          "SUBMIT": "Δημιουργία Webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Το Webhook προστέθηκε επιτυχώς",
+          "SUCCESS_MESSAGE": "Η διαμόρφωση Webhook προστέθηκε με επιτυχία",
           "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Επιβεβαίωση Διαγραφής",
-          "MESSAGE": "Είσαστε σίγοιροι για την διαγραφή ",
+          "MESSAGE": "Είστε βέβαιοι να διαγράψετε το webhook? (%{webhookURL})",
           "YES": "Ναι, Διέγραψε ",
           "NO": "Όχι, Κράτησε τον/την"
         }
diff --git a/app/javascript/dashboard/i18n/locale/el/report.json b/app/javascript/dashboard/i18n/locale/el/report.json
index 37c466233..26fbcef0c 100644
--- a/app/javascript/dashboard/i18n/locale/el/report.json
+++ b/app/javascript/dashboard/i18n/locale/el/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Επισκόπηση",
+    "HEADER": "Συζητήσεις",
     "LOADING_CHART": "Φόρτωση δεδομένων γραφήματος...",
     "NO_ENOUGH_DATA": "Δεν έχουν ληφθεί αρκετά σημεία δεδομένων για την δημιουργία της αναφοράς, Παρακαλώ προσπαθήστε αργότερα.",
     "DOWNLOAD_AGENT_REPORTS": "Κατέβασμα αναφορών πράκτορα",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Χρόνος πρώτης ανταπόκρισης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο πρώτος χρόνος απόκρισης είναι %{metricValue} (βάσει %{conversationCount} συνομιλίων)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Χρόνος ανάλυσης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Χρόνος Ανάλυσης είναι %{metricValue} (βασίζεται στις %{conversationCount} συνομιλίες)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Αριθμός Αναλύσεων",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Έτος"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Ώρες Εργασίας"
   },
   "AGENT_REPORTS": {
     "HEADER": "Επισκόπηση Πρακτόρων",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Χρόνος πρώτης ανταπόκρισης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο πρώτος χρόνος απόκρισης είναι %{metricValue} (βάσει %{conversationCount} συνομιλίων)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Χρόνος ανάλυσης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Χρόνος Ανάλυσης είναι %{metricValue} (βασίζεται στις %{conversationCount} συνομιλίες)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Αριθμός Αναλύσεων",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Χρόνος πρώτης ανταπόκρισης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο πρώτος χρόνος απόκρισης είναι %{metricValue} (βάσει %{conversationCount} συνομιλίων)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Χρόνος ανάλυσης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Χρόνος Ανάλυσης είναι %{metricValue} (βασίζεται στις %{conversationCount} συνομιλίες)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Αριθμός Αναλύσεων",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Χρόνος πρώτης ανταπόκρισης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο πρώτος χρόνος απόκρισης είναι %{metricValue} (βάσει %{conversationCount} συνομιλίων)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Χρόνος ανάλυσης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Χρόνος Ανάλυσης είναι %{metricValue} (βασίζεται στις %{conversationCount} συνομιλίες)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Αριθμός Αναλύσεων",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Χρόνος πρώτης ανταπόκρισης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο πρώτος χρόνος απόκρισης είναι %{metricValue} (βάσει %{conversationCount} συνομιλίων)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Χρόνος ανάλυσης",
-        "DESC": "(Μ.Ο.)"
+        "DESC": "(Μ.Ο.)",
+        "INFO_TEXT": "Συνολικός αριθμός συνομιλιών που χρησιμοποιήθηκαν για τον υπολογισμό:",
+        "TOOLTIP_TEXT": "Ο Χρόνος Ανάλυσης είναι %{metricValue} (βασίζεται στις %{conversationCount} συνομιλίες)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Αριθμός Αναλύσεων",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Συνολικός αριθμός απαντήσεων / Συνολικός αριθμός μηνυμάτων έρευνας CSAT * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Επισκόπηση",
+    "LIVE": "Ζωντανά",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Άνοιγμα συνομιλιών",
+      "LOADING_MESSAGE": "Φόρτωση μετρητών συνομιλίας...",
+      "OPEN": "Άνοιγμα",
+      "UNATTENDED": "Χωρίς Παρακολούθηση",
+      "UNASSIGNED": "Χωρίς Αντιστοίχιση"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Συζητήσεις αντιπροσώπων",
+      "LOADING_MESSAGE": "Φόρτωση μετρήσεων πράκτορα...",
+      "NO_AGENTS": "Δεν υπάρχουν συνομιλίες από πράκτορες",
+      "TABLE_HEADER": {
+        "AGENT": "Πράκτορας",
+        "OPEN": "ΑΝΟΙΓΜΑ",
+        "UNATTENDED": "Χωρίς Παρακολούθηση",
+        "STATUS": "Κατάσταση"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Κατάσταση πράκτορα",
+      "ONLINE": "Στην Γραμμή",
+      "BUSY": "Απασχολημένος",
+      "OFFLINE": "Εκτός"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
index 8df1f8086..f682e98cf 100644
--- a/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/el/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Ο κωδικός άλλαξε με επιτυχία",
       "ERROR_MESSAGE": "Αδυναμία σύνδεσης με τον Woot Server, Παρακαλώ προσπαθήστε αργότερα"
     },
+    "CAPTCHA": {
+      "ERROR": "Η επαλήθευση έληξε. Παρακαλώ λύστε ξανά captcha."
+    },
     "SUBMIT": "Καταχώρηση"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 718286348..d14573b2b 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Αντιγραφή",
       "COPY_SUCCESSFUL": "Ο κώδικας αντιγράφτηκε με επιτυχία στο πρόχειρο"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Εμφάνιση Περισσότερων",
+      "SHOW_LESS": "Εμφάνιση Λιγότερων"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Κατέβασμα",
       "UPLOADING": "Ανέβασμα ..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Τρέχουσα προβολή:",
+    "SWITCH": "Εναλλαγή",
     "CONVERSATIONS": "Συζητήσεις",
     "ALL_CONVERSATIONS": "Όλες Οι Συνομιλίες",
     "MENTIONED_CONVERSATIONS": "Αναφορές",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Νέα ετικέτα",
     "NEW_TEAM": "Νέα ομάδα",
     "NEW_INBOX": "Νέο Κιβώτιο εισερχόμενων",
-    "REPORTS_OVERVIEW": "Επισκόπηση",
+    "REPORTS_CONVERSATION": "Συζητήσεις",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Καμπάνιες",
     "ONGOING": "Σε Εξέλιξη",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Εισερχόμενα",
     "REPORTS_TEAM": "Ομάδα",
     "SET_AVAILABILITY_TITLE": "Ορίστε τον εαυτό σας ως",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Επισκόπηση"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ωχ! Δεν μπορέσαμε να βρούμε κανένα λογαριασμό Chatwoot. Παρακαλούμε δημιουργήστε ένα νέο λογαριασμό για να συνεχίσετε.",
diff --git a/app/javascript/dashboard/i18n/locale/el/signup.json b/app/javascript/dashboard/i18n/locale/el/signup.json
index b460dc74f..220d3bab7 100644
--- a/app/javascript/dashboard/i18n/locale/el/signup.json
+++ b/app/javascript/dashboard/i18n/locale/el/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Κωδικός",
       "PLACEHOLDER": "Κωδικός",
-      "ERROR": "Ο κωδικός είναι πολύ σύντομος"
+      "ERROR": "Ο κωδικός είναι πολύ σύντομος",
+      "IS_INVALID_PASSWORD": "Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον 1 κεφαλαίο γράμμα, 1 πεζό γράμμα, 1 αριθμό και 1 ειδικό χαρακτήρα"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Επιβεβαίωση κωδικού",
diff --git a/app/javascript/dashboard/i18n/locale/es/automation.json b/app/javascript/dashboard/i18n/locale/es/automation.json
index ba8856952..6328ceda4 100644
--- a/app/javascript/dashboard/i18n/locale/es/automation.json
+++ b/app/javascript/dashboard/i18n/locale/es/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Si",
       "CANCEL_LABEL": "No"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Subiendo...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 99bb28aba..8b73f6ff2 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "Recibido por correo electrónico",
     "VIEW_TWEET_IN_TWITTER": "Ver trino en Twitter",
     "REPLY_TO_TWEET": "Responder a éste trino",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Ir a la historia de Instagram",
     "SENT": "Enviado con éxito",
     "NO_MESSAGES": "No hay mensajes",
     "NO_CONTENT": "No hay contenido disponible",
     "HIDE_QUOTED_TEXT": "Ocultar texto citado",
-    "SHOW_QUOTED_TEXT": "Mostrar texto citado"
+    "SHOW_QUOTED_TEXT": "Mostrar texto citado",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index c86b7828a..992111d3b 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacto guardado correctamente",
     "ERROR_MESSAGE": "Hubo un error, por favor inténtelo de nuevo"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirmar eliminación",
+      "MESSAGE": "¿Está seguro de eliminar esta nota?",
+      "YES": "Sí, eliminar",
+      "NO": "No, mantenerlo"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Eliminar contacto",
     "TITLE": "Eliminar contacto",
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 658f61fb2..ed5d094b9 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -74,13 +74,13 @@
       "TIP_FORMAT_ICON": "Mostrar editor de textos",
       "TIP_EMOJI_ICON": "Mostrar selector de emoji",
       "TIP_ATTACH_ICON": "Adjuntar archivos",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "TIP_AUDIORECORDER_ICON": "Grabar audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Permitir el acceso a audio",
+      "TIP_AUDIORECORDER_ERROR": "No se pudo abrir el audio",
       "ENTER_TO_SEND": "Ingresar para enviar",
       "DRAG_DROP": "Arrastra y suelta aquí para adjuntar",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "START_AUDIO_RECORDING": "Iniciar grabación de audio",
+      "STOP_AUDIO_RECORDING": "Detener grabación de audio",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Añadir bcc",
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 85086e61b..64ecf7005 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -48,7 +48,7 @@
       }
     },
     "UPDATE_CHATWOOT": "Hay una actualización %{latestChatwootVersion} para Chatwoot disponible. Por favor, actualiza tu instancia.",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "Más información"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificaciones",
     "MARK_ALL_DONE": "Marcar Todo Hecho",
+    "DELETE_TITLE": "Eliminado",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Unread Notifications",
+      "ALL_NOTIFICATIONS": "Ver todas las notificaciones",
+      "LOADING_UNREAD_MESSAGE": "Cargando notificaciones no leídas...",
+      "EMPTY_MESSAGE": "No tiene notificaciones sin leer"
+    },
     "LIST": {
       "LOADING_MESSAGE": "Cargando notificaciones...",
       "404": "Aún no hay notificaciones",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Ir al panel de conversaciones",
       "GO_TO_CONTACTS_DASHBOARD": "Ir al panel de contactos",
       "GO_TO_REPORTS_OVERVIEW": "Ir al Resumen de Reportes",
+      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
       "GO_TO_AGENT_REPORTS": "Ir a Reportes de Agente",
       "GO_TO_LABEL_REPORTS": "Ir a Reportes de Etiquetas",
       "GO_TO_INBOX_REPORTS": "Ir a Reportes de Entrada",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 72fbc2af4..8f25d620a 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Características",
       "DISPLAY_FILE_PICKER": "Mostrar el selector de archivos en el widget",
-      "DISPLAY_EMOJI_PICKER": "Mostrar el selector de emoji en el widget"
+      "DISPLAY_EMOJI_PICKER": "Mostrar el selector de emoji en el widget",
+      "ALLOW_END_CONVERSATION": "Benutzern erlauben, Konversationen über das Widget zu beenden"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script de Messenger",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Los formularios de Pre Chat le permiten capturar la información del usuario antes de que comiencen la conversación con usted.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Llave",
+        "TYPE": "Tipo",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Activar formulario de pre-chat",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Mensaje del Pre Chat",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Este mensaje sería visible para los usuarios junto con el formulario"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Configura los detalles de IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Actualizar ajustes IMAP",
       "TOGGLE_AVAILABILITY": "Habilitar configuración IMAP para esta bandeja de entrada",
       "TOGGLE_HELP": "Habilitar IMAP ayudará al usuario a recibir correo electrónico",
@@ -483,9 +494,9 @@
         "LABEL": "Puerto",
         "PLACE_HOLDER": "Puerto"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Iniciar sesión",
+        "PLACE_HOLDER": "Iniciar sesión"
       },
       "PASSWORD": {
         "LABEL": "Contraseña",
@@ -511,9 +522,9 @@
         "LABEL": "Puerto",
         "PLACE_HOLDER": "Puerto"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Iniciar sesión",
+        "PLACE_HOLDER": "Iniciar sesión"
       },
       "PASSWORD": {
         "LABEL": "Contraseña",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Cifrado",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificación SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificación SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 1b4b85c53..2476d4cad 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integraciones",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Cancelar",
+        "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL de Webhook",
+          "PLACEHOLDER": "Ejemplo: https://example/api/webhook",
+          "ERROR": "Por favor, introduzca una URL válida"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Crear webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configurar",
       "HEADER": "Configuración de Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Editar",
         "TITLE": "Editar Webhook",
-        "CANCEL": "Cancelar",
-        "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL de Webhook",
-            "PLACEHOLDER": "Ejemplo: https://example/api/webhook",
-            "ERROR": "Por favor, introduzca una URL válida"
-          },
-          "SUBMIT": "Editar Webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL del webhook actualizado correctamente",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
         }
       },
       "ADD": {
         "CANCEL": "Cancelar",
         "TITLE": "Añadir nuevo webhook",
-        "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL de Webhook",
-            "PLACEHOLDER": "Ejemplo: https://example/api/webhook",
-            "ERROR": "Por favor, introduzca una URL válida"
-          },
-          "SUBMIT": "Crear webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook añadido correctamente",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmar eliminación",
-          "MESSAGE": "¿Está seguro de eliminar ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Sí, eliminar ",
           "NO": "No, mantenerlo"
         }
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index 1d2abfde1..943da01c4 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Resumen",
+    "HEADER": "Conversaciones",
     "LOADING_CHART": "Cargando datos del gráfico...",
     "NO_ENOUGH_DATA": "No hemos recibido suficientes puntos de datos para generar el informe. Inténtalo de nuevo más tarde.",
     "DOWNLOAD_AGENT_REPORTS": "Descargar reportes de agente",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primera respuesta",
-        "DESC": "( Media )"
+        "NAME": "First Response Time",
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Año"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Horarios"
   },
   "AGENT_REPORTS": {
     "HEADER": "Resumen de agentes",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primera respuesta",
-        "DESC": "( Media )"
+        "NAME": "First Response Time",
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primera respuesta",
-        "DESC": "( Media )"
+        "NAME": "First Response Time",
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primera respuesta",
-        "DESC": "( Media )"
+        "NAME": "First Response Time",
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primera respuesta",
-        "DESC": "( Media )"
+        "NAME": "First Response Time",
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Número total de respuestas / Número total de mensajes de la encuesta de satisfacción enviados * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Resumen",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Abrir",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Sin asignar"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Agente",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Estado"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "En línea",
+      "BUSY": "Ocupado",
+      "OFFLINE": "Fuera de línea"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/setNewPassword.json b/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
index 3f5c29dc6..12f49daf8 100644
--- a/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/es/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Contraseña cambiada con éxito",
       "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
     },
+    "CAPTCHA": {
+      "ERROR": "La verificación ha caducado. Por favor, resuelve el captcha de nuevo."
+    },
     "SUBMIT": "Enviar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 06d7ce711..fbbd2732b 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copiar",
       "COPY_SUCCESSFUL": "Código copiado al portapapeles con éxito"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descargar",
       "UPLOADING": "Subiendo..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizando:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversaciones",
     "ALL_CONVERSATIONS": "Todas las conversaciones",
     "MENTIONED_CONVERSATIONS": "Menciones",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Nueva etiqueta",
     "NEW_TEAM": "Nuevo equipo",
     "NEW_INBOX": "Nuevo buzón",
-    "REPORTS_OVERVIEW": "Resumen",
+    "REPORTS_CONVERSATION": "Conversaciones",
     "CSAT": "Encuestas de Satisfacción",
     "CAMPAIGNS": "Campañas",
     "ONGOING": "En Curso",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Bandeja de entrada",
     "REPORTS_TEAM": "Equipo",
     "SET_AVAILABILITY_TITLE": "Ponte como",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Resumen"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "¡Oh oh! No hemos podido encontrar ninguna cuenta de \"Chatwoot\". Por favor, crea una nueva cuenta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index 5ce5b2761..498c84f06 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Contraseña",
       "PLACEHOLDER": "Contraseña",
-      "ERROR": "La contraseña es demasiado corta"
+      "ERROR": "La contraseña es demasiado corta",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar contraseña",
diff --git a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
index 2125e478b..77cf7035e 100644
--- a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "seleccionar todos los agentes",
       "SELECTED_COUNT": "%{selected} de %{total} agentes seleccionados.",
       "BUTTON_TEXT": "Añadir agentes",
-      "AGENT_VALIDATION_ERROR": "Seleccione al menos un agente."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "¡Su equipo está listo!",
diff --git a/app/javascript/dashboard/i18n/locale/fa/automation.json b/app/javascript/dashboard/i18n/locale/fa/automation.json
index ba12b136e..4f47e2cc2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "شما باید حداقل یک شرط برای ذخیره داشته باشید"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "برای ذخیره باید حداقل یک اکشن داشته باشید"
+      "DELETE_MESSAGE": "برای ذخیره باید حداقل یک اکشن داشته باشید",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "پیام خود را اینجا وارد کنید",
+      "TEAM_DROPDOWN_PLACEHOLDER": "انتخاب تیم‌ها"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "فعال کردن قانون اتوماسیون",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "اتوماسیون نمی‌توان غیرفعال شد، لطفا بعدا دوباره امتحان کنید",
       "CONFIRMATION_LABEL": "بله",
       "CANCEL_LABEL": "خیر"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "پیوست آپلود نشد، لطفا دوباره امتحان کنید",
+      "LABEL_IDLE": "بارگذاری پیوست",
+      "LABEL_UPLOADING": "در حال بارگذاری...",
+      "LABEL_UPLOADED": "با موفقیت بارگذاری شد",
+      "LABEL_UPLOAD_FAILED": "بارگذاری انجام نشد"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index 94211080a..2bdaba90c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "هیچ پیامی وجود ندارد",
     "NO_CONTENT": "هیچ محتوایی موجود نیست",
     "HIDE_QUOTED_TEXT": "مخفی کردن متن نقل قول شده",
-    "SHOW_QUOTED_TEXT": "نمایش متن نقل قول"
+    "SHOW_QUOTED_TEXT": "نمایش متن نقل قول",
+    "MESSAGE_READ": "خوانده شده"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/contact.json b/app/javascript/dashboard/i18n/locale/fa/contact.json
index 742f634fd..bd20d63b7 100644
--- a/app/javascript/dashboard/i18n/locale/fa/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fa/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "مخاطبین با موفقیت ذخیره شدند",
     "ERROR_MESSAGE": "خطایی پیش آمد. لطفا دوباره امتحان کنید"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "تاییدیه حذف",
+      "MESSAGE": "آیا مطمئن هستید که می خواهید این یادداشت را حذف کنید؟",
+      "YES": "بله، حذف شود ",
+      "NO": "خیر، بماند"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "حذف مخاطب",
     "TITLE": "حذف مخاطب",
diff --git a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
index be8214443..e601b900c 100644
--- a/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "اعلان ها",
     "MARK_ALL_DONE": "همه را به انجام شده تغییر بده",
+    "DELETE_TITLE": "حذف شده",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "آگاه‌سازی‌های خوانده نشده",
+      "ALL_NOTIFICATIONS": "مشاهده همه آگاه‌سازی‌ها",
+      "LOADING_UNREAD_MESSAGE": "در حال بارگیری آگاه‌سازی‌های خوانده نشده...",
+      "EMPTY_MESSAGE": "شما هیچ آگاه‌سازی‌ خوانده نشده‌ای ندارید"
+    },
     "LIST": {
       "LOADING_MESSAGE": "در حال بارگیری اعلان ها...",
       "404": "اعلانی وجود ندارد",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "به داشبورد مکالمه بروید",
       "GO_TO_CONTACTS_DASHBOARD": "به داشبورد مخاطبین بروید",
       "GO_TO_REPORTS_OVERVIEW": "به نمای کلی گزارش ها بروید",
+      "GO_TO_CONVERSATION_REPORTS": "به گزارش های گفتگو بروید",
       "GO_TO_AGENT_REPORTS": "به گزارش های ایجنت بروید",
       "GO_TO_LABEL_REPORTS": "به گزارش برچسب بروید",
       "GO_TO_INBOX_REPORTS": "به گزارش صندوق ورودی بروید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 7d038a2c4..1734395c9 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "امکانات",
       "DISPLAY_FILE_PICKER": "نمایش گزینه ضمیه فایل در ویجت",
-      "DISPLAY_EMOJI_PICKER": "نمایش گزینه انتخاب ایموجی در ویجت"
+      "DISPLAY_EMOJI_PICKER": "نمایش گزینه انتخاب ایموجی در ویجت",
+      "ALLOW_END_CONVERSATION": "به کاربران اجازه دهید مکالمه را از ویجت پایان دهند"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "اسکریپت ویجت",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "فرم های پیش چت به شما امکان می دهد اطلاعات کاربران را قبل از شروع مکالمه با شما ذخیره کنید.",
+      "SET_FIELDS": "فیلدهای فرم قبل از چت",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "فیلدها",
+        "LABEL": "برچسب",
+        "PLACE_HOLDER": "نگهدارنده",
+        "KEY": "کلید",
+        "TYPE": "نوع",
+        "REQUIRED": "ضروری"
+      },
       "ENABLE": {
         "LABEL": "فعال کردن فرم پیش چت",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "پیام پیش چت",
+        "LABEL": "پیام قبل از چت",
         "PLACEHOLDER": "این پیام به همراه فرم برای کاربران قابل مشاهده است"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "جزئیات IMAP خود را تنظیم کنید",
+      "NOTE_TEXT": "برای فعال کردن SMTP، لطفا IMAP را پیکربندی کنید.",
       "UPDATE": "به‌روزرسانی تنظیمات IMAP",
       "TOGGLE_AVAILABILITY": "پیکربندی IMAP را برای این صندوق ورودی فعال کنید",
       "TOGGLE_HELP": "در حال فعال کردن IMAP به کاربر در دریافت ایمیل کمک می‌کند",
@@ -483,9 +494,9 @@
         "LABEL": "درگاه",
         "PLACE_HOLDER": "درگاه"
       },
-      "EMAIL": {
-        "LABEL": "ایمیل",
-        "PLACE_HOLDER": "ایمیل"
+      "LOGIN": {
+        "LABEL": "ورود",
+        "PLACE_HOLDER": "ورود"
       },
       "PASSWORD": {
         "LABEL": "رمز عبور",
@@ -511,9 +522,9 @@
         "LABEL": "درگاه",
         "PLACE_HOLDER": "درگاه"
       },
-      "EMAIL": {
-        "LABEL": "ایمیل",
-        "PLACE_HOLDER": "ایمیل"
+      "LOGIN": {
+        "LABEL": "ورود",
+        "PLACE_HOLDER": "ورود"
       },
       "PASSWORD": {
         "LABEL": "رمز عبور",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "رمزگذاری",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "باز کردن حالت تایید SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "باز کردن حالت تایید SSL",
+      "AUTH_MECHANISM": "احراز هویت"
+    },
+    "NOTE": "یادداشت: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/integrations.json b/app/javascript/dashboard/i18n/locale/fa/integrations.json
index 0d685ae3e..77685c342 100644
--- a/app/javascript/dashboard/i18n/locale/fa/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fa/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "برنامه‌های تلفیق شده",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "رویدادهای مشترک شده",
+      "FORM": {
+        "CANCEL": "انصراف",
+        "DESC": "رویدادهای وب هوک اطلاعات لحظه‌ای حساب چت ووت شما را منتقل می‌کنند. لطفا آدرس URL صحیحی وارد کنید.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "رویدادها",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "گفتگو ایجاد شد",
+            "CONVERSATION_STATUS_CHANGED": "وضعیت گفتگو تغییر کرد",
+            "CONVERSATION_UPDATED": "گفتگو به روز شد",
+            "MESSAGE_CREATED": "پیام ایجاد شد",
+            "MESSAGE_UPDATED": "پیام به روز شد",
+            "WEBWIDGET_TRIGGERED": "ابزارک گفتگو زنده توسط کاربر باز شده است"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "آدرس URL وب هوک",
+          "PLACEHOLDER": "به عنوان مثال: https://example/api/webhook",
+          "ERROR": "لطفا آدرس URL صحیحی وارد کنید"
+        },
+        "EDIT_SUBMIT": "به‌روزرسانی وب‌هوک",
+        "ADD_SUBMIT": "ساخت وب هوک"
+      },
       "TITLE": "وب هوک",
       "CONFIGURE": "تنظیمات",
       "HEADER": "تنظیمات وب هوک",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "ویرایش",
         "TITLE": "ویرایش وب هوک",
-        "CANCEL": "انصراف",
-        "DESC": "رویدادهای وب هوک اطلاعات لحظه‌ای حساب چت ووت شما را منتقل می‌کنند. لطفا آدرس URL صحیحی وارد کنید.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "آدرس URL وب هوک",
-            "PLACEHOLDER": "به عنوان مثال: https://example/api/webhook",
-            "ERROR": "لطفا آدرس URL صحیحی وارد کنید"
-          },
-          "SUBMIT": "ویرایش وب هوک"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "وب هوک بروزرسانی شد",
+          "SUCCESS_MESSAGE": "پیکربندی وب‌هوک با موفقیت به روز شد",
           "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
         }
       },
       "ADD": {
         "CANCEL": "انصراف",
         "TITLE": "اضافه کردن وب هوک جدید",
-        "DESC": "رویدادهای وب هوک اطلاعات لحظه‌ای حساب چت ووت شما را منتقل می‌کنند. لطفا آدرس URL صحیحی وارد کنید.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "آدرس URL وب هوک",
-            "PLACEHOLDER": "به عنوان مثال: https://example/api/webhook",
-            "ERROR": "لطفا آدرس URL صحیحی وارد کنید"
-          },
-          "SUBMIT": "ساخت وب هوک"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "وب هوک ساخته شد",
+          "SUCCESS_MESSAGE": "پیکربندی وب‌هوک با موفقیت اضافه شد",
           "ERROR_MESSAGE": "متاسفانه ارتباط با سرور برقرار نشد، مجددا امتحان کنید"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "تاییدیه حذف",
-          "MESSAGE": "مطمئن هستید که می‌خواهید حذف شود ",
+          "MESSAGE": "آیا برای حذف وب‌هوک مطمئن هستید؟ \n(%{webhookURL})",
           "YES": "بله، حذف شود",
           "NO": "خیر، بماند"
         }
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 690b0f0b6..92a85236d 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "بررسی اجمالی",
+    "HEADER": "گفتگوها",
     "LOADING_CHART": "در حال دریافت اطلاعات...",
     "NO_ENOUGH_DATA": "متاسفانه اطلاعات کافی دریافت نشد، لطفا بعدا دوباره امتحان کنید",
     "DOWNLOAD_AGENT_REPORTS": "دانلود گزارش ایجنت",
@@ -18,12 +18,16 @@
         "DESC": "( جمع کل )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "زمان تا اولین پاسخ",
-        "DESC": "( میانگین )"
+        "NAME": "اولین زمان پاسخگویی",
+        "DESC": "( میانگین )",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان پاسخ اول %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "( میانگین )"
+        "DESC": "( میانگین )",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان اتمام گفتگو %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -108,7 +112,8 @@
         "id": 0,
         "groupBy": "سال"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "ساعت کاری"
   },
   "AGENT_REPORTS": {
     "HEADER": "نمای کلی ایجنت ها",
@@ -130,12 +135,16 @@
         "DESC": "( جمع کل )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "زمان تا اولین پاسخ",
-        "DESC": "« میانگین »"
+        "NAME": "اولین زمان پاسخگویی",
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان پاسخ اول %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "« میانگین »"
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان اتمام گفتگو %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -193,12 +202,16 @@
         "DESC": "( جمع کل )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "زمان تا اولین پاسخ",
-        "DESC": "( میانگین )"
+        "NAME": "اولین زمان پاسخگویی",
+        "DESC": "( میانگین )",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان پاسخ اول %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "( میانگین )"
+        "DESC": "( میانگین )",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان اتمام گفتگو %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -256,12 +269,16 @@
         "DESC": "( جمع کل )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "زمان تا اولین پاسخ",
-        "DESC": "« میانگین »"
+        "NAME": "اولین زمان پاسخگویی",
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان پاسخ اول %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "« میانگین »"
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان اتمام گفتگو %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -319,12 +336,16 @@
         "DESC": "( جمع کل )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "زمان تا اولین پاسخ",
-        "DESC": "« میانگین »"
+        "NAME": "اولین زمان پاسخگویی",
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان پاسخ اول %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_TIME": {
         "NAME": "زمان تا حل شدن مساله",
-        "DESC": "« میانگین »"
+        "DESC": "« میانگین »",
+        "INFO_TEXT": "تعداد کل مکالمات مورد استفاده برای محاسبه:",
+        "TOOLTIP_TEXT": "زمان اتمام گفتگو %{metricValue} (بر اساس %{conversationCount} گفتگو)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "تعداد مسائل حل شده",
@@ -392,5 +413,33 @@
         "TOOLTIP": "تعداد کل پاسخ ها / تعداد کل پیام های نظرسنجی رضایت مشتری ارسال شده از 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "بررسی اجمالی",
+    "LIVE": "زنده",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "گفتگوها را باز کنید",
+      "LOADING_MESSAGE": "در حال بارگیری معیارهای مکالمه...",
+      "OPEN": "باز",
+      "UNATTENDED": "بی سرپرست",
+      "UNASSIGNED": "تخصیص داده نشده"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "گفتگوهای ایجنت ها",
+      "LOADING_MESSAGE": "در حال بارگیری معیارهای ایجنت...",
+      "NO_AGENTS": "هیچ مکالمه ای توسط ایجنت ها وجود ندارد",
+      "TABLE_HEADER": {
+        "AGENT": "ایجنت",
+        "OPEN": "باز",
+        "UNATTENDED": "بی سرپرست",
+        "STATUS": "وضعیت"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "وضعیت ایجنت",
+      "ONLINE": "آنلاین",
+      "BUSY": "مشغول",
+      "OFFLINE": "آفلاین"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
index 1a20a61ab..0dda2d16e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fa/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "رمز عوض شد",
       "ERROR_MESSAGE": "ارتباط با سرور برقرار نشد، لطفا مجددا امتحان کنید"
     },
+    "CAPTCHA": {
+      "ERROR": "تأیید اعتبار منقضی شد. لطفا دوباره کپچا را حل کنید."
+    },
     "SUBMIT": "ثبت"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index 3ced58779..c1f119d01 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "کپی",
       "COPY_SUCCESSFUL": "کد به حافظه کپی شد"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "نمایش بیشتر",
+      "SHOW_LESS": "نمایش کمتر"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "دانلود",
       "UPLOADING": "در حال آپلود..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "در حال مشاهده:",
+    "SWITCH": "تعویض",
     "CONVERSATIONS": "گفتگوها",
     "ALL_CONVERSATIONS": "همه گفتگوها",
     "MENTIONED_CONVERSATIONS": "اشاره",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "برچسب جدید",
     "NEW_TEAM": "تیم جدید",
     "NEW_INBOX": "صندوق ورودی جدید",
-    "REPORTS_OVERVIEW": "بررسی اجمالی",
+    "REPORTS_CONVERSATION": "گفتگوها",
     "CSAT": "رضایت مشتری",
     "CAMPAIGNS": "کمپین ها",
     "ONGOING": "درحال انجام",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "صندوق ورودی",
     "REPORTS_TEAM": "تیم‌",
     "SET_AVAILABILITY_TITLE": "خود را به عنوان",
-    "BETA": "آزمایشی"
+    "BETA": "آزمایشی",
+    "REPORTS_OVERVIEW": "بررسی اجمالی"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "اوه اوه! ما هیچ حسابی روی Chatwoot پاز شما پیدا نکردیم. لطفاً برای ادامه یک حساب جدید ایجاد کنید.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/signup.json b/app/javascript/dashboard/i18n/locale/fa/signup.json
index 7baa846bb..512cbfe85 100644
--- a/app/javascript/dashboard/i18n/locale/fa/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fa/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "رمز عبور",
       "PLACEHOLDER": "رمز عبور",
-      "ERROR": "رمز عبور خیلی کوتاه است"
+      "ERROR": "رمز عبور خیلی کوتاه است",
+      "IS_INVALID_PASSWORD": "رمز عبور باید شامل حداقل ۱ حرف بزرگ، ۱ حرف کوچک، ۱ عدد و ۱ کاراکتر خاص باشد"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "تکرار رمز عبور",
diff --git a/app/javascript/dashboard/i18n/locale/fi/automation.json b/app/javascript/dashboard/i18n/locale/fi/automation.json
index ec100f9ea..1d3af9c78 100644
--- a/app/javascript/dashboard/i18n/locale/fi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Lähetetään...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/chatlist.json b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
index 4e245f18d..6b5842902 100644
--- a/app/javascript/dashboard/i18n/locale/fi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Ei Viestejä",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
index 5189bc841..c1429ff36 100644
--- a/app/javascript/dashboard/i18n/locale/fi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "Tapahtui virhe, yritä uudelleen"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Vahvista poistaminen",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Ei, säilytä"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
index 4825a36c5..59f99848c 100644
--- a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Ilmoitukset",
     "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index a47244f58..a985f2811 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Ominaisuudet",
       "DISPLAY_FILE_PICKER": "Näytä liitevalitsin widgetissä",
-      "DISPLAY_EMOJI_PICKER": "Näytä emojivalitsin widgetissä"
+      "DISPLAY_EMOJI_PICKER": "Näytä emojivalitsin widgetissä",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger-skripti",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Sähköposti",
-        "PLACE_HOLDER": "Sähköposti"
+      "LOGIN": {
+        "LABEL": "Kirjaudu",
+        "PLACE_HOLDER": "Kirjaudu"
       },
       "PASSWORD": {
         "LABEL": "Salasana",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Sähköposti",
-        "PLACE_HOLDER": "Sähköposti"
+      "LOGIN": {
+        "LABEL": "Kirjaudu",
+        "PLACE_HOLDER": "Kirjaudu"
       },
       "PASSWORD": {
         "LABEL": "Salasana",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
index f5b7ef0a8..1f52d7b60 100644
--- a/app/javascript/dashboard/i18n/locale/fi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integraatiot",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Peruuta",
+        "DESC": "Webhook-tapahtumat antavat sinulle reaaliaikaista tietoa siitä, mitä Chatwot-tililläsi tapahtuu. Syötä kelvollinen URL-osoite, jotta voit määrittää callbackin.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhookin URL",
+          "PLACEHOLDER": "Esimerkki: https://example/api/webhook",
+          "ERROR": "Anna kelvollinen URL-osoite"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Luo webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Määrittele",
       "HEADER": "Webhook-asetukset",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Muokkaa",
         "TITLE": "Edit webhook",
-        "CANCEL": "Peruuta",
-        "DESC": "Webhook-tapahtumat antavat sinulle reaaliaikaista tietoa siitä, mitä Chatwot-tililläsi tapahtuu. Syötä kelvollinen URL-osoite, jotta voit määrittää callbackin.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhookin URL",
-            "PLACEHOLDER": "Esimerkki: https://example/api/webhook",
-            "ERROR": "Anna kelvollinen URL-osoite"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
         }
       },
       "ADD": {
         "CANCEL": "Peruuta",
         "TITLE": "Lisää uusi webhook",
-        "DESC": "Webhook-tapahtumat antavat sinulle reaaliaikaista tietoa siitä, mitä Chatwot-tililläsi tapahtuu. Syötä kelvollinen URL-osoite, jotta voit määrittää callbackin.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhookin URL",
-            "PLACEHOLDER": "Esimerkki: https://example/api/webhook",
-            "ERROR": "Anna kelvollinen URL-osoite"
-          },
-          "SUBMIT": "Luo webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook lisätty onnistuneesti",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Vahvista poistaminen",
-          "MESSAGE": "Oletko varma että haluat poistaa ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Kyllä, poista ",
           "NO": "Ei, säilytä"
         }
diff --git a/app/javascript/dashboard/i18n/locale/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
index 294589fb6..ee09078f3 100644
--- a/app/javascript/dashboard/i18n/locale/fi/report.json
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Keskustelut",
     "LOADING_CHART": "Ladataan kaaviotietoja...",
     "NO_ENOUGH_DATA": "Emme ole saaneet tarpeeksi dataa raportin luomiseen, yritä myöhemmin uudelleen.",
     "DOWNLOAD_AGENT_REPORTS": "Lataa edustajaraportit",
@@ -18,12 +18,16 @@
         "DESC": "(yhteensä)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Ensimmäinen vasteaika",
-        "DESC": "(keskiarvo)"
+        "NAME": "First Response Time",
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Selviytymisen kesto",
-        "DESC": "(keskiarvo)"
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Selvitysmäärä",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "(yhteensä)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Ensimmäinen vasteaika",
-        "DESC": "(keskiarvo)"
+        "NAME": "First Response Time",
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Selviytymisen kesto",
-        "DESC": "(keskiarvo)"
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Selvitysmäärä",
@@ -193,12 +202,16 @@
         "DESC": "(yhteensä)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Ensimmäinen vasteaika",
-        "DESC": "(keskiarvo)"
+        "NAME": "First Response Time",
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Selviytymisen kesto",
-        "DESC": "(keskiarvo)"
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Selvitysmäärä",
@@ -256,12 +269,16 @@
         "DESC": "(yhteensä)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Ensimmäinen vasteaika",
-        "DESC": "(keskiarvo)"
+        "NAME": "First Response Time",
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Selviytymisen kesto",
-        "DESC": "(keskiarvo)"
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Selvitysmäärä",
@@ -319,12 +336,16 @@
         "DESC": "(yhteensä)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Ensimmäinen vasteaika",
-        "DESC": "(keskiarvo)"
+        "NAME": "First Response Time",
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Selviytymisen kesto",
-        "DESC": "(keskiarvo)"
+        "DESC": "(keskiarvo)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Selvitysmäärä",
@@ -392,5 +413,33 @@
         "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": "Avaa",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Osoittamaton"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Edustajat",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Tila"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Paikalla",
+      "BUSY": "Kiireinen",
+      "OFFLINE": "Poissa"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
index 51edff256..1cf732846 100644
--- a/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Salasanan vaihtaminen onnistui",
       "ERROR_MESSAGE": "Yhteyden muodostaminen Woot-palvelimelle ei onnistunut, yritä myöhemmin uudelleen"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Lähetä"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 3db80b748..26b61650e 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopioi",
       "COPY_SUCCESSFUL": "Koodi kopioitu leikepöydälle onnistuneesti"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Lataa",
       "UPLOADING": "Lähetetään..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Keskustelut",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Keskustelut",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json
index bf8e8445a..1e18a9b0f 100644
--- a/app/javascript/dashboard/i18n/locale/fi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fi/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Salasana",
       "PLACEHOLDER": "Salasana",
-      "ERROR": "Salasana on liian lyhyt"
+      "ERROR": "Salasana on liian lyhyt",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Vahvista salasana",
diff --git a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
index 80b0f69ae..8fcaec01b 100644
--- a/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Lisää edustaja",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/fr/automation.json b/app/javascript/dashboard/i18n/locale/fr/automation.json
index ec3306b5e..4082927b8 100644
--- a/app/javascript/dashboard/i18n/locale/fr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/automation.json
@@ -89,19 +89,28 @@
       "DELETE_MESSAGE": "Vous devez avoir au moins une condition pour enregistrer"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Vous devez avoir au moins une action pour enregistrer"
+      "DELETE_MESSAGE": "Vous devez avoir au moins une action pour enregistrer",
+      "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",
+      "ACTIVATION_TITLE": "Activer la règle d'automatisation",
+      "DEACTIVATION_TITLE": "Activer la règle d'automatisation",
+      "ACTIVATION_DESCRIPTION": "Cette action activera la règle d'automatisation '{automationName}'. Êtes-vous sur de vouloir continuer?",
+      "DEACTIVATION_DESCRIPTION": "Cette action activera la règle d'automatisation '{automationName}'. Êtes-vous sur de vouloir continuer?",
+      "ACTIVATION_SUCCESFUL": "Règle d'automatisation activée avec succès",
+      "DEACTIVATION_SUCCESFUL": "Règle d'automatisation désactivée avec succès",
+      "ACTIVATION_ERROR": "Impossible d'activer l'automatisation, veuillez réessayer plus tard",
+      "DEACTIVATION_ERROR": "Impossible de désactiver l'automatisation, veuillez réessayer plus tard",
       "CONFIRMATION_LABEL": "Oui",
       "CANCEL_LABEL": "Non"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Téléversement...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/campaign.json b/app/javascript/dashboard/i18n/locale/fr/campaign.json
index c36fa4ee5..df0f947df 100644
--- a/app/javascript/dashboard/i18n/locale/fr/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/fr/campaign.json
@@ -3,7 +3,7 @@
     "HEADER": "Campagnes",
     "SIDEBAR_TXT": "Les messages proactifs permettent au client d'envoyer des messages sortants à ses contacts, qui déclenchent plus de conversations. Cliquer sur <b>Ajouter une campagne</b> pour créer une nouvelle campagne. Vous pouvez également modifier ou supprimer une campagne existante en cliquant sur le bouton Éditer ou Supprimer.",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "Créer une campagne isolée",
+      "ONE_OFF": "Create a one off campaign",
       "ONGOING": "Créer une campagne en cours"
     },
     "ADD": {
@@ -18,7 +18,7 @@
           "ERROR": "Le titre est requis"
         },
         "SCHEDULED_AT": {
-          "LABEL": "Horaire programmée",
+          "LABEL": "Heure programmée",
           "PLACEHOLDER": "Veuillez sélectionner l'heure",
           "CONFIRM": "Confirmer",
           "ERROR": "L'heure programmée est requise"
@@ -26,7 +26,7 @@
         "AUDIENCE": {
           "LABEL": "Audience",
           "PLACEHOLDER": "Sélectionnez les étiquettes des clients",
-          "ERROR": "L'audience est requise"
+          "ERROR": "Audience is required"
         },
         "INBOX": {
           "LABEL": "Sélectionner la boîte de réception",
@@ -54,7 +54,7 @@
           "ERROR": "Le temps sur la page est requis"
         },
         "ENABLED": "Activer la campagne",
-        "TRIGGER_ONLY_BUSINESS_HOURS": "Trigger only during business hours",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "Déclencher uniquement pendant les heures d'ouverture",
         "SUBMIT": "Ajouter une campagne"
       },
       "API": {
@@ -93,7 +93,7 @@
         "STATUS": "État",
         "SENDER": "Expéditeur",
         "URL": "URL",
-        "SCHEDULED_AT": "Horaire programmée",
+        "SCHEDULED_AT": "Heure prévue",
         "TIME_ON_PAGE": "Temps(secondes)",
         "CREATED_AT": "Créé le"
       },
@@ -113,7 +113,7 @@
       }
     },
     "ONE_OFF": {
-      "HEADER": "Campagnes isolées",
+      "HEADER": "Campagnes ponctuelles",
       "404": "Il n'y a pas de campagnes isolées créées",
       "INBOXES_NOT_FOUND": "Veuillez créer une boîte de réception SMS et commencez à ajouter des campagnes"
     },
diff --git a/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
index 6e89d7a09..10b02515a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Ajouter une réponse standardisée",
     "LOADING": "Récupération des réponses standardisées",
     "SEARCH_404": "Il n'y a aucun élément correspondant à cette requête",
-    "SIDEBAR_TXT": "<p><b>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>Réponses standardisées</b> </p><p> Les réponses standardisées sont des modèles de réponse enregistrés qui peuvent être utilisés pour envoyer rapidement une réponse à une conversation. </p><p> Pour créer une réponse en conserve, cliquez simplement sur <b>Ajouter une réponse en conserve</b>. Vous pouvez également modifier ou supprimer une réponse en conserve existante en cliquant sur le bouton Modifier ou Supprimer </p><p> Les réponses en conserve sont utilisées à l'aide de <b>codes courts</b>. Les agents peuvent accéder aux réponses standardisées lors d'un chat en tapant <b>'/'</b> suivi du code court. </p>",
     "LIST": {
       "404": "Il n'y a aucune réponse standardisée disponible dans ce compte.",
       "TITLE": "Gérer les réponses standardisées",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Ajouter une réponse standardisée",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Les réponses en conserve sont des modèles de réponse enregistrés qui peuvent être utilisés pour envoyer rapidement une réponse à une conversation.",
       "CANCEL_BUTTON_TEXT": "Annuler",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Raccourcis",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "Veuillez entrer un code court",
           "ERROR": "Le raccourci est requis"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/fr/chatlist.json b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
index 2e6c3d115..4a37f71e7 100644
--- a/app/javascript/dashboard/i18n/locale/fr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "Reçu par courriel",
     "VIEW_TWEET_IN_TWITTER": "Voir le tweet sur Twitter",
     "REPLY_TO_TWEET": "Répondre à ce tweet",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Aller à l'histoire instagram",
     "SENT": "Envoyé avec succès",
     "NO_MESSAGES": "Pas de messages",
     "NO_CONTENT": "Aucun contenu disponible",
     "HIDE_QUOTED_TEXT": "Masquer le texte cité",
-    "SHOW_QUOTED_TEXT": "Afficher le texte cité"
+    "SHOW_QUOTED_TEXT": "Afficher le texte cité",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 41bf6f212..e1757bb8b 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts enregistrés avec succès",
     "ERROR_MESSAGE": "Une erreur est survenue, veuillez réessayer"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirmer la suppression",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Non, conservez-le"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Supprimer le contact",
     "TITLE": "Supprimer le contact",
@@ -110,7 +118,7 @@
         "LABEL": "Numéro de téléphone",
         "HELP": "Le numéro de téléphone doit être au format E.164. Ex. : +1415555555 [+][code pays][code régional][numéro de téléphone local]",
         "ERROR": "Le numéro de téléphone doit être soit vide soit au format E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Ce numéro de téléphone est utilisé par un autre contact."
       },
       "LOCATION": {
         "PLACEHOLDER": "Entrez l'emplacement du contact",
@@ -178,8 +186,8 @@
     "SEARCH_BUTTON": "Rechercher",
     "SEARCH_INPUT_PLACEHOLDER": "Rechercher des contacts",
     "FILTER_CONTACTS": "Filtrer",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS_SAVE": "Enregistrer le filtre",
+    "FILTER_CONTACTS_DELETE": "Supprimer le filtre",
     "LIST": {
       "LOADING_MESSAGE": "Chargement des contacts...",
       "404": "Aucun contact ne correspond à votre recherche 🔍",
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index bb83bc5f2..34c47dcad 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Chargement des conversations",
     "CANNOT_REPLY": "Vous ne pouvez pas répondre en raison de",
     "24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Cette conversation ne vous est pas assignée. Voulez-vous vous assigner cette conversation ?",
     "ASSIGN_TO_ME": "M’assigner la conversation",
     "TWILIO_WHATSAPP_CAN_REPLY": "Vous pouvez seulement répondre à cette conversation en utilisant un modèle de message en raison de",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restriction de fenêtre de message de 24 heures",
@@ -57,13 +57,13 @@
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "Signature du message",
+      "ENABLE_SIGN_TOOLTIP": "Activer la signature",
+      "DISABLE_SIGN_TOOLTIP": "Désactiver la signature",
       "MSG_INPUT": "Maj + entrée pour une nouvelle ligne. Commencez par '/' pour sélectionner une réponse standardisée.",
       "PRIVATE_MSG_INPUT": "Maj + entrée pour une nouvelle ligne. Cela ne sera visible que par les agents",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "La signature du message n'est pas configurée, veuillez le configurer dans les paramètres du profil.",
+      "CLICK_HERE": "Cliquez ici pour mettre à jour"
     },
     "REPLYBOX": {
       "REPLY": "Répondre",
@@ -74,13 +74,13 @@
       "TIP_FORMAT_ICON": "Afficher l'éditeur de texte enrichi",
       "TIP_EMOJI_ICON": "Montrer le sélecteur d'émoji",
       "TIP_ATTACH_ICON": "Joindre des fichiers",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "TIP_AUDIORECORDER_ICON": "Enregistrer l'audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Autoriser l'accès à l'audio",
+      "TIP_AUDIORECORDER_ERROR": "Impossible d'ouvrir l'audio",
       "ENTER_TO_SEND": "Entrer pour envoyer",
       "DRAG_DROP": "Glissez et déposez ici pour lier",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "START_AUDIO_RECORDING": "Démarrer l'enregistrement audio",
+      "STOP_AUDIO_RECORDING": "Arrêter l'enregistrement audio",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Ajouter cci",
@@ -104,8 +104,8 @@
     "MESSAGE_ERROR": "Impossible d'envoyer ce message, veuillez réessayer plus tard",
     "SENT_BY": "Envoyé par:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Impossible d'envoyer le message ! Réessayez",
+    "TRY_AGAIN": "Réessayer",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Sélectionner un agent",
       "REMOVE": "Supprimer",
@@ -143,7 +143,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Invitez les membres de votre équipe",
-      "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.",
+      "DESCRIPTION": "Puisque vous vous apprêtez à parler à votre client, amenez vos coéquipiers pour vous aider. Vous pouvez inviter vos coéquipiers en ajoutant leurs adresses e-mail à la liste des agents.",
       "NEW_LINK": "Cliquez ici pour inviter un membre de l'équipe"
     },
     "INBOXES": {
@@ -195,7 +195,7 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "De",
     "TO": "À",
     "BCC": "Cci",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index 0a493afcf..3af0dc936 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifications",
     "MARK_ALL_DONE": "Tout marquer comme terminé",
+    "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": "Chargement des notifications...",
       "404": "Aucune notification",
@@ -92,7 +99,7 @@
       "REPORTS": "Rapports",
       "CONVERSATION": "Conversation",
       "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
+      "CHANGE_TEAM": "Changer d’équipe",
       "ADD_LABEL": "Add label to the conversation",
       "REMOVE_LABEL": "Remove label from the conversation",
       "SETTINGS": "Paramètres"
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Aller au tableau de bord des conversations",
       "GO_TO_CONTACTS_DASHBOARD": "Aller au tableau de bord des contacts",
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 11269d323..2b8423999 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -49,7 +49,7 @@
         "HELP": "Pour ajouter votre profil Twitter en tant que canal, vous devez lier votre profil Twitter en cliquant sur 'Se connecter avec Twitter' ",
         "ERROR_MESSAGE": "Une erreur s'est produite lors de la connexion à Twitter, veuillez réessayer",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Créer des conversations à partir de Tweets mentionnés"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL du Webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Entrez votre URL Webhook",
           "ERROR": "Veuillez entrer une URL valide"
         },
         "CHANNEL_DOMAIN": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activer l'accueil du canal",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Envoyer un message de bienvenue aux utilisateurs lorsqu'ils démarrent la conversation.",
           "ENABLED": "Activé",
           "DISABLED": "Désactivé"
         },
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Créer une boîte de réception"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Chaîne Twilio SMS/WhatsApp",
+        "DESC": "Intégrez Twilio et commencez à soutenir vos clients par SMS ou WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "SID du compte",
           "PLACEHOLDER": "Veuillez entrer le SID de votre compte Twilio",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Nom de la boîte de réception",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Veuillez entrer un nom de boîte de réception",
           "ERROR": "Ce champ est requis"
         },
         "PHONE_NUMBER": {
@@ -136,40 +136,40 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "Canal SMS",
+        "DESC": "Commencez à soutenir vos clients par SMS.",
         "PROVIDERS": {
           "LABEL": "API Provider",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Bande passante"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Nous n'avons pas pu enregistrer le canal SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "LABEL": "ID du compte client",
+            "PLACEHOLDER": "Veuillez entrer votre ID de compte de bande passante",
             "ERROR": "Ce champ est requis"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "Clé de l'API",
+            "PLACEHOLDER": "Veuillez entrer votre clé API Bandwith",
             "ERROR": "Ce champ est requis"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "LABEL": "Secret API",
+            "PLACEHOLDER": "Veuillez entrer votre secret API Bandwith",
             "ERROR": "Ce champ est requis"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "ID de l'application",
+            "PLACEHOLDER": "Veuillez entrer votre ID d'application de bande passante",
             "ERROR": "Ce champ est requis"
           },
           "INBOX_NAME": {
             "LABEL": "Nom de la boîte de réception",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "Veuillez entrer un nom de boîte de réception",
             "ERROR": "Ce champ est requis"
           },
           "PHONE_NUMBER": {
@@ -177,27 +177,27 @@
             "PLACEHOLDER": "Veuillez entrer le numéro de téléphone à partir duquel le message sera envoyé.",
             "ERROR": "Veuillez entrer une valeur valide. Le numéro de téléphone doit commencer par le signe `+`."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Créer un canal de bande passante",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Nous n'avons pas pu authentifier les identifiants de bande passante, veuillez réessayer"
           },
           "API_CALLBACK": {
             "TITLE": "URL de rappel (callback)",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "Vous devez configurer l'URL de rappel du message en bande passante avec l'URL mentionnée ici."
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "Chaîne WhatsApp",
+        "DESC": "Commencez à soutenir vos clients via WhatsApp.",
         "PROVIDERS": {
           "LABEL": "API Provider",
           "TWILIO": "Twilio",
-          "360_DIALOG": "360Dialog"
+          "360_DIALOG": "Fenêtre de dialogue 360"
         },
         "INBOX_NAME": {
           "LABEL": "Nom de la boîte de réception",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Veuillez entrer un nom de boîte de réception",
           "ERROR": "Ce champ est requis"
         },
         "PHONE_NUMBER": {
@@ -206,11 +206,11 @@
           "ERROR": "Veuillez entrer une valeur valide. Le numéro de téléphone doit commencer par le signe `+`."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Clé de l'API",
+          "SUBTITLE": "Configurer la clé API WhatsApp.",
+          "PLACEHOLDER": "Clé de l'API",
+          "APPLY_FOR_ACCESS": "Vous n'avez pas de clé API ? Demander l'accès ici",
+          "ERROR": "Veuillez saisir une adresse de courriel valide."
         },
         "SUBMIT_BUTTON": "Créer le canal WhatsApp",
         "API": {
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Fonctionnalités",
       "DISPLAY_FILE_PICKER": "Afficher le sélecteur de fichiers sur le widget",
-      "DISPLAY_EMOJI_PICKER": "Afficher le sélecteur d'émoticônes sur le widget"
+      "DISPLAY_EMOJI_PICKER": "Afficher le sélecteur d'émoticônes sur le widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script du Widget Web",
@@ -407,8 +408,8 @@
       "AUTO_ASSIGNMENT": "Activer l'assignation automatique",
       "ENABLE_CSAT": "Activer CSAT",
       "ENABLE_CSAT_SUB_TEXT": "Activer/Désactiver l'enquête CSAT(satisfaction du client) après avoir résolu une conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Activer la continuité de la conversation par e-mail",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Les conversations se poursuivront par courrier électronique si l'adresse e-mail du contact est disponible.",
       "INBOX_UPDATE_TITLE": "Paramètres de boîtes de réception",
       "INBOX_UPDATE_SUB_TEXT": "Mettre à jour les paramètres de votre boîte de réception",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activer ou désactiver l'affectation automatique de nouvelles conversations aux agents ajoutés à cette boîte de réception.",
@@ -420,8 +421,8 @@
       "INBOX_IDENTIFIER_SUB_TEXT": "Utilisez le jeton `inbox_identifier` affiché ici pour authentifier vos clients API.",
       "FORWARD_EMAIL_TITLE": "Transférer par e-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Commencez à transférer vos courriels à l'adresse suivante.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Autoriser les messages après résolution de la conversation",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Autoriser les utilisateurs à envoyer des messages même après la résolution de la conversation."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Réautoriser",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Les formulaires précédant le chat vous permettent de saisir les informations de l'utilisateur avant qu'ils ne commencent à discuter avec vous.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Clé",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Activer le formulaire précédant le chat",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Message avant le chat",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Ce message serait visible pour les utilisateurs avec le formulaire"
       },
       "REQUIRE_EMAIL": {
@@ -463,11 +473,12 @@
         "VALIDATION_ERROR": "L'heure de début doit être avant l'heure de fermeture.",
         "CHOOSE": "Sélectionner"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "Toute la journée"
     },
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Définir vos détails IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Modifier les paramètres IMAP",
       "TOGGLE_AVAILABILITY": "Activer la configuration IMAP pour cette boîte de réception",
       "TOGGLE_HELP": "Activer IMAP aidera l'utilisateur à recevoir des emails",
@@ -476,44 +487,44 @@
         "ERROR_MESSAGE": "Impossible de mettre à jour les paramètres IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Adresse IP",
+        "PLACE_HOLDER": "Adresse (ex: imap.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Courriel",
-        "PLACE_HOLDER": "Courriel"
+      "LOGIN": {
+        "LABEL": "Se connecter",
+        "PLACE_HOLDER": "Se connecter"
       },
       "PASSWORD": {
         "LABEL": "Mot de passe",
         "PLACE_HOLDER": "Mot de passe"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Activer SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Définissez vos détails SMTP",
+      "UPDATE": "Mettre à jour les paramètres",
+      "TOGGLE_AVAILABILITY": "Activer la configuration SMTP pour cette boîte de réception",
+      "TOGGLE_HELP": "Activer SMTP aidera l'utilisateur à envoyer des e-mails",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Paramètres IMAP mis à jour avec succès",
+        "ERROR_MESSAGE": "Impossible de mettre à jour les paramètres IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Adresse IP",
+        "PLACE_HOLDER": "Adresse (ex: smtp.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Courriel",
-        "PLACE_HOLDER": "Courriel"
+      "LOGIN": {
+        "LABEL": "Se connecter",
+        "PLACE_HOLDER": "Se connecter"
       },
       "PASSWORD": {
         "LABEL": "Mot de passe",
@@ -523,10 +534,12 @@
         "LABEL": "Domaine",
         "PLACE_HOLDER": "Domaine"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Chiffrement",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Ouvrir le mode de vérification SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index ea9a35c32..a25e20b1a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Intégrations",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Annuler",
+        "DESC": "Les événements Webhook vous fournissent des informations en temps réel sur ce qui se passe dans votre compte Chatwoot. Veuillez entrer une URL valide pour configurer un 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL du Webhook",
+          "PLACEHOLDER": "Exemple : https://exemple/api/webhook",
+          "ERROR": "Veuillez entrer une URL valide"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Créer le webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configurer",
       "HEADER": "Paramètres de Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Modifier",
         "TITLE": "Modifier le webhook",
-        "CANCEL": "Annuler",
-        "DESC": "Les événements Webhook vous fournissent des informations en temps réel sur ce qui se passe dans votre compte Chatwoot. Veuillez entrer une URL valide pour configurer un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL du Webhook",
-            "PLACEHOLDER": "Exemple : https://exemple/api/webhook",
-            "ERROR": "Veuillez entrer une URL valide"
-          },
-          "SUBMIT": "Modifier le webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL du webhook mise à jour avec succès",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
         }
       },
       "ADD": {
         "CANCEL": "Annuler",
         "TITLE": "Ajouter un nouveau webhook",
-        "DESC": "Les événements Webhook vous fournissent des informations en temps réel sur ce qui se passe dans votre compte Chatwoot. Veuillez entrer une URL valide pour configurer un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL du Webhook",
-            "PLACEHOLDER": "Exemple : https://exemple/api/webhook",
-            "ERROR": "Veuillez entrer une URL valide"
-          },
-          "SUBMIT": "Créer le webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook ajouté avec succès",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmer la suppression",
-          "MESSAGE": "Êtes-vous sûr de vouloir supprimer ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Oui, supprimer ",
           "NO": "Non, conservez-le"
         }
diff --git a/app/javascript/dashboard/i18n/locale/fr/report.json b/app/javascript/dashboard/i18n/locale/fr/report.json
index 16c5f0c68..9fc345726 100644
--- a/app/javascript/dashboard/i18n/locale/fr/report.json
+++ b/app/javascript/dashboard/i18n/locale/fr/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Vue d'ensemble",
+    "HEADER": "Conversations",
     "LOADING_CHART": "Chargement des données du graphique ...",
     "NO_ENOUGH_DATA": "Nous n'avons pas reçu assez de points de données pour générer un rapport. Veuillez réessayer plus tard.",
     "DOWNLOAD_AGENT_REPORTS": "Télécharger les rapports de l'agent",
@@ -18,12 +18,16 @@
         "DESC": "(Total)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Délai de la première réponse",
-        "DESC": "(Moy.)"
+        "NAME": "First Response Time",
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de résolution",
-        "DESC": "(Moy.)"
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Nombre de résolutions",
@@ -60,58 +64,59 @@
       "CONFIRM": "Appliquer",
       "PLACEHOLDER": "Sélectionnez la plage de dates"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Par groupe",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Jour"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Jour"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Semaine"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Jour"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Semaine"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mois"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Jour"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Semaine"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Mois"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Année"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Heures de bureau"
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
+    "HEADER": "Présentation des agents",
     "LOADING_CHART": "Chargement des données du graphique ...",
     "NO_ENOUGH_DATA": "Nous n'avons pas reçu assez de points de données pour générer un rapport. Veuillez réessayer plus tard.",
     "DOWNLOAD_AGENT_REPORTS": "Télécharger les rapports de l'agent",
@@ -130,12 +135,16 @@
         "DESC": "(Total)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Délai de la première réponse",
-        "DESC": "(Moy.)"
+        "NAME": "First Response Time",
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de résolution",
-        "DESC": "(Moy.)"
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Nombre de résolutions",
@@ -174,11 +183,11 @@
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "Présentation des étiquettes",
     "LOADING_CHART": "Chargement des données du graphique ...",
     "NO_ENOUGH_DATA": "Nous n'avons pas reçu assez de points de données pour générer un rapport. Veuillez réessayer plus tard.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "Télécharger les rapports d'étiquettes",
+    "FILTER_DROPDOWN_LABEL": "Sélectionnez l'étiquette",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversations",
@@ -193,12 +202,16 @@
         "DESC": "(Total)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Délai de la première réponse",
-        "DESC": "(Moy.)"
+        "NAME": "First Response Time",
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de résolution",
-        "DESC": "(Moy.)"
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Nombre de résolutions",
@@ -237,10 +250,10 @@
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
+    "HEADER": "Présentation de la boîte de réception",
     "LOADING_CHART": "Chargement des données du graphique ...",
     "NO_ENOUGH_DATA": "Nous n'avons pas reçu assez de points de données pour générer un rapport. Veuillez réessayer plus tard.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
+    "DOWNLOAD_INBOX_REPORTS": "Télécharger les rapports de la boîte de réception",
     "FILTER_DROPDOWN_LABEL": "Sélectionner la boîte de réception",
     "METRICS": {
       "CONVERSATIONS": {
@@ -256,12 +269,16 @@
         "DESC": "(Total)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Délai de la première réponse",
-        "DESC": "(Moy.)"
+        "NAME": "First Response Time",
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de résolution",
-        "DESC": "(Moy.)"
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Nombre de résolutions",
@@ -300,11 +317,11 @@
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "Présentation de l'équipe",
     "LOADING_CHART": "Chargement des données du graphique ...",
     "NO_ENOUGH_DATA": "Nous n'avons pas reçu assez de points de données pour générer un rapport. Veuillez réessayer plus tard.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "Télécharger les rapports d'équipe",
+    "FILTER_DROPDOWN_LABEL": "Choisis une équipe",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversations",
@@ -319,12 +336,16 @@
         "DESC": "(Total)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Délai de la première réponse",
-        "DESC": "(Moy.)"
+        "NAME": "First Response Time",
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Temps de résolution",
-        "DESC": "(Moy.)"
+        "DESC": "(Moy.)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Nombre de résolutions",
@@ -367,7 +388,7 @@
     "NO_RECORDS": "Il n'y a aucune réponse à l'enquête CSAT disponible.",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "Choisissez des agents"
       }
     },
     "TABLE": {
@@ -392,5 +413,33 @@
         "TOOLTIP": "Nombre total de réponses / Nombre total de messages de l'enquête CSAT envoyés * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Vue d'ensemble",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Ouvert",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Non assigné"
+    },
+    "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": "État"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "En ligne",
+      "BUSY": "Occupé(e)",
+      "OFFLINE": "Hors-ligne"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
index 35f6d595e..294142440 100644
--- a/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/fr/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Mot de passe modifié avec succès",
       "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Envoyer"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 6d18a1b2e..f7404668d 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -4,8 +4,8 @@
     "TITLE": "Paramètres de profil",
     "BTN_TEXT": "Mettre à jour le profil",
     "DELETE_AVATAR": "Supprimer l'avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
+    "AVATAR_DELETE_SUCCESS": "L'avatar a été supprimé avec succès",
+    "AVATAR_DELETE_FAILED": "Une erreur est survenue lors de la mise à jour des préférences, veuillez réessayer",
     "UPDATE_SUCCESS": "Votre profil a été mis à jour avec succès",
     "PASSWORD_UPDATE_SUCCESS": "Votre mot de passe a été modifié avec succès",
     "AFTER_EMAIL_CHANGED": "Votre profil a été mis à jour avec succès, veuillez vous reconnecter car vos identifiants de connexion ont été modifiés",
@@ -20,16 +20,16 @@
         "NOTE": "Votre adresse de courriel est votre identité et est utilisée pour vous connecter."
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "TITLE": "Signature du message personnel",
+        "NOTE": "Créez une signature de message personnel qui serait ajoutée à tous les messages que vous envoyez depuis la plateforme. Utilisez l'éditeur de contenu riche pour créer une signature hautement personnalisée.",
+        "BTN_TEXT": "Enregistrer la signature du message",
+        "API_ERROR": "Impossible d'enregistrer la signature ! Réessayez",
+        "API_SUCCESS": "Signature enregistrée avec succès"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "LABEL": "Signature du message",
+        "ERROR": "La signature du message ne peut pas être vide",
+        "PLACEHOLDER": "Insérez ici votre signature personnelle."
       },
       "PASSWORD_SECTION": {
         "TITLE": "Mot de passe",
@@ -101,21 +101,21 @@
         "PLACEHOLDER": "Veuillez entrer le mot de passe actuel"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Nouveau mot de passe",
         "ERROR": "Veuillez entrer un mot de passe de 6 caractères ou plus",
         "PLACEHOLDER": "Veuillez entrer un nouveau mot de passe"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmer le nouveau mot de passe",
         "ERROR": "La confirmation du mot de passe doit correspondre au mot de passe",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Veuillez saisir à nouveau votre mot de passe"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Modifier",
     "CHANGE_ACCOUNTS": "Changer de compte",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "Contacter le support",
     "SELECTOR_SUBTITLE": "Sélectionnez un compte dans la liste suivante",
     "PROFILE_SETTINGS": "Paramètres de profil",
     "KEYBOARD_SHORTCUTS": "Raccourcis clavier",
@@ -124,13 +124,17 @@
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "jours d'essai restants.",
     "TRAIL_BUTTON": "Acheter Maintenant",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Utilisateur supprimé"
   },
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Copier",
       "COPY_SUCCESSFUL": "Code copié dans le presse-papier avec succès"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Télécharger",
       "UPLOADING": "Téléversement..."
@@ -146,7 +150,8 @@
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "CURRENTLY_VIEWING_ACCOUNT": "En cours de visualisation:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "Toutes les conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -164,16 +169,16 @@
     "APPLICATIONS": "Applications",
     "LABELS": "Étiquettes",
     "CUSTOM_ATTRIBUTES": "Attributs personnalisés",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "Automatisations",
     "TEAMS": "Équipes",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_FOLDER": "Dossiers",
     "CUSTOM_VIEWS_SEGMENTS": "Segments",
     "ALL_CONTACTS": "Tous les contacts",
     "TAGGED_WITH": "Tagué avec",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Vue d'ensemble",
+    "NEW_LABEL": "Nouveau libellé",
+    "NEW_TEAM": "Créer une équipe",
+    "NEW_INBOX": "Nouvelle boîte de réception",
+    "REPORTS_CONVERSATION": "Conversations",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campagnes",
     "ONGOING": "En cours",
@@ -181,9 +186,10 @@
     "REPORTS_AGENT": "Agents",
     "REPORTS_LABEL": "Étiquettes",
     "REPORTS_INBOX": "Boîte de réception",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "REPORTS_TEAM": "Équipes",
+    "SET_AVAILABILITY_TITLE": "Se définir comme",
+    "BETA": "Bêta",
+    "REPORTS_OVERVIEW": "Vue d'ensemble"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh ! Nous n'avons pas trouvé de compte Chatwoot. Veuillez créer un nouveau compte pour continuer.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/signup.json b/app/javascript/dashboard/i18n/locale/fr/signup.json
index afdd3f9ee..d17bd1e8e 100644
--- a/app/javascript/dashboard/i18n/locale/fr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/fr/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Mot de passe",
       "PLACEHOLDER": "Mot de passe",
-      "ERROR": "Le mot de passe est trop court"
+      "ERROR": "Le mot de passe est trop court",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmer le mot de passe",
diff --git a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
index b65256d14..3b2fde171 100644
--- a/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Créer une nouvelle équipe",
     "HEADER": "Équipes",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Équipes</b></p> <p>Les équipes vous permettent d'organiser vos agents en groupes en fonction de leurs responsabilités. <br /> Un utilisateur peut faire partie de plusieurs équipes. Vous pouvez assigner des conversations à une équipe lorsque vous travaillez en collaboration. </p>",
     "LIST": {
       "404": "Il n'y a aucune équipe créée sur ce compte.",
       "EDIT_TEAM": "Modifier l'équipe"
@@ -83,7 +83,7 @@
       "SELECT_ALL": "sélectionner tous les agents",
       "SELECTED_COUNT": "%{selected} agents sur %{total} sélectionnés.",
       "BUTTON_TEXT": "Ajouter des agents",
-      "AGENT_VALIDATION_ERROR": "Veuillez sélectionner au moins un agent."
+      "AGENT_VALIDATION_ERROR": "Sélectionnez au moins un agent."
     },
     "FINISH": {
       "TITLE": "Votre équipe est prête !",
diff --git a/app/javascript/dashboard/i18n/locale/he/automation.json b/app/javascript/dashboard/i18n/locale/he/automation.json
index 9c0b84e10..29c22ff66 100644
--- a/app/javascript/dashboard/i18n/locale/he/automation.json
+++ b/app/javascript/dashboard/i18n/locale/he/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "כן",
       "CANCEL_LABEL": "לא"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "מעלה...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 2e79674c9..22e54ad1d 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "אין הודעות",
     "NO_CONTENT": "אין תוכן זמין",
     "HIDE_QUOTED_TEXT": "הסתר טקסט מצוטט",
-    "SHOW_QUOTED_TEXT": "הצג טקסט מצוטט"
+    "SHOW_QUOTED_TEXT": "הצג טקסט מצוטט",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/contact.json b/app/javascript/dashboard/i18n/locale/he/contact.json
index 0a6b5b2c4..f9c9f5375 100644
--- a/app/javascript/dashboard/i18n/locale/he/contact.json
+++ b/app/javascript/dashboard/i18n/locale/he/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "אנשי הקשר נשמרו בהצלחה",
     "ERROR_MESSAGE": "היתה שגיאה, בקשה נסה שוב"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "אשר מחיקה",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "לא, השאר"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "מחק איש קשר",
     "TITLE": "מחק איש קשר",
diff --git a/app/javascript/dashboard/i18n/locale/he/generalSettings.json b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
index 681a4d8b8..dfda9965a 100644
--- a/app/javascript/dashboard/i18n/locale/he/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "התראות",
     "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": "טוען הודעות...",
       "404": "אין התראות",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index 48efaf3da..ebda8ee17 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "מאפיינים",
       "DISPLAY_FILE_PICKER": "הצג את בוחר הקבצים בווידג'ט",
-      "DISPLAY_EMOJI_PICKER": "הצג את בוחר האמוג'י בווידג'ט"
+      "DISPLAY_EMOJI_PICKER": "הצג את בוחר האמוג'י בווידג'ט",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "סקריפט מסנג'ר",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "טפסי טרום צ'אט מאפשרים לך ללכוד מידע על המשתמש לפני שהם מתחילים בשיחה איתך.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "מפתח",
+        "TYPE": "סוג",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "אפשר טופס טרום צ'אט",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "הודעת צ'אט מקדימה",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "הודעה זו תהיה גלויה למשתמשים יחד עם הטופס"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "אימייל",
-        "PLACE_HOLDER": "אימייל"
+      "LOGIN": {
+        "LABEL": "התחבר",
+        "PLACE_HOLDER": "התחבר"
       },
       "PASSWORD": {
         "LABEL": "סיסמה",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "אימייל",
-        "PLACE_HOLDER": "אימייל"
+      "LOGIN": {
+        "LABEL": "התחבר",
+        "PLACE_HOLDER": "התחבר"
       },
       "PASSWORD": {
         "LABEL": "סיסמה",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/integrations.json b/app/javascript/dashboard/i18n/locale/he/integrations.json
index 228dee5e3..9a5aea948 100644
--- a/app/javascript/dashboard/i18n/locale/he/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/he/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "אינטגרציות",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "ביטול",
+        "DESC": "אירועי Webhook מספקים לך מידע בזמן אמת על מה שקורה בחשבון Chatwoot שלך. אנא הזן כתובת אתר חוקית כדי להגדיר התקשרות חוזרת.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "דוגמה: https://example/api/webhook",
+          "ERROR": "אנא הכנס כתובת URL חוקית"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "צור webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "הגדר",
       "HEADER": "הגדרןת Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "ערוך",
         "TITLE": "ערוך webhook",
-        "CANCEL": "ביטול",
-        "DESC": "אירועי Webhook מספקים לך מידע בזמן אמת על מה שקורה בחשבון Chatwoot שלך. אנא הזן כתובת אתר חוקית כדי להגדיר התקשרות חוזרת.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "דוגמה: https://example/api/webhook",
-            "ERROR": "אנא הכנס כתובת URL חוקית"
-          },
-          "SUBMIT": "ערוך webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "כתובת האתר של Webhook עודכנה בהצלחה",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
         }
       },
       "ADD": {
         "CANCEL": "ביטול",
         "TITLE": "הוסף Webhook חדש",
-        "DESC": "אירועי Webhook מספקים לך מידע בזמן אמת על מה שקורה בחשבון Chatwoot שלך. אנא הזן כתובת אתר חוקית כדי להגדיר התקשרות חוזרת.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "דוגמה: https://example/api/webhook",
-            "ERROR": "אנא הכנס כתובת URL חוקית"
-          },
-          "SUBMIT": "צור webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook נוסף בהצלחה",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "אשר מחיקה",
-          "MESSAGE": "האם אתה בטוח שברצונך למחוק ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "כן, מחק ",
           "NO": "לא, השאר"
         }
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
index e51fde336..38f201c14 100644
--- a/app/javascript/dashboard/i18n/locale/he/report.json
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "שיחות",
     "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "שעות פעילות"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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": "פתח",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "לא הוקצתה"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "סוכן",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "מצב"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "מחובר",
+      "BUSY": "עסוק",
+      "OFFLINE": "לא מחובר"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
index 4db399a89..e8bea325e 100644
--- a/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/he/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "שינתה את הסיסמה בהצלחה",
       "ERROR_MESSAGE": "לא ניתן להתחבר לשרת Woot, נסה שוב מאוחר יותר"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "שלח"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index baa96bffa..6e3f72d45 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "הורד",
       "UPLOADING": "מעלה..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "שיחות",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "אִזְכּוּרים",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "שיחות",
     "CSAT": "CSAT",
     "CAMPAIGNS": "קמפיין",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "תיבת הדואר הנכנס",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/he/signup.json b/app/javascript/dashboard/i18n/locale/he/signup.json
index c5861a3fa..ba1e53ae3 100644
--- a/app/javascript/dashboard/i18n/locale/he/signup.json
+++ b/app/javascript/dashboard/i18n/locale/he/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "סיסמה",
       "PLACEHOLDER": "סיסמה",
-      "ERROR": "הסיסמה קצרה מדי"
+      "ERROR": "הסיסמה קצרה מדי",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "אמת סיסמה",
diff --git a/app/javascript/dashboard/i18n/locale/he/teamsSettings.json b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
index 5721c761f..f02e1ba85 100644
--- a/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/he/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "הוסף נציגים",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/hi/automation.json b/app/javascript/dashboard/i18n/locale/hi/automation.json
index 8c92467bd..5d291814e 100644
--- a/app/javascript/dashboard/i18n/locale/hi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/chatlist.json b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
index ccff2c33b..e3d637b71 100644
--- a/app/javascript/dashboard/i18n/locale/hi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
index 037f6f769..2257b4573 100644
--- a/app/javascript/dashboard/i18n/locale/hi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -70,6 +70,14 @@
     "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",
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
index 038c266be..5a0c4f7d7 100644
--- a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index f8f789d69..bda8ea1ef 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
index a54d8e9e0..774514a9d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -2,6 +2,29 @@
   "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"
+          }
+        },
+        "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",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Cancel",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "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",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Yes, Delete ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
index 84d3ff481..566099afe 100644
--- a/app/javascript/dashboard/i18n/locale/hi/report.json
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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"
+    },
+    "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"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
index 94a3fd2e1..ec2d94744 100644
--- a/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
@@ -15,6 +15,9 @@
       "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/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 1b0b65372..00a18d8ed 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Uploading..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Conversations",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/signup.json b/app/javascript/dashboard/i18n/locale/hi/signup.json
index 6eaa5d646..8dd5c0d4e 100644
--- a/app/javascript/dashboard/i18n/locale/hi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hi/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
index 8edff5699..f9ecaaaae 100644
--- a/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/hu/automation.json b/app/javascript/dashboard/i18n/locale/hu/automation.json
index a23cd8896..798d275f1 100644
--- a/app/javascript/dashboard/i18n/locale/hu/automation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Igen",
       "CANCEL_LABEL": "Nem"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Frissítés...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 56cbdf5b6..90796f7f6 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Nincs üzenet",
     "NO_CONTENT": "Nincs elérhető tartalom",
     "HIDE_QUOTED_TEXT": "Idézett szöveg eltűntetése",
-    "SHOW_QUOTED_TEXT": "Idézett szöveg megjelenítése"
+    "SHOW_QUOTED_TEXT": "Idézett szöveg megjelenítése",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
index fdd0a77b4..5866ea1c4 100644
--- a/app/javascript/dashboard/i18n/locale/hu/contact.json
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kontaktok sikeresen elmentve",
     "ERROR_MESSAGE": "Hiba történt, kérjük próbáld újra"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Törlés megerősítése",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nem, tartsa meg"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Kontakt Törlése",
     "TITLE": "Kontakt törlése",
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
index db4422689..cef03c4ba 100644
--- a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Értesítések",
     "MARK_ALL_DONE": "Mind kész",
+    "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": "Értesítések betöltése...",
       "404": "Nincs értesítés",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 9ed3c9896..27d2446ac 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Lehetőségek",
       "DISPLAY_FILE_PICKER": "File választó megjelenítése a widgeten",
-      "DISPLAY_EMOJI_PICKER": "Emoji választó megjelenítése a widgeten"
+      "DISPLAY_EMOJI_PICKER": "Emoji választó megjelenítése a widgeten",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger szkript",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "A chat előtti űrlapok lehetővé teszik hogy felhasználói adatokat gyűjts mielőtt a beszélgetés megkezdődik.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Chat előtti űrlap engedélyezése",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Chat előtti üzenet",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Ez az üzenet látható lesz a felhasználók számára az űrlappal együtt"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Bejelentkezés",
+        "PLACE_HOLDER": "Bejelentkezés"
       },
       "PASSWORD": {
         "LABEL": "Jelszó",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Bejelentkezés",
+        "PLACE_HOLDER": "Bejelentkezés"
       },
       "PASSWORD": {
         "LABEL": "Jelszó",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
index 313bf8063..3431a862d 100644
--- a/app/javascript/dashboard/i18n/locale/hu/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrációk",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Mégse",
+        "DESC": "Webhook események valós idejű információt adnak arról, hogy mi történik a Chatwoot fiókodban. Kérünk a visszahívás beállításánál egy helyes URL-t adj meg.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Például: https://példa.com/api/webhook",
+          "ERROR": "Kérjük helyes URL-t adj meg"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Webhook létrehozása"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Beállítások",
       "HEADER": "Webhook beállítások",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Szerkesztés",
         "TITLE": "Edit webhook",
-        "CANCEL": "Mégse",
-        "DESC": "Webhook események valós idejű információt adnak arról, hogy mi történik a Chatwoot fiókodban. Kérünk a visszahívás beállításánál egy helyes URL-t adj meg.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Például: https://példa.com/api/webhook",
-            "ERROR": "Kérjük helyes URL-t adj meg"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
         }
       },
       "ADD": {
         "CANCEL": "Mégse",
         "TITLE": "Új webhook hozzáadása",
-        "DESC": "Webhook események valós idejű információt adnak arról, hogy mi történik a Chatwoot fiókodban. Kérünk a visszahívás beállításánál egy helyes URL-t adj meg.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Például: https://példa.com/api/webhook",
-            "ERROR": "Kérjük helyes URL-t adj meg"
-          },
-          "SUBMIT": "Webhook létrehozása"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook sikeresen hozzáadva",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Törlés megerősítése",
-          "MESSAGE": "Biztos abban, hogy törli ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Igen, Törlés ",
           "NO": "Nem, tartsa meg"
         }
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index 387d56c12..c8862daf2 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Beszélgetések",
     "LOADING_CHART": "Táblázat adatok betöltése...",
     "NO_ENOUGH_DATA": "Nem érkezett elég adat hogy jelentést generáljunk, kérjük próbáld később.",
     "DOWNLOAD_AGENT_REPORTS": "Ügynök jelentések letöltése",
@@ -18,12 +18,16 @@
         "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Első reakció idő",
-        "DESC": "( Átlag )"
+        "NAME": "First Response Time",
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Megoldási idő",
-        "DESC": "( Átlag )"
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Megoldások száma",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Nyitvatartás"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Első reakció idő",
-        "DESC": "( Átlag )"
+        "NAME": "First Response Time",
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Megoldási idő",
-        "DESC": "( Átlag )"
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Megoldások száma",
@@ -193,12 +202,16 @@
         "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Első reakció idő",
-        "DESC": "( Átlag )"
+        "NAME": "First Response Time",
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Megoldási idő",
-        "DESC": "( Átlag )"
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Megoldások száma",
@@ -256,12 +269,16 @@
         "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Első reakció idő",
-        "DESC": "( Átlag )"
+        "NAME": "First Response Time",
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Megoldási idő",
-        "DESC": "( Átlag )"
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Megoldások száma",
@@ -319,12 +336,16 @@
         "DESC": "( Teljes )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Első reakció idő",
-        "DESC": "( Átlag )"
+        "NAME": "First Response Time",
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Megoldási idő",
-        "DESC": "( Átlag )"
+        "DESC": "( Átlag )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Megoldások száma",
@@ -392,5 +413,33 @@
         "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": "Megnyitás",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Gazdátlan"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Ügynök",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Státusz"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Foglalt",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
index 86d8293de..a213361d1 100644
--- a/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Jelszó sikeresen megváltoztatva",
       "ERROR_MESSAGE": "Nem sikerült csatlakozni a Woot szerverhez, kérjük próbáld később"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Elküldés"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 5a16813ad..7b5679c26 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Másolás",
       "COPY_SUCCESSFUL": "Vágólapra másolva"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Letöltés",
       "UPLOADING": "Feltöltés..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Beszélgetések",
     "ALL_CONVERSATIONS": "Beszélgetések",
     "MENTIONED_CONVERSATIONS": "Megemlítések",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Beszélgetések",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Fiók",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
index a9449382f..0e686c2d5 100644
--- a/app/javascript/dashboard/i18n/locale/hu/signup.json
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Jelszó",
       "PLACEHOLDER": "Jelszó",
-      "ERROR": "A jelszó túl rövid"
+      "ERROR": "A jelszó túl rövid",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Jelszó megerősítése",
diff --git a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
index 824218f6b..9ce667c15 100644
--- a/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "összes kiválasztása",
       "SELECTED_COUNT": "%{selected} a %{total}-ból kiválasztva.",
       "BUTTON_TEXT": "Ügynök Hozzádása",
-      "AGENT_VALIDATION_ERROR": "Legalább egy ügynököt válassz."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "A csapatod kész!",
diff --git a/app/javascript/dashboard/i18n/locale/id/automation.json b/app/javascript/dashboard/i18n/locale/id/automation.json
index 161028f90..a32266151 100644
--- a/app/javascript/dashboard/i18n/locale/id/automation.json
+++ b/app/javascript/dashboard/i18n/locale/id/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Ya",
       "CANCEL_LABEL": "Tidak"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Mengunggah...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index a3792dda3..e8532ec72 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Tidak Ada Pesan",
     "NO_CONTENT": "Tidak ada konten yang tersedia",
     "HIDE_QUOTED_TEXT": "Sembunyikan Teks yang Dikutip",
-    "SHOW_QUOTED_TEXT": "Tampilkan Tex yang Dikutip"
+    "SHOW_QUOTED_TEXT": "Tampilkan Tex yang Dikutip",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/contact.json b/app/javascript/dashboard/i18n/locale/id/contact.json
index 947f5e791..8f34af96a 100644
--- a/app/javascript/dashboard/i18n/locale/id/contact.json
+++ b/app/javascript/dashboard/i18n/locale/id/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kontak berhasil disimpan",
     "ERROR_MESSAGE": "Terjadi kesalahan, harap coba lagi"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Konfirmasi Penghapusan",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Tidak, Simpan"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Hapus Kontak",
     "TITLE": "Hapus kontak",
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 51f6c37db..52d7d80b7 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifikasi",
     "MARK_ALL_DONE": "Tandai Semua Selesai",
+    "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": "Memuat notifikasi...",
       "404": "Tidak Ada Notifikasi",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Menuju ke Dasbor Percakapan",
       "GO_TO_CONTACTS_DASHBOARD": "Menuju ke Dasbor Kontak",
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index 8b944cf90..b5ad68017 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Fitur",
       "DISPLAY_FILE_PICKER": "Tampilkan file picker di widget",
-      "DISPLAY_EMOJI_PICKER": "Tampilkan pilihan emoji di widget"
+      "DISPLAY_EMOJI_PICKER": "Tampilkan pilihan emoji di widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Script",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Formulir pra-obrolan memungkinkan Anda untuk menangkap informasi pengguna sebelum mereka memulai percakapan dengan Anda.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Kunci",
+        "TYPE": "Tipe",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Aktifkan formulir pra obrolan",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pesan Pra Obrolan",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Pesan ini akan terlihat oleh pengguna bersama dengan formulir"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Masuk",
+        "PLACE_HOLDER": "Masuk"
       },
       "PASSWORD": {
         "LABEL": "Kata Sandi",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Masuk",
+        "PLACE_HOLDER": "Masuk"
       },
       "PASSWORD": {
         "LABEL": "Kata Sandi",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/integrations.json b/app/javascript/dashboard/i18n/locale/id/integrations.json
index 27f11f168..4ec943b2f 100644
--- a/app/javascript/dashboard/i18n/locale/id/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/id/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrasi",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Batalkan",
+        "DESC": "Acara Webhook memberi Anda informasi realtime tentang apa yang terjadi di akun Chatwoot Anda. Harap masukkan URL yang valid untuk mengkonfigurasi 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL Webhook",
+          "PLACEHOLDER": "Contoh: https://example/api/webhook",
+          "ERROR": "Harap masukkan URL yang valid"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Tambah Webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Konfigurasi",
       "HEADER": "Pengaturan Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Batalkan",
-        "DESC": "Acara Webhook memberi Anda informasi realtime tentang apa yang terjadi di akun Chatwoot Anda. Harap masukkan URL yang valid untuk mengkonfigurasi callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL Webhook",
-            "PLACEHOLDER": "Contoh: https://example/api/webhook",
-            "ERROR": "Harap masukkan URL yang valid"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
         }
       },
       "ADD": {
         "CANCEL": "Batalkan",
         "TITLE": "Tambah webhook baru",
-        "DESC": "Acara Webhook memberi Anda informasi realtime tentang apa yang terjadi di akun Chatwoot Anda. Harap masukkan URL yang valid untuk mengkonfigurasi callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL Webhook",
-            "PLACEHOLDER": "Contoh: https://example/api/webhook",
-            "ERROR": "Harap masukkan URL yang valid"
-          },
-          "SUBMIT": "Tambah Webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook berhasil ditambahkan",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Konfirmasi Penghapusan",
-          "MESSAGE": "Apakah Anda yakin untuk menghapus ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ya, Hapus ",
           "NO": "Tidak, Simpan"
         }
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index 3eb8bcd62..fb1c86bd4 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Gambaran",
+    "HEADER": "Percakapan",
     "LOADING_CHART": "Memuat data grafik...",
     "NO_ENOUGH_DATA": "Kami belum menerima cukup data untuk membuat laporan, Silakan coba lagi nanti.",
     "DOWNLOAD_AGENT_REPORTS": "Unduh laporan agen",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Waktu respons pertama",
-        "DESC": "( Rata-Rata )"
+        "NAME": "First Response Time",
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Waktu Penyelesaian",
-        "DESC": "( Rata-Rata )"
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Jumlah Terselesaikan",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Jam Kerja"
   },
   "AGENT_REPORTS": {
     "HEADER": "Gambaran Agen",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Waktu respons pertama",
-        "DESC": "( Rata-Rata )"
+        "NAME": "First Response Time",
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Waktu Penyelesaian",
-        "DESC": "( Rata-Rata )"
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Jumlah Terselesaikan",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Waktu respons pertama",
-        "DESC": "( Rata-Rata )"
+        "NAME": "First Response Time",
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Waktu Penyelesaian",
-        "DESC": "( Rata-Rata )"
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Jumlah Terselesaikan",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Waktu respons pertama",
-        "DESC": "( Rata-Rata )"
+        "NAME": "First Response Time",
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Waktu Penyelesaian",
-        "DESC": "( Rata-Rata )"
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Jumlah Terselesaikan",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Waktu respons pertama",
-        "DESC": "( Rata-Rata )"
+        "NAME": "First Response Time",
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Waktu Penyelesaian",
-        "DESC": "( Rata-Rata )"
+        "DESC": "( Rata-Rata )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Jumlah Terselesaikan",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Total jumlah respons / Total jumlah pesan survey CSAT yang terkirim * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Gambaran",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Terbuka",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Belum ditugaskan"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Agen",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Sibuk",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
index a165864f3..b5d0bd0d7 100644
--- a/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/id/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Berhasil mengubah kata sandi",
       "ERROR_MESSAGE": "Tidak dapat terhubung ke Server Woot, Silahkan coba lagi nanti"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Kirim"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 22ac5a40e..949995c49 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Salin",
       "COPY_SUCCESSFUL": "Kode berhasil disalin ke clipboard"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Unduh",
       "UPLOADING": "Mengunggah..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Percakapan",
     "ALL_CONVERSATIONS": "Semua Percakapan",
     "MENTIONED_CONVERSATIONS": "Sebutkan",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Label baru",
     "NEW_TEAM": "Tim baru",
     "NEW_INBOX": "Katak masuk baru",
-    "REPORTS_OVERVIEW": "Gambaran",
+    "REPORTS_CONVERSATION": "Percakapan",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampanye",
     "ONGOING": "Sedang berlangsung",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Kotak masuk",
     "REPORTS_TEAM": "Tim",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Gambaran"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/id/signup.json b/app/javascript/dashboard/i18n/locale/id/signup.json
index 5f33b4e35..f4a70fb34 100644
--- a/app/javascript/dashboard/i18n/locale/id/signup.json
+++ b/app/javascript/dashboard/i18n/locale/id/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Kata Sandi",
       "PLACEHOLDER": "Kata Sandi",
-      "ERROR": "Kata sandi terlalu pendek"
+      "ERROR": "Kata sandi terlalu pendek",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Konfirmasi Kata Sandi",
diff --git a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
index 5f89d53cd..8ce2e1260 100644
--- a/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "pilih semua agen",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Tambahkan Agen",
-      "AGENT_VALIDATION_ERROR": "Pilih setidaknya satu agen."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Tim Anda siap!",
diff --git a/app/javascript/dashboard/i18n/locale/it/automation.json b/app/javascript/dashboard/i18n/locale/it/automation.json
index a02c3ecfd..a672b8d4e 100644
--- a/app/javascript/dashboard/i18n/locale/it/automation.json
+++ b/app/javascript/dashboard/i18n/locale/it/automation.json
@@ -7,7 +7,7 @@
     "ADD": {
       "TITLE": "Aggiungi regola di automazione",
       "SUBMIT": "Crea",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "FORM": {
         "NAME": {
           "LABEL": "Nome regola",
@@ -50,12 +50,12 @@
     "DELETE": {
       "TITLE": "Elimina regola di automazione",
       "SUBMIT": "Elimina",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina ",
-        "NO": "No, Conserva "
+        "NO": "No, conserva "
       },
       "API": {
         "SUCCESS_MESSAGE": "Regola di automazione eliminata con successo",
@@ -65,7 +65,7 @@
     "EDIT": {
       "TITLE": "Modifica regola di automazione",
       "SUBMIT": "Aggiorna",
-      "CANCEL_BUTTON_TEXT": "annulla",
+      "CANCEL_BUTTON_TEXT": "Annulla",
       "API": {
         "SUCCESS_MESSAGE": "Regola di automazione aggiornata con successo",
         "ERROR_MESSAGE": "Impossibile aggiornare la regola di automazione, riprova più tardi"
@@ -82,14 +82,16 @@
       "EDIT": "Modifica",
       "CREATE": "Crea",
       "DELETE": "Elimina",
-      "CANCEL": "annulla",
+      "CANCEL": "Annulla",
       "RESET_MESSAGE": "Cambiare il tipo di evento resetterà le condizioni e gli eventi che hai aggiunto di seguito"
     },
     "CONDITION": {
       "DELETE_MESSAGE": "È necessario avere almeno una condizione per salvare"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "È necessario avere almeno una azione da salvare"
+      "DELETE_MESSAGE": "È necessario avere almeno una azione da salvare",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Inserisci qui il tuo messaggio",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Seleziona i team"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Attiva regola di automazione",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Impossibile disattivare l'automazione, riprova più tardi",
       "CONFIRMATION_LABEL": "Sì",
       "CANCEL_LABEL": "No"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Impossibile caricare l'allegato, si prega di riprovare",
+      "LABEL_IDLE": "Carica allegato",
+      "LABEL_UPLOADING": "Caricamento...",
+      "LABEL_UPLOADED": "Caricato con successo",
+      "LABEL_UPLOAD_FAILED": "Caricamento fallito"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/campaign.json b/app/javascript/dashboard/i18n/locale/it/campaign.json
index 23bc31359..0253a6544 100644
--- a/app/javascript/dashboard/i18n/locale/it/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/it/campaign.json
@@ -68,7 +68,7 @@
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare?",
         "YES": "Sì, elimina ",
-        "NO": "No, Conserva "
+        "NO": "No, conserva "
       },
       "API": {
         "SUCCESS_MESSAGE": "Campagna eliminata con successo",
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index a9a9da517..a2481f110 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Nessun messaggio",
     "NO_CONTENT": "Nessun contenuto disponibile",
     "HIDE_QUOTED_TEXT": "Nascondi testo citato",
-    "SHOW_QUOTED_TEXT": "Mostra testo citato"
+    "SHOW_QUOTED_TEXT": "Mostra testo citato",
+    "MESSAGE_READ": "Leggi"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index a43070e68..5429d2d1d 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "Azienda",
     "LOCATION": "Posizione",
     "CONVERSATION_TITLE": "Dettagli conversazione",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "Visualizza profilo",
     "BROWSER": "Browser",
     "OS": "Sistema operativo",
     "INITIATED_FROM": "Iniziato da",
@@ -33,8 +33,8 @@
         "NO_RESULT": "Nessuna etichetta trovata"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "Unisci contatto",
+    "CONTACT_ACTIONS": "Azioni contatto",
     "MUTE_CONTACT": "Silenzia conversazione",
     "UNMUTE_CONTACT": "Riattiva conversazione",
     "MUTED_SUCCESS": "Questa conversazione è silenziata per 6 ore",
@@ -58,22 +58,30 @@
     "DESC": "Aggiungi informazioni di base sul contatto."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "Importa",
+    "TITLE": "Importa contatti",
+    "DESC": "Importa contatti attraverso un file CSV.",
+    "DOWNLOAD_LABEL": "Scarica un csv di esempio.",
     "FORM": {
-      "LABEL": "CSV File",
-      "SUBMIT": "Import",
+      "LABEL": "File CSV",
+      "SUBMIT": "Importa",
       "CANCEL": "Annulla"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "Contatti salvati con successo",
     "ERROR_MESSAGE": "Si è verificato un errore, riprova"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Conferma eliminazione",
+      "MESSAGE": "Sei sicuro di voler eliminare questa nota?",
+      "YES": "Sì, eliminala",
+      "NO": "No, conserva"
+    }
+  },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "Elimina contatto",
+    "TITLE": "Elimina contatto",
+    "DESC": "Elimina dettagli contatto",
     "CONFIRM": {
       "TITLE": "Conferma eliminazione",
       "MESSAGE": "Sei sicuro di voler eliminare ",
@@ -81,8 +89,8 @@
       "NO": "No, conserva"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Contatto eliminato con successo",
+      "ERROR_MESSAGE": "Impossibile eliminare il contatto. Riprova più tardi."
     }
   },
   "CONTACT_FORM": {
@@ -110,7 +118,7 @@
         "LABEL": "Numero di telefono",
         "HELP": "Il numero di telefono dovrebbe essere di formato E.164 es.: +3915555555 [+][codice nazione][codice zona][numero di telefono locale]",
         "ERROR": "Il numero di telefono deve essere vuoto o di formato E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Questo numero di telefono è in uso per un altro contatto."
       },
       "LOCATION": {
         "PLACEHOLDER": "Inserisci la posizione del contatto",
@@ -146,172 +154,172 @@
     "BUTTON_LABEL": "Avvia conversazione",
     "TITLE": "Nuova conversazione",
     "DESC": "Avvia una nuova conversazione inviando un nuovo messaggio.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "NO_INBOX": "Impossibile trovare una casella per inizializzare una nuova conversazione con questo contatto.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "A"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Casella",
+        "ERROR": "Seleziona una casella"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "Oggetto",
+        "PLACEHOLDER": "Oggetto",
+        "ERROR": "L'oggetto non può essere vuoto"
       },
       "MESSAGE": {
         "LABEL": "Messaggio",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "PLACEHOLDER": "Scrivi qui il tuo messaggio",
+        "ERROR": "Il messaggio non può essere vuoto"
       },
-      "SUBMIT": "Send message",
+      "SUBMIT": "Invia messaggio",
       "CANCEL": "Annulla",
-      "SUCCESS_MESSAGE": "Message sent!",
+      "SUCCESS_MESSAGE": "Messaggio inviato!",
       "GO_TO_CONVERSATION": "Visualizza",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "ERROR_MESSAGE": "Impossibile inviare! Riprova"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "FILTER_CONTACTS": "Filter",
+    "HEADER": "Contatti",
+    "FIELDS": "Campi di contatto",
+    "SEARCH_BUTTON": "Cerca",
+    "SEARCH_INPUT_PLACEHOLDER": "Cerca contatti",
+    "FILTER_CONTACTS": "Filtro",
     "FILTER_CONTACTS_SAVE": "Salva filtro",
     "FILTER_CONTACTS_DELETE": "Elimina filtro",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "LOADING_MESSAGE": "Caricamento contatti...",
+      "404": "Nessun contatto corrisponde alla tua ricerca 🔍",
+      "NO_CONTACTS": "Non ci sono contatti disponibili",
       "TABLE_HEADER": {
         "NAME": "Nome",
         "PHONE_NUMBER": "Numero di telefono",
         "CONVERSATIONS": "Conversazioni",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "LAST_ACTIVITY": "Ultima attività",
+        "COUNTRY": "Paese",
+        "CITY": "Città",
+        "SOCIAL_PROFILES": "Profili social",
         "COMPANY": "Azienda",
         "EMAIL_ADDRESS": "Indirizzo email"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "Visualizza dettagli"
     }
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "Contatti",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "Caricamento profilo contatto..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "Aggiungi",
+      "TITLE": "Maiusc + Invio per creare un'attività"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "Data di scadenza",
+      "LABEL_TITLE": "Imposta tipo"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "Recupero delle note...",
+    "NOT_AVAILABLE": "Non ci sono note create per questo contatto",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "Note"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "ha aggiunto una nota"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "Aggiungi",
+      "PLACEHOLDER": "Aggiungi una nota",
+      "TITLE": "Maiusc + Invio per creare una nota"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "Elimina nota"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "Attività"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_NOTES": "note",
+      "PILL_BUTTON_EVENTS": "eventi",
       "PILL_BUTTON_CONVO": "conversazioni"
     }
   },
   "CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Add attributes",
-    "BUTTON": "Add custom attribute",
-    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "ADD_BUTTON_TEXT": "Aggiungi attributi",
+    "BUTTON": "Aggiungi attributo personalizzato",
+    "NOT_AVAILABLE": "Non sono disponibili attributi personalizzati per questo contatto.",
     "COPY_SUCCESSFUL": "Copiato negli appunti con successo",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
+      "COPY": "Copia attributo",
+      "DELETE": "Elimina attributo",
       "EDIT": "Modifica attributo"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "Crea attributo personalizzato",
+      "DESC": "Aggiungi informazioni personalizzate a questo contatto."
     },
     "FORM": {
-      "CREATE": "Add attribute",
-      "CANCEL": "annulla",
+      "CREATE": "Aggiungi attributo",
+      "CANCEL": "Annulla",
       "NAME": {
-        "LABEL": "Custom attribute name",
-        "PLACEHOLDER": "Eg: shopify id",
-        "ERROR": "Invalid custom attribute name"
+        "LABEL": "Nome attributo personalizzato",
+        "PLACEHOLDER": "Es: id shopify",
+        "ERROR": "Nome dell'attributo personalizzato non valido"
       },
       "VALUE": {
-        "LABEL": "Attribute value",
-        "PLACEHOLDER": "Eg: 11901 "
+        "LABEL": "Valore attributo",
+        "PLACEHOLDER": "Es: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "Crea nuovo attributo ",
         "SUCCESS": "Attributo aggiunto con successo",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "ERROR": "Impossibile aggiungere l'attributo. Riprova più tardi"
       },
       "UPDATE": {
         "SUCCESS": "Attributo aggiornato con successo",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "ERROR": "Impossibile aggiornare l'attributo. Riprova più tardi"
       },
       "DELETE": {
         "SUCCESS": "Attributo eliminato con successo",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "ERROR": "Impossibile eliminare l'attributo. Riprova più tardi"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "TITLE": "Aggiungi attributi",
+        "PLACEHOLDER": "Cerca attributi",
+        "NO_RESULT": "Nessun attributo trovato"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Seleziona valore",
+          "SEARCH_INPUT_PLACEHOLDER": "Cerca valore",
+          "NO_RESULT": "Nessun risultato trovato"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Valore valido richiesto",
+      "INVALID_URL": "URL non valido"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "Merge contacts",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "TITLE": "Unisci contatti",
+    "DESCRIPTION": "Unisci i contatti per combinare due profili in uno, inclusi tutti gli attributi e le conversazioni. In caso di conflitto, gli attributi del contatto primario avranno la precedenza.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "Contatto primario",
+      "HELP_LABEL": "Da mantenere"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Contatto da unire",
+      "PLACEHOLDER": "Cerca un contatto",
+      "HELP_LABEL": "Da eliminare"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "TITLE": "Riepilogo",
+      "DELETE_WARNING": "Il contatto di <strong>%{childContactName}</strong> verrà eliminato.",
       "ATTRIBUTE_WARNING": "I dettagli del contatto di <strong>%{childContactName}</strong> verranno copiati in <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
@@ -319,12 +327,12 @@
     },
     "FORM": {
       "SUBMIT": " Unisci contatti",
-      "CANCEL": "annulla",
+      "CANCEL": "Annulla",
       "CHILD_CONTACT": {
         "ERROR": "Seleziona un contatto figlio da unire"
       },
       "SUCCESS_MESSAGE": "Contatto unito con successo",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "ERROR_MESSAGE": "Impossibile unire i contatti, riprova!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index 6b44f6d13..c46fa701f 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -1,40 +1,40 @@
 {
   "CONVERSATION": {
     "404": "Si prega di selezionare una conversazione dal pannello sinistro",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "L'identità di questo utente non è verificata",
     "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua casella.",
     "NO_MESSAGE_2": " per inviare un messaggio alla tua pagina!",
     "NO_INBOX_1": "Hola! Sembra che tu non abbia ancora aggiunto nessuna casella.",
     "NO_INBOX_2": " per iniziare",
     "NO_INBOX_AGENT": "Uh Oh! Sembra che tu non faccia parte di nessuna casella. Per favore contatta il tuo amministratore",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "Cerca messaggi nelle conversazioni",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "Cerca messaggi",
+      "RESULT_TITLE": "Risultati della ricerca",
+      "LOADING_MESSAGE": "Elaborazione dei dati...",
+      "PLACEHOLDER": "Digita qualsiasi testo per cercare i messaggi",
+      "NO_MATCHING_RESULTS": "Nessun risultato trovato."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Messaggi non letti",
+    "UNREAD_MESSAGE": "Messaggio non letto",
     "CLICK_HERE": "Clicca qui",
     "LOADING_INBOXES": "Caricamento casella",
     "LOADING_CONVERSATIONS": "Caricamento conversazioni",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
-    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
+    "CANNOT_REPLY": "Non puoi rispondere a causa di",
+    "24_HOURS_WINDOW": "Restrizione della finestra del messaggio a 24 ore",
+    "NOT_ASSIGNED_TO_YOU": "Questa conversazione non è assegnata. Vuoi assegnare questa conversazione a te stesso?",
+    "ASSIGN_TO_ME": "Assegna a me",
+    "TWILIO_WHATSAPP_CAN_REPLY": "È possibile rispondere a questa conversazione solo utilizzando un messaggio modello a causa di",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restrizione della finestra del messaggio a 24 ore",
+    "SELECT_A_TWEET_TO_REPLY": "Seleziona un tweet a cui rispondere.",
+    "REPLYING_TO": "Stai rispondendo a:",
+    "REMOVE_SELECTION": "Rimuovi selezione",
     "DOWNLOAD": "Scarica",
-    "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",
+    "UPLOADING_ATTACHMENTS": "Caricamento allegati...",
+    "SUCCESS_DELETE_MESSAGE": "Messaggio eliminato con successo",
+    "FAIL_DELETE_MESSSAGE": "Impossibile eliminare il messaggio! Riprova",
+    "NO_RESPONSE": "Nessuna risposta",
+    "RATING_TITLE": "Valutazione",
     "FEEDBACK_TITLE": "Feedback",
     "HEADER": {
       "RESOLVE_ACTION": "Risolvi",
@@ -43,27 +43,27 @@
       "OPEN": "Altro",
       "CLOSE": "Chiudi",
       "DETAILS": "Dettagli",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "Posticipato fino a domani",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Posticipato fino alla prossima settimana",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Posticipato fino alla prossima risposta"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Segna come in sospeso",
       "SNOOZE": {
-        "TITLE": "Snooze until",
-        "NEXT_REPLY": "Next reply",
-        "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "TITLE": "Posticipa fino a",
+        "NEXT_REPLY": "Risposta successiva",
+        "TOMORROW": "Domani",
+        "NEXT_WEEK": "Prossima settimana"
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "Firma del messaggio",
+      "ENABLE_SIGN_TOOLTIP": "Abilita firma",
+      "DISABLE_SIGN_TOOLTIP": "Disabilita firma",
       "MSG_INPUT": "MAIUSC + INVIO per la nuova linea. Inizia con '/' per selezionare una risposta predefinita.",
       "PRIVATE_MSG_INPUT": "MAIUSC + INVIO per nuova linea. Questo sarà visibile solo agli agenti",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "La firma del messaggio non è configurata, configurala nelle impostazioni del profilo.",
+      "CLICK_HERE": "Clicca qui per aggiornare"
     },
     "REPLYBOX": {
       "REPLY": "Rispondi",
@@ -71,45 +71,45 @@
       "SEND": "Invia",
       "CREATE": "Aggiungi nota",
       "TWEET": "Twitta",
-      "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",
-      "ENTER_TO_SEND": "Enter to send",
-      "DRAG_DROP": "Drag and drop here to attach",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "TIP_FORMAT_ICON": "Mostra editor di testo ricco",
+      "TIP_EMOJI_ICON": "Mostra selettore emoji",
+      "TIP_ATTACH_ICON": "Allega file",
+      "TIP_AUDIORECORDER_ICON": "Registra audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Consenti l'accesso all'audio",
+      "TIP_AUDIORECORDER_ERROR": "Impossibile aprire l'audio",
+      "ENTER_TO_SEND": "Inserisci per inviare",
+      "DRAG_DROP": "Trascina qui per allegare",
+      "START_AUDIO_RECORDING": "Avvia registrazione audio",
+      "STOP_AUDIO_RECORDING": "Interrompi registrazione audio",
       "": "",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Aggiungi bcc",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "Email separate da virgole",
+          "ERROR": "Inserisci indirizzi email validi"
         },
         "BCC": {
-          "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "LABEL": "CCN",
+          "PLACEHOLDER": "Email separate da virgole",
+          "ERROR": "Inserisci indirizzi email validi"
         }
       }
     },
     "VISIBLE_TO_AGENTS": "Nota privata: visibile solo a te e al tuo team",
     "CHANGE_STATUS": "Stato conversazione cambiato",
     "CHANGE_AGENT": "Modifica assegnatario conversazione",
-    "CHANGE_TEAM": "Conversation team changed",
-    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
-    "SENT_BY": "Sent by:",
+    "CHANGE_TEAM": "Team conversazione cambiato",
+    "FILE_SIZE_LIMIT": "Il file supera il limite di {MAXIMUM_FILE_UPLOAD_SIZE} per poter essere allegato",
+    "MESSAGE_ERROR": "Impossibile inviare questo messaggio, riprova più tardi",
+    "SENT_BY": "Inviato da:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Impossibile inviare il messaggio! Riprova",
+    "TRY_AGAIN": "riprova",
     "ASSIGNMENT": {
-      "SELECT_AGENT": "Select Agent",
+      "SELECT_AGENT": "Seleziona agente",
       "REMOVE": "Rimuovi",
-      "ASSIGN": "Assign"
+      "ASSIGN": "Assegna"
     },
     "CONTEXT_MENU": {
       "COPY": "Copia",
@@ -117,88 +117,88 @@
     }
   },
   "EMAIL_TRANSCRIPT": {
-    "TITLE": "Send conversation transcript",
-    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "TITLE": "Invia trascrizione conversazione",
+    "DESC": "Invia una copia della trascrizione della conversazione all'indirizzo email specificato",
     "SUBMIT": "Invia",
     "CANCEL": "Annulla",
-    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_SUCCESS": "La trascrizione della chat è stata inviata con successo",
     "SEND_EMAIL_ERROR": "Si è verificato un errore, riprova",
     "FORM": {
-      "SEND_TO_CONTACT": "Send the transcript to the customer",
-      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_CONTACT": "Invia la trascrizione al cliente",
+      "SEND_TO_AGENT": "Invia la trascrizione all'agente assegnato",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Invia la trascrizione a un altro indirizzo email",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "Inserisci un indirizzo email",
         "ERROR": "Inserisci un indirizzo email valido"
       }
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "Ehi 👋, Benvenuto in %{installationName}!",
+    "DESCRIPTION": "Grazie per esserti registrato. Vogliamo che tu ottenga il massimo da %{installationName}. Ecco alcune cose che puoi fare in %{installationName} per rendere l'esperienza deliziosa.",
+    "READ_LATEST_UPDATES": "Leggi gli ultimi aggiornamenti",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "Tutte le conversazioni in un unico luogo",
+      "DESCRIPTION": "Visualizza tutte le conversazioni dai tuoi clienti in una singola dashboard. È possibile filtrare le conversazioni in base al canale, all'etichetta e allo stato in arrivo."
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
-      "NEW_LINK": "Click here to invite a team member"
+      "TITLE": "Invita i membri del tuo team",
+      "DESCRIPTION": "Dal momento che siete sempre pronti a parlare con il vostro cliente, portare nei vostri compagni di squadra per assistervi. Puoi invitare i tuoi compagni di squadra aggiungendo i loro indirizzi email alla lista degli agenti.",
+      "NEW_LINK": "Clicca qui per invitare un membro del team"
     },
     "INBOXES": {
-      "TITLE": "Connect Inboxes",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
-      "NEW_LINK": "Click here to create an inbox"
+      "TITLE": "Connetti Inbox",
+      "DESCRIPTION": "Collegare vari canali attraverso i quali i vostri clienti sarebbero parlare con voi. Può essere un sito web live-chat, la tua pagina Facebook o Twitter o anche il tuo numero WhatsApp.",
+      "NEW_LINK": "Clicca qui per creare una casella di posta"
     },
     "LABELS": {
-      "TITLE": "Organize conversations with labels",
-      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
-      "NEW_LINK": "Click here to create tags"
+      "TITLE": "Organizza le conversazioni con etichette",
+      "DESCRIPTION": "Le etichette forniscono un modo più semplice per categorizzare la conversazione. Crea alcune etichette come #support-enquiry, #billing-question ecc., in modo da poterle usare in una conversazione più tardi.",
+      "NEW_LINK": "Clicca qui per creare etichette"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Agente assegnato",
+    "SELF_ASSIGN": "Assegna a me",
+    "TEAM_LABEL": "Team assegnato",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Nessuno"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONTACT_DETAILS": "Dettagli contatto",
+      "CONVERSATION_ACTIONS": "Azioni conversazione",
       "CONVERSATION_LABELS": "Etichette conversazione",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONVERSATION_INFO": "Informazioni conversazione",
+      "CONTACT_ATTRIBUTES": "Attributi contatti",
       "PREVIOUS_CONVERSATION": "Conversazioni precedenti"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Crea attributo",
     "UPDATE": {
       "SUCCESS": "Attributo aggiornato con successo",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "ERROR": "Impossibile aggiornare l'attributo. Riprova più tardi"
     },
     "ADD": {
       "TITLE": "Aggiungi",
       "SUCCESS": "Attributo aggiunto con successo",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "ERROR": "Impossibile aggiungere l'attributo. Riprova più tardi"
     },
     "DELETE": {
       "SUCCESS": "Attributo eliminato con successo",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "ERROR": "Impossibile eliminare l'attributo. Riprova più tardi"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Aggiungi attributi",
+      "PLACEHOLDER": "Cerca attributi",
+      "NO_RESULT": "Nessun attributo trovato"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
-    "BCC": "Bcc",
+    "FROM": "Da",
+    "TO": "A",
+    "BCC": "CCN",
     "CC": "Cc",
-    "SUBJECT": "Subject"
+    "SUBJECT": "Oggetto"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
index 4fb3a969d..10e048d96 100644
--- a/app/javascript/dashboard/i18n/locale/it/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifiche",
     "MARK_ALL_DONE": "Contrassegna tutto come fatto",
+    "DELETE_TITLE": "eliminato",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Notifiche non lette",
+      "ALL_NOTIFICATIONS": "Visualizza tutte le notifiche",
+      "LOADING_UNREAD_MESSAGE": "Caricamento notifiche non lette...",
+      "EMPTY_MESSAGE": "Non hai notifiche non lette"
+    },
     "LIST": {
       "LOADING_MESSAGE": "Caricamento notifiche...",
       "404": "Nessuna notifica",
@@ -89,7 +96,7 @@
     "SEARCH_PLACEHOLDER": "Cerca o salta a",
     "SECTIONS": {
       "GENERAL": "Generale",
-      "REPORTS": "Segnalazioni",
+      "REPORTS": "Rapporti",
       "CONVERSATION": "Conversazioni",
       "CHANGE_ASSIGNEE": "Cambia assegnatario",
       "CHANGE_TEAM": "Cambia Team",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Vai alla dashboard Conversazioni",
       "GO_TO_CONTACTS_DASHBOARD": "Vai alla dashboard Contatti",
       "GO_TO_REPORTS_OVERVIEW": "Vai alla panoramica dei report",
+      "GO_TO_CONVERSATION_REPORTS": "Vai ai report della conversazione",
       "GO_TO_AGENT_REPORTS": "Vai ai report degli agenti",
       "GO_TO_LABEL_REPORTS": "Vai ai report delle etichette",
       "GO_TO_INBOX_REPORTS": "Vai ai report delle caselle",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 90d4ab533..2bd15869d 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -30,11 +30,11 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "Nome casella",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "PLACEHOLDER": "Inserisci il nome della tua casella di posta (ad esempio: Acme Inc)"
       },
       "WEBSITE_NAME": {
-        "LABEL": "Website Name",
-        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        "LABEL": "Nome sito web",
+        "PLACEHOLDER": "Inserisci il nome del tuo sito web (ad esempio: Acme Inc)"
       },
       "FB": {
         "HELP": "PS: Accedendo, abbiamo accesso solo ai messaggi della tua pagina. Chatwoot, non potrà accedere ai tuoi messaggi privati.",
@@ -47,9 +47,9 @@
       },
       "TWITTER": {
         "HELP": "Per aggiungere il tuo profilo Twitter come canale, devi autenticare il tuo profilo Twitter cliccando su 'Accedi con Twitter' ",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "ERROR_MESSAGE": "Si è verificato un errore nella connessione a Twitter, riprova",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Crea conversazioni dai Tweet menzionati"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Inserisci l'URL del Webhook",
           "ERROR": "Inserisci un URL valido"
         },
         "CHANNEL_DOMAIN": {
@@ -82,16 +82,16 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Abilita messaggio di benvenuto sul canale",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Invia un messaggio di saluto agli utenti quando iniziano la conversazione.",
           "ENABLED": "Abilitato",
           "DISABLED": "Disabilitato"
         },
         "REPLY_TIME": {
-          "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "TITLE": "Imposta tempo di risposta",
+          "IN_A_FEW_MINUTES": "In pochi minuti",
+          "IN_A_FEW_HOURS": "In poche ore",
+          "IN_A_DAY": "In un giorno",
+          "HELP_TEXT": "Questo tempo di risposta verrà visualizzato sul widget della live chat"
         },
         "WIDGET_COLOR": {
           "LABEL": "Colore del widget",
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Crea casella"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Canale Twilio SMS/WhatsApp",
+        "DESC": "Integra Twilio e inizia a supportare i tuoi clienti tramite SMS o WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "SID dell'account",
           "PLACEHOLDER": "Inserisci il tuo SID Account Twilio",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Nome casella",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Inserisci un nome della casella",
           "ERROR": "Questo campo è obbligatorio"
         },
         "PHONE_NUMBER": {
@@ -136,40 +136,40 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "Canale SMS",
+        "DESC": "Inizia a supportare i tuoi clienti tramite SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Provider API",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Larghezza di banda"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
             "LABEL": "ID Account",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "PLACEHOLDER": "Inserisci l'id del tuo account di Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "Chiave API",
+            "PLACEHOLDER": "Inserisci la tua chiave di Bandwith API",
             "ERROR": "Questo campo è obbligatorio"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "LABEL": "Chiave API segreta",
+            "PLACEHOLDER": "Inserisci la tua chiave segreta di Bandwith API",
             "ERROR": "Questo campo è obbligatorio"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "ID applicazione",
+            "PLACEHOLDER": "Inserisci l'id della tua applicazione di Bandwidth",
             "ERROR": "Questo campo è obbligatorio"
           },
           "INBOX_NAME": {
             "LABEL": "Nome casella",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "Inserisci un nome della casella",
             "ERROR": "Questo campo è obbligatorio"
           },
           "PHONE_NUMBER": {
@@ -177,27 +177,27 @@
             "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
             "ERROR": "Inserisci un valore valido. Il numero di telefono dovrebbe iniziare con segno `+`."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Crea un canale Bandwidth",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Non siamo stati in grado di autenticare le credenziali di Bandwidth, riprova"
           },
           "API_CALLBACK": {
             "TITLE": "URL di callback",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "È necessario configurare l'URL di callback del messaggio in Bandwidth con l'URL menzionato qui."
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "Canale WhatsApp",
+        "DESC": "Inizia a supportare i tuoi clienti tramite WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Provider API",
           "TWILIO": "Twilio",
           "360_DIALOG": "360Dialog"
         },
         "INBOX_NAME": {
           "LABEL": "Nome casella",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Inserisci un nome della casella",
           "ERROR": "Questo campo è obbligatorio"
         },
         "PHONE_NUMBER": {
@@ -206,20 +206,20 @@
           "ERROR": "Inserisci un valore valido. Il numero di telefono dovrebbe iniziare con segno `+`."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Chiave API",
+          "SUBTITLE": "Configura la chiave API di WhatsApp.",
+          "PLACEHOLDER": "Chiave API",
+          "APPLY_FOR_ACCESS": "Non hai alcuna chiave API? Richiedi l'accesso qui",
+          "ERROR": "Inserisci un valore valido."
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "Crea un canale WhatsApp",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale WhatsApp"
         }
       },
       "API_CHANNEL": {
-        "TITLE": "API Channel",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "TITLE": "Canale API",
+        "DESC": "Integra con il canale API e inizia a supportare i tuoi clienti.",
         "CHANNEL_NAME": {
           "LABEL": "Nome canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
@@ -227,17 +227,17 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL del webhook",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configurare l'URL in cui si desidera ricevere i callback sugli eventi.",
           "PLACEHOLDER": "URL del webhook"
         },
-        "SUBMIT_BUTTON": "Create API Channel",
+        "SUBMIT_BUTTON": "Crea un canale API",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the api channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale api"
         }
       },
       "EMAIL_CHANNEL": {
-        "TITLE": "Email Channel",
-        "DESC": "Integrate you email inbox.",
+        "TITLE": "Canale email",
+        "DESC": "Integra la casella di posta in arrivo.",
         "CHANNEL_NAME": {
           "LABEL": "Nome canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
@@ -245,66 +245,66 @@
         },
         "EMAIL": {
           "LABEL": "email",
-          "SUBTITLE": "Email where your customers sends you support tickets",
+          "SUBTITLE": "Email dove i tuoi clienti ti inviano i ticket di supporto",
           "PLACEHOLDER": "email"
         },
-        "SUBMIT_BUTTON": "Create Email Channel",
+        "SUBMIT_BUTTON": "Crea un canale email",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale email"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Inizia a inoltrare le tue email al seguente indirizzo email."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "Canale LINE",
+        "DESC": "Integra con il canale LINE e inizia a supportare i tuoi clienti.",
         "CHANNEL_NAME": {
           "LABEL": "Nome canale",
           "PLACEHOLDER": "Inserisci un nome del canale",
           "ERROR": "Questo campo è obbligatorio"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "ID canale LINE",
+          "PLACEHOLDER": "ID canale LINE"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Chiave segreta canale LINE",
+          "PLACEHOLDER": "Chiave segreta canale LINE"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Token canale LINE",
+          "PLACEHOLDER": "Token canale LINE"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Crea un canale LINE",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale LINE"
         },
         "API_CALLBACK": {
           "TITLE": "URL di callback",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "SUBTITLE": "È necessario configurare l'URL del webhook nell'applicazione LINE con l'URL menzionato qui."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Canale Telegram",
+        "DESC": "Integra con il canale Telegram e inizia a supportare i tuoi clienti.",
         "BOT_TOKEN": {
-          "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
-          "PLACEHOLDER": "Bot Token"
+          "LABEL": "Token bot",
+          "SUBTITLE": "Configura il token del bot che hai ottenuto da Telegram BotFather.",
+          "PLACEHOLDER": "Token bot"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Crea canale Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "Non siamo stati in grado di salvare il canale telegram"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "Scegli un canale",
+        "DESC": "Chatwoot supporta il widget chat live, pagina Facebook, profilo Twitter, WhatsApp, Email ecc., come canali. Se si desidera costruire un canale personalizzato, è possibile crearlo utilizzando il canale API. Selezionare un canale dalle opzioni sottostanti per procedere."
       },
       "AGENTS": {
         "TITLE": "Agenti",
         "DESC": "Qui puoi aggiungere agenti per gestire la tua casella appena creata. Solo questi agenti selezionati avranno accesso alla tua casella. Gli operatori che non fanno parte di questa casella non saranno in grado di vedere o rispondere ai messaggi in questa casella quando effettuano il login. <br> <b>PS:</b> come amministratore, se hai bisogno di accedere a tutte le caselle, dovresti aggiungerti come agente a tutte le caselle che crei.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "VALIDATION_ERROR": "Aggiungi almeno un agente alla tua nuova casella",
+        "PICK_AGENTS": "Scegli gli agenti per la casella"
       },
       "DETAILS": {
         "TITLE": "Dettagli casella",
@@ -330,7 +330,7 @@
       "TITLE": "La casella è pronta!",
       "MESSAGE": "Ora puoi interagire con i tuoi clienti attraverso il nuovo canale. Buona assistenza ",
       "BUTTON_TEXT": "Portami lì",
-      "MORE_SETTINGS": "More settings",
+      "MORE_SETTINGS": "Altre impostazioni",
       "WEBSITE_SUCCESS": "Hai completato la creazione di un canale sito web. Copia il codice mostrato qui sotto e incollalo sul tuo sito. La prossima volta che un cliente usa la live chat, la conversazione apparirà automaticamente nella tua casella."
     },
     "REAUTH": "Riautorizza",
@@ -362,39 +362,40 @@
         "DISABLED": "Disabilitato"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Abilita"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Elimina",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Elimina avatar",
       "CONFIRM": {
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "Digita {inboxName} per confermare",
         "YES": "Sì, elimina ",
         "NO": "No, conserva "
       },
       "API": {
         "SUCCESS_MESSAGE": "Casella eliminata con successo",
         "ERROR_MESSAGE": "Impossibile eliminare la casella. Riprova più tardi.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "Avatar casella eliminata con successo",
+        "AVATAR_ERROR_MESSAGE": "Impossibile eliminare l'avatar della casella. Riprova più tardi."
       }
     },
     "TABS": {
       "SETTINGS": "Impostazioni",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
+      "COLLABORATORS": "Collaboratori",
+      "CONFIGURATION": "Configurazione",
       "CAMPAIGN": "Campagne",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "PRE_CHAT_FORM": "Modulo pre-chat",
+      "BUSINESS_HOURS": "Ore di lavoro"
     },
     "SETTINGS": "Impostazioni",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "Funzionalità",
+      "DISPLAY_FILE_PICKER": "Visualizza il selettore di file sul widget",
+      "DISPLAY_EMOJI_PICKER": "Visualizza il selettore emoji sul widget",
+      "ALLOW_END_CONVERSATION": "Consenti agli utenti di terminare la conversazione dal widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script Messenger",
@@ -402,118 +403,128 @@
       "INBOX_AGENTS": "Agenti",
       "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi agenti da questa casella",
       "UPDATE": "Aggiorna",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX": "Abilita casella di raccolta email",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Abilita o disabilita la casella di raccolta email nella nuova conversazione",
       "AUTO_ASSIGNMENT": "Abilita assegnazione automatica",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CSAT": "Abilita CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Attiva/Disabilita il sondaggio CSAT (soddisfazione del cliente) dopo aver risolto una conversazione",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Abilita la continuità della conversazione via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Le conversazioni continueranno via email se l'indirizzo email del contatto è disponibile.",
       "INBOX_UPDATE_TITLE": "Impostazioni della casella",
       "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni della casella",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Abilita o disabilita l'assegnazione automatica di nuove conversazioni agli agenti aggiunti a questa casella.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "HMAC_VERIFICATION": "Convalida identità utente",
+      "HMAC_DESCRIPTION": "Inorder to validate the user identity, the SDK allows you to pass an `identifier_hash` for each user. Puoi generare HMAC usando 'sha256' con la chiave mostrata qui.",
+      "HMAC_MANDATORY_VERIFICATION": "Forza la convalida identità utente",
+      "HMAC_MANDATORY_DESCRIPTION": "Se abilitato, il metodo setUser di Chatwoot SDKs non funzionerà a meno che il file `identifier_hash` non sia fornito per ogni utente.",
+      "INBOX_IDENTIFIER": "Identificatore casella",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Usa il token `inbox_identifier` mostrato qui per l'autenticazione dei tuoi client API.",
+      "FORWARD_EMAIL_TITLE": "Inoltra all'email",
+      "FORWARD_EMAIL_SUB_TEXT": "Inizia a inoltrare le tue email al seguente indirizzo email.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Consenti messaggi dopo la risoluzione della conversazione",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Consenti agli utenti finali di inviare messaggi anche dopo la risoluzione della conversazione."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Riautorizza",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
+      "SUBTITLE": "La tua connessione a Facebook è scaduta, ricollegati alla tua pagina Facebook per continuare i servizi",
+      "MESSAGE_SUCCESS": "Riconnessione riuscita",
       "MESSAGE_ERROR": "Si è verificato un errore, riprova"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "I moduli di chat predefiniti consentono di acquisire le informazioni dell'utente prima di iniziare la conversazione con te.",
+      "SET_FIELDS": "Campi del modulo Pre chat",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Campi",
+        "LABEL": "Etichetta",
+        "PLACE_HOLDER": "Segnaposto",
+        "KEY": "Chiave",
+        "TYPE": "Tipo",
+        "REQUIRED": "Obbligatorio"
+      },
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Abilita il modulo pre chat",
         "OPTIONS": {
-          "ENABLED": "Yes",
+          "ENABLED": "Sì",
           "DISABLED": "No"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Messaggio pre chat",
+        "PLACEHOLDER": "Questo messaggio sarebbe visibile agli utenti insieme al modulo"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "I visitatori devono fornire il proprio nome e indirizzo email prima di iniziare la 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.",
+      "TITLE": "Imposta la tua disponibilità",
+      "SUBTITLE": "Imposta la tua disponibilità sul tuo widget live chat",
+      "WEEKLY_TITLE": "Imposta le ore settimanali",
+      "TIMEZONE_LABEL": "Seleziona fuso orario",
+      "UPDATE": "Aggiorna le impostazioni dell'orario di lavoro",
+      "TOGGLE_AVAILABILITY": "Abilita la disponibilità aziendale per questa casella",
+      "UNAVAILABLE_MESSAGE_LABEL": "Messaggio non disponibile per i visitatori",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Non siamo disponibili al momento. Lascia un messaggio che risponderemo una volta tornati.",
+      "TOGGLE_HELP": "Abilitare la disponibilità aziendale mostrerà le ore disponibili sul widget chat live anche se tutti gli agenti sono offline. Al di fuori delle ore disponibili visori possono essere avvisati con un messaggio e un modulo di pre-chat.",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
-        "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "ENABLE": "Abilita disponibilità per questo giorno",
+        "UNAVAILABLE": "Non disponibile",
+        "HOURS": "ore",
+        "VALIDATION_ERROR": "L'orario di inizio deve essere prima dell'orario di chiusura.",
+        "CHOOSE": "Scegli"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "Tutti i giorni"
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Imposta i dettagli IMAP",
+      "NOTE_TEXT": "Per abilitare SMTP, configurare IMAP.",
+      "UPDATE": "Aggiorna impostazioni IMAP",
+      "TOGGLE_AVAILABILITY": "Abilita la configurazione IMAP per questa casella",
+      "TOGGLE_HELP": "Abilitare IMAP aiuterà l'utente a ricevere email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Impostazioni IMAP aggiornate con successo",
+        "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Indirizzo",
+        "PLACE_HOLDER": "Indirizzo (ad esempio: imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Porta",
+        "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Accedi",
+        "PLACE_HOLDER": "Accedi"
       },
       "PASSWORD": {
         "LABEL": "Password",
         "PLACE_HOLDER": "Password"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Abilita SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Imposta i dettagli SMTP",
+      "UPDATE": "Aggiorna impostazioni SMTP",
+      "TOGGLE_AVAILABILITY": "Abilita la configurazione SMTP per questa casella",
+      "TOGGLE_HELP": "Abilitare SMTP aiuterà l'utente a inviare email",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Impostazioni SMTP aggiornate con successo",
+        "ERROR_MESSAGE": "Impossibile aggiornare le impostazioni SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Indirizzo",
+        "PLACE_HOLDER": "Indirizzo (ad esempio: smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Porta",
+        "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Accedi",
+        "PLACE_HOLDER": "Accedi"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -523,10 +534,12 @@
         "LABEL": "Dominio",
         "PLACE_HOLDER": "Dominio"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Cifratura",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Apri modalità di verifica SSL",
+      "AUTH_MECHANISM": "Autenticazione"
+    },
+    "NOTE": "Nota: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index c19484260..81c1f3554 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrazioni",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Eventi iscritti",
+      "FORM": {
+        "CANCEL": "annulla",
+        "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Eventi",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Conversazione creata",
+            "CONVERSATION_STATUS_CHANGED": "Stato conversazione cambiato",
+            "CONVERSATION_UPDATED": "Conversazione aggiornata",
+            "MESSAGE_CREATED": "Messaggio creato",
+            "MESSAGE_UPDATED": "Messaggio aggiornato",
+            "WEBWIDGET_TRIGGERED": "Widget live chat aperto dall'utente"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL del webhook",
+          "PLACEHOLDER": "Esempio: https://example/api/webhook",
+          "ERROR": "Inserisci un URL valido"
+        },
+        "EDIT_SUBMIT": "Aggiorna webhook",
+        "ADD_SUBMIT": "Crea webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configura",
       "HEADER": "Impostazioni Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Modifica",
         "TITLE": "Modifica webhook",
-        "CANCEL": "Annulla",
-        "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL del webhook",
-            "PLACEHOLDER": "Esempio: https://example/api/webhook",
-            "ERROR": "Inserisci un URL valido"
-          },
-          "SUBMIT": "Modifica webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL Webhook aggiornato con successo",
+          "SUCCESS_MESSAGE": "Configurazione Webhook aggiornata correttamente",
           "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
         }
       },
       "ADD": {
         "CANCEL": "Annulla",
         "TITLE": "Aggiungi nuovo webhook",
-        "DESC": "Gli eventi Webhook ti forniscono le informazioni in tempo reale su ciò che sta accadendo nel tuo account Chatwoot. Per favore inserisci un URL valido per configurare un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL del webhook",
-            "PLACEHOLDER": "Esempio: https://example/api/webhook",
-            "ERROR": "Inserisci un URL valido"
-          },
-          "SUBMIT": "Crea webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook aggiunto correttamente",
+          "SUCCESS_MESSAGE": "Configurazione Webhook aggiunta correttamente",
           "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Conferma eliminazione",
-          "MESSAGE": "Sei sicuro di voler eliminare ",
+          "MESSAGE": "Sei sicuro di voler eliminare il webhook? (%{webhookURL})",
           "YES": "Sì, elimina ",
           "NO": "No, conserva"
         }
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index cdd4c1107..10700fed8 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Panoramica",
+    "HEADER": "Conversazioni",
     "LOADING_CHART": "Caricamento dati del grafico...",
     "NO_ENOUGH_DATA": "Non abbiamo ricevuto abbastanza punti dati per generare il rapporto, riprova più tardi.",
     "DOWNLOAD_AGENT_REPORTS": "Scarica rapporti agente",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di prima risposta è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo di risoluzione",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di risoluzione è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Anno"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Ore di lavoro"
   },
   "AGENT_REPORTS": {
     "HEADER": "Panoramica degli agenti",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di prima risposta è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo di risoluzione",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di risoluzione è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di prima risposta è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo di risoluzione",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di risoluzione è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di prima risposta è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo di risoluzione",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di risoluzione è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Tempo di prima risposta",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di prima risposta è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo di risoluzione",
-        "DESC": "( Media )"
+        "DESC": "( Media )",
+        "INFO_TEXT": "Numero totale di conversazioni utilizzate per il calcolo:",
+        "TOOLTIP_TEXT": "Il tempo di risoluzione è %{metricValue} (basato su %{conversationCount} conversazioni)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Conteggio risoluzioni",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Numero totale di risposte / Numero totale di messaggi di sondaggio CSAT inviati * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Panoramica",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Conversazioni aperte",
+      "LOADING_MESSAGE": "Caricamento metriche conversazioni...",
+      "OPEN": "Aperte",
+      "UNATTENDED": "Non partecipate",
+      "UNASSIGNED": "Non assegnato"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversazioni degli agenti",
+      "LOADING_MESSAGE": "Caricamento metriche agenti...",
+      "NO_AGENTS": "Non ci sono conversazioni da parte degli agenti",
+      "TABLE_HEADER": {
+        "AGENT": "Agente",
+        "OPEN": "APERTE",
+        "UNATTENDED": "Non partecipate",
+        "STATUS": "Stato"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Stato agente",
+      "ONLINE": "Online",
+      "BUSY": "Occupato",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
index 79fe453b5..50cbee401 100644
--- a/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/it/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Password cambiata con successo",
       "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
     },
+    "CAPTCHA": {
+      "ERROR": "Verifica scaduta. Si prega di risolvere nuovamente il captcha."
+    },
     "SUBMIT": "Invia"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 30359d86b..c62452a6d 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copia",
       "COPY_SUCCESSFUL": "Codice copiato negli appunti correttamente"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Mostra di più",
+      "SHOW_LESS": "Mostra meno"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Scarica",
       "UPLOADING": "Caricamento..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizzazione attuale:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversazioni",
     "ALL_CONVERSATIONS": "Tutte le conversazioni",
     "MENTIONED_CONVERSATIONS": "Menzioni",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Nuova etichetta",
     "NEW_TEAM": "Nuovo team",
     "NEW_INBOX": "Nuova casella di posta",
-    "REPORTS_OVERVIEW": "Panoramica",
+    "REPORTS_CONVERSATION": "Conversazioni",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campagne",
     "ONGOING": "In corso",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Posta",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Imposta te stesso come",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Panoramica"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Non abbiamo trovato alcun account Chatwoot. Si prega di creare un nuovo account per continuare.",
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
index 5ea4e06db..41df2ff62 100644
--- a/app/javascript/dashboard/i18n/locale/it/signup.json
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password troppo corta"
+      "ERROR": "Password troppo corta",
+      "IS_INVALID_PASSWORD": "La password dovrebbe contenere almeno 1 lettera maiuscola, 1 lettera minuscola, 1 numero e 1 carattere speciale"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Conferma password",
diff --git a/app/javascript/dashboard/i18n/locale/ja/automation.json b/app/javascript/dashboard/i18n/locale/ja/automation.json
index 0044ba81f..77f4bcecc 100644
--- a/app/javascript/dashboard/i18n/locale/ja/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "アップロード中...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
index 5c349cf8b..064d52376 100644
--- a/app/javascript/dashboard/i18n/locale/ja/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index 948e10d7b..f2579e780 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "エラーが発生しました。もう一度お試しください。"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "削除の確認",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "いいえ、保存しておきます"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
index 6e2fabe72..69d9515f1 100644
--- a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 85f42bf24..55d1537b9 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "機能",
       "DISPLAY_FILE_PICKER": "ウィジェットにファイルピッカーを表示する",
-      "DISPLAY_EMOJI_PICKER": "ウィジェットに絵文字ピッカーを表示する"
+      "DISPLAY_EMOJI_PICKER": "ウィジェットに絵文字ピッカーを表示する",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messengerスクリプト",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Eメール",
-        "PLACE_HOLDER": "Eメール"
+      "LOGIN": {
+        "LABEL": "ログイン",
+        "PLACE_HOLDER": "ログイン"
       },
       "PASSWORD": {
         "LABEL": "パスワード",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Eメール",
-        "PLACE_HOLDER": "Eメール"
+      "LOGIN": {
+        "LABEL": "ログイン",
+        "PLACE_HOLDER": "ログイン"
       },
       "PASSWORD": {
         "LABEL": "パスワード",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
index 144fcb5dc..c801e5866 100644
--- a/app/javascript/dashboard/i18n/locale/ja/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "連携",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "キャンセル",
+        "DESC": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。コールバックを設定するには有効なURLを入力してください。",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "例: https://example/api/webhook",
+          "ERROR": "有効な URL を入力してください"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Webhookを作成"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "設定",
       "HEADER": "Webhookの設定",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "編集",
         "TITLE": "Edit webhook",
-        "CANCEL": "キャンセル",
-        "DESC": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。コールバックを設定するには有効なURLを入力してください。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "例: https://example/api/webhook",
-            "ERROR": "有効な URL を入力してください"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
         }
       },
       "ADD": {
         "CANCEL": "キャンセル",
         "TITLE": "新しいWebhookを追加",
-        "DESC": "Webhookイベントは、Chatwootアカウントで何が起こっているかについてのリアルタイムの情報を提供します。コールバックを設定するには有効なURLを入力してください。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "例: https://example/api/webhook",
-            "ERROR": "有効な URL を入力してください"
-          },
-          "SUBMIT": "Webhookを作成"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhookの追加に成功しました",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "削除の確認",
-          "MESSAGE": "削除してもよろしいですか？ ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "削除する ",
           "NO": "いいえ、保存しておきます"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index d727a47a1..b681e94d1 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "会話データ",
     "LOADING_CHART": "グラフデータを読み込んでいます...",
     "NO_ENOUGH_DATA": "レポートを生成するための十分なデータポイントを受信していません。後でもう一度お試しください。",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
@@ -18,12 +18,16 @@
         "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "最初の応答時間",
-        "DESC": "(平均)"
+        "NAME": "First Response Time",
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "処理時間",
-        "DESC": "(平均)"
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "処理件数",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "最初の応答時間",
-        "DESC": "(平均)"
+        "NAME": "First Response Time",
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "処理時間",
-        "DESC": "(平均)"
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "処理件数",
@@ -193,12 +202,16 @@
         "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "最初の応答時間",
-        "DESC": "(平均)"
+        "NAME": "First Response Time",
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "処理時間",
-        "DESC": "(平均)"
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "処理件数",
@@ -256,12 +269,16 @@
         "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "最初の応答時間",
-        "DESC": "(平均)"
+        "NAME": "First Response Time",
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "処理時間",
-        "DESC": "(平均)"
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "処理件数",
@@ -319,12 +336,16 @@
         "DESC": "(合計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "最初の応答時間",
-        "DESC": "(平均)"
+        "NAME": "First Response Time",
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "処理時間",
-        "DESC": "(平均)"
+        "DESC": "(平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "処理件数",
@@ -392,5 +413,33 @@
         "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": "開く",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "未割当"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "担当者",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "状況"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "オンライン",
+      "BUSY": "取り込み中",
+      "OFFLINE": "オフライン"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
index d58e41027..79fff432a 100644
--- a/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "パスワードは正常に変更されました",
       "ERROR_MESSAGE": "Woot Serverに接続できませんでした。後でもう一度お試しください。"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "送信"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index 6fb944a11..f0832d167 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "コピー",
       "COPY_SUCCESSFUL": "コードが正常にクリップボードにコピーされました"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "ダウンロード",
       "UPLOADING": "アップロード中..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "会話データ",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "会話データ",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
index 534ad5e98..987b6120a 100644
--- a/app/javascript/dashboard/i18n/locale/ja/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "パスワード",
       "PLACEHOLDER": "パスワード",
-      "ERROR": "パスワードが短すぎます"
+      "ERROR": "パスワードが短すぎます",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "パスワードの確認",
diff --git a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
index 5ad65ce5c..f89e38cdf 100644
--- a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "担当者を追加",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/ko/automation.json b/app/javascript/dashboard/i18n/locale/ko/automation.json
index d493d7eff..8d3fae668 100644
--- a/app/javascript/dashboard/i18n/locale/ko/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "예",
       "CANCEL_LABEL": "아니오"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "업로드 중...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/chatlist.json b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
index 9fe0b3a55..cec1fc991 100644
--- a/app/javascript/dashboard/i18n/locale/ko/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "메시지 없음",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
index 94e316b4c..3c2ac7cab 100644
--- a/app/javascript/dashboard/i18n/locale/ko/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "오류가 발생했습니다. 다시 시도하십시오."
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "삭제 확인",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "아니요, 유지합니다."
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
index 08855f581..5e6cf4dc0 100644
--- a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "알림",
     "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": "알림을 불러오는 중...",
       "404": "알림 없음",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index a5cf60d3b..76f0dee06 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "특징",
       "DISPLAY_FILE_PICKER": "위젯에 파일 선택기 표시",
-      "DISPLAY_EMOJI_PICKER": "위젯에 이모지 선택기 표시"
+      "DISPLAY_EMOJI_PICKER": "위젯에 이모지 선택기 표시",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "메신저 스크립트",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "대화 전 설문을 통해, 실제 대화 전에 사용자 정보를 확보할 수 있습니다.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "대화 전 설문 사용하기",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "대화 전 설문용 메시지",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "이 메시지가 대화전 설문과 함께 사용자에게 보여집니다."
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "이메일",
-        "PLACE_HOLDER": "이메일"
+      "LOGIN": {
+        "LABEL": "로그인",
+        "PLACE_HOLDER": "로그인"
       },
       "PASSWORD": {
         "LABEL": "비밀번호",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "이메일",
-        "PLACE_HOLDER": "이메일"
+      "LOGIN": {
+        "LABEL": "로그인",
+        "PLACE_HOLDER": "로그인"
       },
       "PASSWORD": {
         "LABEL": "비밀번호",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
index 572084d5f..cf81529ab 100644
--- a/app/javascript/dashboard/i18n/locale/ko/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "통합",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "취소",
+        "DESC": "웹훅 이벤트는 Chatwoot 계정에서 일어나는 일에 대한 실시간 정보를 제공합니다. 콜백을 구성하려면 유효한 URL을 입력하십시오.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "웹훅 URL",
+          "PLACEHOLDER": "예시: https://example/api/webhook",
+          "ERROR": "올바른 URL을 입력하십시오."
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "웹훅 만들기"
+      },
       "TITLE": "웹훅",
       "CONFIGURE": "구성",
       "HEADER": "웹훅 설정",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "수정",
         "TITLE": "Edit webhook",
-        "CANCEL": "취소",
-        "DESC": "웹훅 이벤트는 Chatwoot 계정에서 일어나는 일에 대한 실시간 정보를 제공합니다. 콜백을 구성하려면 유효한 URL을 입력하십시오.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "웹훅 URL",
-            "PLACEHOLDER": "예시: https://example/api/webhook",
-            "ERROR": "올바른 URL을 입력하십시오."
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
         }
       },
       "ADD": {
         "CANCEL": "취소",
         "TITLE": "새 웹훅 추가",
-        "DESC": "웹훅 이벤트는 Chatwoot 계정에서 일어나는 일에 대한 실시간 정보를 제공합니다. 콜백을 구성하려면 유효한 URL을 입력하십시오.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "웹훅 URL",
-            "PLACEHOLDER": "예시: https://example/api/webhook",
-            "ERROR": "올바른 URL을 입력하십시오."
-          },
-          "SUBMIT": "웹훅 만들기"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "웹훅이 성공적으로 추가됨",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "삭제 확인",
-          "MESSAGE": "삭제하시겠습니까? ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "예, 삭제합니다. ",
           "NO": "아니요, 유지합니다."
         }
diff --git a/app/javascript/dashboard/i18n/locale/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
index 42330c81e..d0f3e1679 100644
--- a/app/javascript/dashboard/i18n/locale/ko/report.json
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "대화",
     "LOADING_CHART": "차트 데이터 불러오는 중...",
     "NO_ENOUGH_DATA": "보고서를 생성할 수 있는 데이터 포인트가 부족합니다. 나중에 다시 시도하십시오.",
     "DOWNLOAD_AGENT_REPORTS": "다운로드 에이전트 보고서",
@@ -18,12 +18,16 @@
         "DESC": "( 총 )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "첫 번째 응답 시간",
-        "DESC": "( 평균 )"
+        "NAME": "First Response Time",
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "해결 시간",
-        "DESC": "( 평균 )"
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "해결 수",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "영업시간"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( 총 )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "첫 번째 응답 시간",
-        "DESC": "( 평균 )"
+        "NAME": "First Response Time",
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "해결 시간",
-        "DESC": "( 평균 )"
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "해결 수",
@@ -193,12 +202,16 @@
         "DESC": "( 총 )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "첫 번째 응답 시간",
-        "DESC": "( 평균 )"
+        "NAME": "First Response Time",
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "해결 시간",
-        "DESC": "( 평균 )"
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "해결 수",
@@ -256,12 +269,16 @@
         "DESC": "( 총 )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "첫 번째 응답 시간",
-        "DESC": "( 평균 )"
+        "NAME": "First Response Time",
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "해결 시간",
-        "DESC": "( 평균 )"
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "해결 수",
@@ -319,12 +336,16 @@
         "DESC": "( 총 )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "첫 번째 응답 시간",
-        "DESC": "( 평균 )"
+        "NAME": "First Response Time",
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "해결 시간",
-        "DESC": "( 평균 )"
+        "DESC": "( 평균 )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "해결 수",
@@ -392,5 +413,33 @@
         "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": "열기",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "지정되지 않음"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "에이전트",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "상태"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "온라인",
+      "BUSY": "바쁨",
+      "OFFLINE": "오프라인"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
index 3c66f896f..272774422 100644
--- a/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "비밀번호 변경 성공",
       "ERROR_MESSAGE": "Woot 서버에 연결할 수 없음. 나중에 다시 시도하십시오."
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "보내기"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index 272aa63cf..aa9bd2487 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "복사",
       "COPY_SUCCESSFUL": "코드가 클립보드에 복사됨"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "다운로드",
       "UPLOADING": "업로드 중..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "대화",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "대화",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json
index 8a3a86dd3..f8f939f54 100644
--- a/app/javascript/dashboard/i18n/locale/ko/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ko/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "비밀번호",
       "PLACEHOLDER": "비밀번호",
-      "ERROR": "비밀번호가 너무 짧음"
+      "ERROR": "비밀번호가 너무 짧음",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "비밀번호 확인",
diff --git a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
index 05a9d045a..ad5991ca9 100644
--- a/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "모든 에이전트 선택",
       "SELECTED_COUNT": "%{total} 에이전트 중 %{selected} 선택됨.",
       "BUTTON_TEXT": "에이전트 추가",
-      "AGENT_VALIDATION_ERROR": "최소 1명의 에이전트를 선택하세요."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "준비가 완료되었습니다!",
diff --git a/app/javascript/dashboard/i18n/locale/lv/automation.json b/app/javascript/dashboard/i18n/locale/lv/automation.json
index 8c92467bd..5d291814e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/automation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/chatlist.json b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
index ccff2c33b..e3d637b71 100644
--- a/app/javascript/dashboard/i18n/locale/lv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/contact.json b/app/javascript/dashboard/i18n/locale/lv/contact.json
index 037f6f769..2257b4573 100644
--- a/app/javascript/dashboard/i18n/locale/lv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/lv/contact.json
@@ -70,6 +70,14 @@
     "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",
diff --git a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
index 038c266be..5a0c4f7d7 100644
--- a/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index f8f789d69..bda8ea1ef 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/lv/integrations.json b/app/javascript/dashboard/i18n/locale/lv/integrations.json
index a54d8e9e0..774514a9d 100644
--- a/app/javascript/dashboard/i18n/locale/lv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/lv/integrations.json
@@ -2,6 +2,29 @@
   "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"
+          }
+        },
+        "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",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Cancel",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "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",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Yes, Delete ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index 84d3ff481..566099afe 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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"
+    },
+    "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"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
index 94a3fd2e1..ec2d94744 100644
--- a/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/lv/setNewPassword.json
@@ -15,6 +15,9 @@
       "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/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 1b0b65372..00a18d8ed 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Uploading..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Conversations",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/signup.json b/app/javascript/dashboard/i18n/locale/lv/signup.json
index 6eaa5d646..8dd5c0d4e 100644
--- a/app/javascript/dashboard/i18n/locale/lv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/lv/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
index 8edff5699..f9ecaaaae 100644
--- a/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/ml/automation.json b/app/javascript/dashboard/i18n/locale/ml/automation.json
index 547000898..1b4534a50 100644
--- a/app/javascript/dashboard/i18n/locale/ml/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "അപ്‌ലോഡുചെയ്യുന്നു...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/chatlist.json b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
index 308b7cba6..538f108a2 100644
--- a/app/javascript/dashboard/i18n/locale/ml/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "സന്ദേശങ്ങളൊന്നുമില്ല",
     "NO_CONTENT": "ഉള്ളടക്കമൊന്നും ലഭ്യമല്ല",
     "HIDE_QUOTED_TEXT": "ഉദ്ധരിച്ച വാചകം മറയ്ക്കുക",
-    "SHOW_QUOTED_TEXT": "ഉദ്ധരിച്ച വാചകം കാണിക്കുക"
+    "SHOW_QUOTED_TEXT": "ഉദ്ധരിച്ച വാചകം കാണിക്കുക",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 9bc19d9f3..1ea1f75ee 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "കോൺടാക്റ്റുകൾ വിജയകരമായി സേവ് ചെയ്തിരിക്കുന്നു",
     "ERROR_MESSAGE": "ഒരു പിശക് ഉണ്ടായിരുന്നു, ദയവായി വീണ്ടും ശ്രമിക്കുക"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "കോൺടാക്റ്റ് ഇല്ലാതാക്കുക",
     "TITLE": "കോൺടാക്റ്റ് ഇല്ലാതാക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index a58675756..d740155ca 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 522e69b87..2b2348830 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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": "മെസഞ്ചർ സ്ക്രിപ്റ്റ്",
@@ -431,6 +432,15 @@
     },
     "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": "കീ",
+        "TYPE": "തരം",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Enable pre chat form",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "ഇമെയിൽ",
-        "PLACE_HOLDER": "ഇമെയിൽ"
+      "LOGIN": {
+        "LABEL": "സൈൻ ഇൻ",
+        "PLACE_HOLDER": "സൈൻ ഇൻ"
       },
       "PASSWORD": {
         "LABEL": "പാസ്‌വേഡ്",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "ഇമെയിൽ",
-        "PLACE_HOLDER": "ഇമെയിൽ"
+      "LOGIN": {
+        "LABEL": "സൈൻ ഇൻ",
+        "PLACE_HOLDER": "സൈൻ ഇൻ"
       },
       "PASSWORD": {
         "LABEL": "പാസ്‌വേഡ്",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index d9e87778e..21a1e913b 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "സംയോജനങ്ങൾ",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "റദ്ദാക്കുക",
+        "DESC": "നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ എന്താണ് സംഭവിക്കുന്നതെന്നതിനെക്കുറിച്ചുള്ള തത്സമയ വിവരങ്ങൾ വെബ്‌ഹൂക്ക് ഇവന്റുകൾ നൽകുന്നു. ഒരു കോൾബാക്ക് കോൺഫിഗർ ചെയ്യുന്നതിന് സാധുവായ ഒരു യുആർഎൽ നൽകുക.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
+          "PLACEHOLDER": "ഉദാഹരണം: https://example/api/webhook",
+          "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "വെബ്‌ഹുക്ക് സൃഷ്‌ടിക്കുക"
+      },
       "TITLE": "വെബ്‌ഹൂക്ക്",
       "CONFIGURE": "കോൺഫിഗർ",
       "HEADER": "വെബ്‌ഹൂക്ക് ക്രമീകരണങ്ങൾ",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "എഡിറ്റുചെയ്യുക",
         "TITLE": "വെബ്ഹുക്ക് എഡിറ്റ് ചെയ്യുക",
-        "CANCEL": "റദ്ദാക്കുക",
-        "DESC": "നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ എന്താണ് സംഭവിക്കുന്നതെന്നതിനെക്കുറിച്ചുള്ള തത്സമയ വിവരങ്ങൾ വെബ്‌ഹൂക്ക് ഇവന്റുകൾ നൽകുന്നു. ഒരു കോൾബാക്ക് കോൺഫിഗർ ചെയ്യുന്നതിന് സാധുവായ ഒരു യുആർഎൽ നൽകുക.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
-            "PLACEHOLDER": "ഉദാഹരണം: https://example/api/webhook",
-            "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
-          },
-          "SUBMIT": "വെബ്ഹുക്ക് എഡിറ്റ് ചെയ്യുക"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "വെബ്ഹുക്ക് URL വിജയകരമായി അപ്ഡേറ്റ് ചെയ്തിരിക്കുന്നു",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
         }
       },
       "ADD": {
         "CANCEL": "റദ്ദാക്കുക",
         "TITLE": "പുതിയ വെബ്‌ഹൂക്ക് ഉണ്ടാക്കുക",
-        "DESC": "നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ എന്താണ് സംഭവിക്കുന്നതെന്നതിനെക്കുറിച്ചുള്ള തത്സമയ വിവരങ്ങൾ വെബ്‌ഹൂക്ക് ഇവന്റുകൾ നൽകുന്നു. ഒരു കോൾബാക്ക് കോൺഫിഗർ ചെയ്യുന്നതിന് സാധുവായ ഒരു യുആർഎൽ നൽകുക.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "വെബ്‌ഹുക്ക് യുആർഎൽ",
-            "PLACEHOLDER": "ഉദാഹരണം: https://example/api/webhook",
-            "ERROR": "ദയവായി സാധുവായ ഒരു യുആർഎൽ നൽകുക"
-          },
-          "SUBMIT": "വെബ്‌ഹുക്ക് സൃഷ്‌ടിക്കുക"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "വെബ്‌ഹുക്ക് വിജയകരമായി ചേർത്തു",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "വൂട്ട് സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
-          "MESSAGE": "ഇല്ലാതാക്കണമെന്ന് ഉറപ്പാണോ ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "അതെ, ഇല്ലാതാക്കുക ",
           "NO": "ഇല്ല, സൂക്ഷിക്കുക"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index 77083ce96..b5fd901e0 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "അവലോകനം",
+    "HEADER": "സംഭാഷണങ്ങൾ",
     "LOADING_CHART": "ചാർട്ട് ഡാറ്റ ലോഡു ചെയ്യുകയാണ്...",
     "NO_ENOUGH_DATA": "റിപ്പോർട്ട് സൃഷ്ടിക്കുന്നതിന് ആവശ്യമായ ഡാറ്റ ഞങ്ങൾക്ക് ലഭിച്ചിട്ടില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക.",
     "DOWNLOAD_AGENT_REPORTS": "ഏജന്റ് റിപ്പോർട്ടുകൾ ഡൗൺലോഡ് ചെയ്യുക",
@@ -18,12 +18,16 @@
         "DESC": "( ആകെ )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "ആദ്യ പ്രതികരണ സമയം",
-        "DESC": "( ശരാശരി )"
+        "NAME": "First Response Time",
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "മിഴിവ് സമയം",
-        "DESC": "( ശരാശരി )"
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "മിഴിവ് എണ്ണം",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "വർഷം"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "ഏജന്റുമാരുടെ അവലോകനം",
@@ -130,12 +135,16 @@
         "DESC": "(ആകെ)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "ആദ്യ പ്രതികരണ സമയം",
-        "DESC": "( ശരാശരി )"
+        "NAME": "First Response Time",
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "മിഴിവ് സമയം",
-        "DESC": "( ശരാശരി )"
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "മിഴിവ് എണ്ണം",
@@ -193,12 +202,16 @@
         "DESC": "(ആകെ)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "ആദ്യ പ്രതികരണ സമയം",
-        "DESC": "( ശരാശരി )"
+        "NAME": "First Response Time",
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "മിഴിവ് സമയം",
-        "DESC": "( ശരാശരി )"
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "മിഴിവ് എണ്ണം",
@@ -256,12 +269,16 @@
         "DESC": "(ആകെ)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "ആദ്യ പ്രതികരണ സമയം",
-        "DESC": "( ശരാശരി )"
+        "NAME": "First Response Time",
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "മിഴിവ് സമയം",
-        "DESC": "( ശരാശരി )"
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "മിഴിവ് എണ്ണം",
@@ -319,12 +336,16 @@
         "DESC": "(ആകെ)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "ആദ്യ പ്രതികരണ സമയം",
-        "DESC": "( ശരാശരി )"
+        "NAME": "First Response Time",
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "മിഴിവ് സമയം",
-        "DESC": "( ശരാശരി )"
+        "DESC": "( ശരാശരി )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "മിഴിവ് എണ്ണം",
@@ -392,5 +413,33 @@
         "TOOLTIP": "മൊത്തം പ്രതികരണങ്ങളുടെ എണ്ണം / അയച്ച CSAT സർവേ സന്ദേശങ്ങളുടെ ആകെ എണ്ണം * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "അവലോകനം",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "സജീവം",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "നിയുക്തമാക്കാത്തത്"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "ഏജന്റ്",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "സ്റ്റാറ്റസ്"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "ഓൺ‌ലൈൻ",
+      "BUSY": "തിരക്ക്",
+      "OFFLINE": "ഓഫ്‌ലൈൻ"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
index 6fbacf70c..3a852f0d5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ml/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "പാസ്‌വേഡ് വിജയകരമായി മാറ്റി",
       "ERROR_MESSAGE": "സെർവറിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല, ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "സമർപ്പിക്കുക"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 0d8ea9bd5..5db51f2d1 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "പകർത്തുക",
       "COPY_SUCCESSFUL": "കോഡ് ക്ലിപ്പ്ബോർഡിലേക്ക് വിജയകരമായി പകർത്തി"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "ഡൗൺലോഡ്",
       "UPLOADING": "അപ്‌ലോഡുചെയ്യുന്നു..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "പരാമർശിക്കുന്നു",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "അവലോകനം",
+    "REPORTS_CONVERSATION": "സംഭാഷണങ്ങൾ",
     "CSAT": "CSAT",
     "CAMPAIGNS": "പ്രചാരണങ്ങൾ",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "ഇൻബോക്സ്",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "അവലോകനം"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/signup.json b/app/javascript/dashboard/i18n/locale/ml/signup.json
index e0373d760..3d57e427a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ml/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "പാസ്‌വേഡ്",
       "PLACEHOLDER": "പാസ്‌വേഡ്",
-      "ERROR": "പാസ്‌വേഡ് വളരെ ചെറുതാണ്"
+      "ERROR": "പാസ്‌വേഡ് വളരെ ചെറുതാണ്",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "പാസ്‌വേഡ് സ്ഥിരീകരിക്കുക",
diff --git a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
index 2f2e884de..c701528cb 100644
--- a/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "ഏജന്റുമാരെ ചേർക്കുക",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/ne/automation.json b/app/javascript/dashboard/i18n/locale/ne/automation.json
index 8c92467bd..48ac6a45f 100644
--- a/app/javascript/dashboard/i18n/locale/ne/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "अपलोड गर्दै...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/chatlist.json b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
index ccff2c33b..e3d637b71 100644
--- a/app/javascript/dashboard/i18n/locale/ne/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/contact.json b/app/javascript/dashboard/i18n/locale/ne/contact.json
index 849da7c04..0e716bed4 100644
--- a/app/javascript/dashboard/i18n/locale/ne/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ne/contact.json
@@ -70,6 +70,14 @@
     "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",
diff --git a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
index 038c266be..5a0c4f7d7 100644
--- a/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index f8f789d69..bda8ea1ef 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/integrations.json b/app/javascript/dashboard/i18n/locale/ne/integrations.json
index a54d8e9e0..774514a9d 100644
--- a/app/javascript/dashboard/i18n/locale/ne/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ne/integrations.json
@@ -2,6 +2,29 @@
   "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"
+          }
+        },
+        "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",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edit",
         "TITLE": "Edit webhook",
-        "CANCEL": "Cancel",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "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",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirm Deletion",
-          "MESSAGE": "Are you sure to delete ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Yes, Delete ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ne/report.json b/app/javascript/dashboard/i18n/locale/ne/report.json
index 84d3ff481..566099afe 100644
--- a/app/javascript/dashboard/i18n/locale/ne/report.json
+++ b/app/javascript/dashboard/i18n/locale/ne/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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"
+    },
+    "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"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
index cb060c12b..ecb3303c2 100644
--- a/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ne/setNewPassword.json
@@ -15,6 +15,9 @@
       "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": "बुझाउनुहोस्"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index ffe8423b6..c73f1c172 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "डाउनलोड",
       "UPLOADING": "अपलोड गर्दै..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversations",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Conversations",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/signup.json b/app/javascript/dashboard/i18n/locale/ne/signup.json
index 9a86da713..5485c4b28 100644
--- a/app/javascript/dashboard/i18n/locale/ne/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ne/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
index 8edff5699..f9ecaaaae 100644
--- a/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/nl/automation.json b/app/javascript/dashboard/i18n/locale/nl/automation.json
index e765d5230..e5074f53c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Uploaden...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/chatlist.json b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
index 4275452ee..887b84a90 100644
--- a/app/javascript/dashboard/i18n/locale/nl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Geen berichten",
     "NO_CONTENT": "Geen inhoud beschikbaar",
     "HIDE_QUOTED_TEXT": "Verberg geciteerde tekst",
-    "SHOW_QUOTED_TEXT": "Toon geciteerde tekst"
+    "SHOW_QUOTED_TEXT": "Toon geciteerde tekst",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index b2c50ed7b..13b9ee127 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacten werden succesvol opgeslagen",
     "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Verwijderen bevestigen",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nee, Bewaar het"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Contactpersoon verwijderen",
     "TITLE": "Contactpersoon verwijderen",
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 0a3d50c9a..c53d596a1 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 4b290c675..a17291a0d 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mailadres",
-        "PLACE_HOLDER": "E-mailadres"
+      "LOGIN": {
+        "LABEL": "Inloggen",
+        "PLACE_HOLDER": "Inloggen"
       },
       "PASSWORD": {
         "LABEL": "Wachtwoord",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mailadres",
-        "PLACE_HOLDER": "E-mailadres"
+      "LOGIN": {
+        "LABEL": "Inloggen",
+        "PLACE_HOLDER": "Inloggen"
       },
       "PASSWORD": {
         "LABEL": "Wachtwoord",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index b3fdff191..e39dd777c 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integraties",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Annuleren",
+        "DESC": "Webhook events bieden je realtime informatie over wat er gebeurt in je Chatwoot account. Voer een geldige URL in om een callback te configureren.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Voorbeeld: https://voorbeeld/api/webhook",
+          "ERROR": "Voer een geldige URL in"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Maak webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configureren",
       "HEADER": "Webhook instellingen",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Bewerken",
         "TITLE": "Edit webhook",
-        "CANCEL": "Annuleren",
-        "DESC": "Webhook events bieden je realtime informatie over wat er gebeurt in je Chatwoot account. Voer een geldige URL in om een callback te configureren.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Voorbeeld: https://voorbeeld/api/webhook",
-            "ERROR": "Voer een geldige URL in"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
         }
       },
       "ADD": {
         "CANCEL": "annuleren",
         "TITLE": "Nieuwe webhook toevoegen",
-        "DESC": "Webhook events bieden je realtime informatie over wat er gebeurt in je Chatwoot account. Voer een geldige URL in om een callback te configureren.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Voorbeeld: https://voorbeeld/api/webhook",
-            "ERROR": "Voer een geldige URL in"
-          },
-          "SUBMIT": "Maak webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook succesvol toegevoegd",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Verwijdering bevestigen",
-          "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ja, verwijderen ",
           "NO": "Nee, Bewaar het"
         }
diff --git a/app/javascript/dashboard/i18n/locale/nl/report.json b/app/javascript/dashboard/i18n/locale/nl/report.json
index 5a48fcb54..06f50b9ab 100644
--- a/app/javascript/dashboard/i18n/locale/nl/report.json
+++ b/app/javascript/dashboard/i18n/locale/nl/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Gesprekken",
     "LOADING_CHART": "Kaartgegevens laden...",
     "NO_ENOUGH_DATA": "We hebben niet genoeg datapunten ontvangen om een rapport te genereren, probeer het later opnieuw.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
@@ -18,12 +18,16 @@
         "DESC": "( Totaal )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Eerste reactietijd",
-        "DESC": "(Gem. )"
+        "NAME": "First Response Time",
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Resolutie Tijd",
-        "DESC": "(Gem. )"
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Aantal Resoluties",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Totaal )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Eerste reactietijd",
-        "DESC": "(Gem. )"
+        "NAME": "First Response Time",
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Resolutie Tijd",
-        "DESC": "(Gem. )"
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Aantal Resoluties",
@@ -193,12 +202,16 @@
         "DESC": "( Totaal )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Eerste reactietijd",
-        "DESC": "(Gem. )"
+        "NAME": "First Response Time",
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Resolutie Tijd",
-        "DESC": "(Gem. )"
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Aantal Resoluties",
@@ -256,12 +269,16 @@
         "DESC": "( Totaal )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Eerste reactietijd",
-        "DESC": "(Gem. )"
+        "NAME": "First Response Time",
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Resolutie Tijd",
-        "DESC": "(Gem. )"
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Aantal Resoluties",
@@ -319,12 +336,16 @@
         "DESC": "( Totaal )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Eerste reactietijd",
-        "DESC": "(Gem. )"
+        "NAME": "First Response Time",
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Resolutie Tijd",
-        "DESC": "(Gem. )"
+        "DESC": "(Gem. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Aantal Resoluties",
@@ -392,5 +413,33 @@
         "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": "Niet toegewezen"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Medewerker",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Status"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Bezig",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json b/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
index 436d1b812..ba7ed192b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/nl/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Wachtwoord succesvol veranderd",
       "ERROR_MESSAGE": "Kan geen verbinding maken met Woot Server, probeer het later opnieuw"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Bevestigen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index a7c3fb441..1bd17d257 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopiëren",
       "COPY_SUCCESSFUL": "Code succesvol naar het klembord gekopieerd "
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Downloaden",
       "UPLOADING": "Uploaden..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Gesprekken",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Vermeldingen",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Gesprekken",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/signup.json b/app/javascript/dashboard/i18n/locale/nl/signup.json
index 9705bc75c..621cef46a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/nl/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Wachtwoord",
       "PLACEHOLDER": "Wachtwoord",
-      "ERROR": "Wachtwoord is te kort"
+      "ERROR": "Wachtwoord is te kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Bevestig wachtwoord",
diff --git a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
index fda6b51cf..a9453b569 100644
--- a/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Voeg agenten toe",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/no/automation.json b/app/javascript/dashboard/i18n/locale/no/automation.json
index 047451073..a04cc61a7 100644
--- a/app/javascript/dashboard/i18n/locale/no/automation.json
+++ b/app/javascript/dashboard/i18n/locale/no/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Laster opp...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/chatlist.json b/app/javascript/dashboard/i18n/locale/no/chatlist.json
index 75491f2b2..2d6fff92c 100644
--- a/app/javascript/dashboard/i18n/locale/no/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/no/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Ingen meldinger",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/contact.json b/app/javascript/dashboard/i18n/locale/no/contact.json
index 72589712d..b7ee0a1e8 100644
--- a/app/javascript/dashboard/i18n/locale/no/contact.json
+++ b/app/javascript/dashboard/i18n/locale/no/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "Det oppstod en feil. Prøv igjen"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Bekreft sletting",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nei, behold den"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/no/generalSettings.json b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
index 7ec9be4f8..5514fd3c6 100644
--- a/app/javascript/dashboard/i18n/locale/no/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Varsler",
     "MARK_ALL_DONE": "Merk alle som ferdige",
+    "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": "Laster varsler...",
       "404": "Ingen varsler",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index 4c2177ce8..acde2c58e 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funksjoner",
       "DISPLAY_FILE_PICKER": "Vis filvelger i widget",
-      "DISPLAY_EMOJI_PICKER": "Vis emoji-velger i widget"
+      "DISPLAY_EMOJI_PICKER": "Vis emoji-velger i widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Kopi av samtale",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-post",
-        "PLACE_HOLDER": "E-post"
+      "LOGIN": {
+        "LABEL": "Logg inn",
+        "PLACE_HOLDER": "Logg inn"
       },
       "PASSWORD": {
         "LABEL": "Passord",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-post",
-        "PLACE_HOLDER": "E-post"
+      "LOGIN": {
+        "LABEL": "Logg inn",
+        "PLACE_HOLDER": "Logg inn"
       },
       "PASSWORD": {
         "LABEL": "Passord",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/integrations.json b/app/javascript/dashboard/i18n/locale/no/integrations.json
index 9de34483f..38918e863 100644
--- a/app/javascript/dashboard/i18n/locale/no/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/no/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrasjoner",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Avbryt",
+        "DESC": "Webhook-hendelser gir deg sanntidsinformasjon om hva som skjer i din Chatwoot-konto. Skriv inn en gyldig nettadresse for å konfigurere en 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Eksempel: https://example/api/webhook",
+          "ERROR": "Vennligst skriv inn en gyldig URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Opprett webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Konfigurer",
       "HEADER": "Webhook-innstillinger",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Rediger",
         "TITLE": "Edit webhook",
-        "CANCEL": "Avbryt",
-        "DESC": "Webhook-hendelser gir deg sanntidsinformasjon om hva som skjer i din Chatwoot-konto. Skriv inn en gyldig nettadresse for å konfigurere en callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
-            "ERROR": "Vennligst skriv inn en gyldig URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
         }
       },
       "ADD": {
         "CANCEL": "Avbryt",
         "TITLE": "Legg til ny webhook",
-        "DESC": "Webhook-hendelser gir deg sanntidsinformasjon om hva som skjer i din Chatwoot-konto. Skriv inn en gyldig nettadresse for å konfigurere en callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Eksempel: https://example/api/webhook",
-            "ERROR": "Vennligst skriv inn en gyldig URL"
-          },
-          "SUBMIT": "Opprett webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook ble lagt til",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Bekreft sletting",
-          "MESSAGE": "Er du sikker på at du vil slette ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ja, slett ",
           "NO": "Nei, behold den"
         }
diff --git a/app/javascript/dashboard/i18n/locale/no/report.json b/app/javascript/dashboard/i18n/locale/no/report.json
index 1c58d36db..009368714 100644
--- a/app/javascript/dashboard/i18n/locale/no/report.json
+++ b/app/javascript/dashboard/i18n/locale/no/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Samtaler",
     "LOADING_CHART": "Laster inn diagramdata...",
     "NO_ENOUGH_DATA": "Vi har ikke mottatt nok data for å generere rapporten, vennligst prøv igjen senere.",
     "DOWNLOAD_AGENT_REPORTS": "Last ned agentrapporter",
@@ -18,12 +18,16 @@
         "DESC": "(Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gj. sn. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsningstid",
-        "DESC": "( Gj. sn. )"
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antall løsninger",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "(Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gj. sn. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsningstid",
-        "DESC": "( Gj. sn. )"
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antall løsninger",
@@ -193,12 +202,16 @@
         "DESC": "(Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gj. sn. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsningstid",
-        "DESC": "( Gj. sn. )"
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antall løsninger",
@@ -256,12 +269,16 @@
         "DESC": "(Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gj. sn. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsningstid",
-        "DESC": "( Gj. sn. )"
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antall løsninger",
@@ -319,12 +336,16 @@
         "DESC": "(Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Første svartid",
-        "DESC": "( Gj. sn. )"
+        "NAME": "First Response Time",
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Løsningstid",
-        "DESC": "( Gj. sn. )"
+        "DESC": "( Gj. sn. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antall løsninger",
@@ -392,5 +413,33 @@
         "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": "Åpne",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Ikke tildelt"
+    },
+    "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": "Satus"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Pålogget",
+      "BUSY": "Opptatt",
+      "OFFLINE": "Frakoblet"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/setNewPassword.json b/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
index 82e90136c..85464ab51 100644
--- a/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/no/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Passordet ble endret",
       "ERROR_MESSAGE": "Kunne ikke koble til Woot Server, vennligst prøv igjen senere"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Send"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 7867ecc74..0d005663c 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopier",
       "COPY_SUCCESSFUL": "Koden er kopiert til utklippstavlen"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Last ned",
       "UPLOADING": "Laster opp..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Samtaler",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Samtaler",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/no/signup.json b/app/javascript/dashboard/i18n/locale/no/signup.json
index 8dd41d1c8..6daac4ef5 100644
--- a/app/javascript/dashboard/i18n/locale/no/signup.json
+++ b/app/javascript/dashboard/i18n/locale/no/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Passord",
       "PLACEHOLDER": "Passord",
-      "ERROR": "Passordet er for kort"
+      "ERROR": "Passordet er for kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Bekreft passord",
diff --git a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
index da9ec47b3..30cf468ca 100644
--- a/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/no/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Legg til agenter",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index 373d88c19..d6adcbe72 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Tak",
       "CANCEL_LABEL": "Nie"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Przesyłanie...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 5f4c2a02f..51d1d83d3 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Brak wiadomości",
     "NO_CONTENT": "Brak treści",
     "HIDE_QUOTED_TEXT": "Ukryj cytat",
-    "SHOW_QUOTED_TEXT": "Pokaż cytat"
+    "SHOW_QUOTED_TEXT": "Pokaż cytat",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 8e3e23af2..4eefd1e28 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kontakty zapisane pomyślnie",
     "ERROR_MESSAGE": "Wystąpił błąd, spróbuj ponownie"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Potwierdź usunięcie",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nie, zachowaj"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Usuń kontakt",
     "TITLE": "Usuń kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 815ea569b..630d5a977 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Powiadomienia",
     "MARK_ALL_DONE": "Zaznacz wszystko jako zakończone",
+    "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": "Wczytywanie powiadomień...",
       "404": "Brak powiadomień",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 785e3da28..8b629edad 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funkcje",
       "DISPLAY_FILE_PICKER": "Wyświetl selektor plików w widżecie",
-      "DISPLAY_EMOJI_PICKER": "Wyświetl selektor emoji w widżecie"
+      "DISPLAY_EMOJI_PICKER": "Wyświetl selektor emoji w widżecie",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Skrypt Messengera",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Formularze czatu umożliwiają przechwytywanie informacji o użytkowniku przed rozpoczęciem rozmowy z Tobą.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Klucz",
+        "TYPE": "Typ",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Włącz formularz przed czatem",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Wiadomość na czacie",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Ta wiadomość będzie widoczna dla użytkowników wraz z formularzem"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Ustaw szczegóły IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Aktualizuj ustawienia IMAP",
       "TOGGLE_AVAILABILITY": "Włącz konfigurację IMAP dla tej skrzynki odbiorczej",
       "TOGGLE_HELP": "Włączenie IMAP pomoże użytkownikowi otrzymywać e-mail",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Zaloguj się",
+        "PLACE_HOLDER": "Zaloguj się"
       },
       "PASSWORD": {
         "LABEL": "Hasło",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Zaloguj się",
+        "PLACE_HOLDER": "Zaloguj się"
       },
       "PASSWORD": {
         "LABEL": "Hasło",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Otwórz tryb weryfikacji SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Otwórz tryb weryfikacji SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
index 79fe03c39..fc778fb30 100644
--- a/app/javascript/dashboard/i18n/locale/pl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integracje",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Anuluj",
+        "DESC": "Wydarzenia Webhook dostarczają informacji o tym, co dzieje się na Twoim koncie Chatwoot. Wprowadź poprawny adres URL, aby skonfigurować wywołanie zwrotne.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL webhooka",
+          "PLACEHOLDER": "Przykład: https://example/api/webhook",
+          "ERROR": "Wprowadź poprawny adres URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Skonfiguruj",
       "HEADER": "Ustawienia webhooka",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Edytuj",
         "TITLE": "Edit webhook",
-        "CANCEL": "Anuluj",
-        "DESC": "Wydarzenia Webhook dostarczają informacji o tym, co dzieje się na Twoim koncie Chatwoot. Wprowadź poprawny adres URL, aby skonfigurować wywołanie zwrotne.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL webhooka",
-            "PLACEHOLDER": "Przykład: https://example/api/webhook",
-            "ERROR": "Wprowadź poprawny adres URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
         }
       },
       "ADD": {
         "CANCEL": "Anuluj",
         "TITLE": "Dodaj nowy webhook",
-        "DESC": "Wydarzenia Webhook dostarczają informacji o tym, co dzieje się na Twoim koncie Chatwoot. Wprowadź poprawny adres URL, aby skonfigurować wywołanie zwrotne.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL webhooka",
-            "PLACEHOLDER": "Przykład: https://example/api/webhook",
-            "ERROR": "Wprowadź poprawny adres URL"
-          },
-          "SUBMIT": "Utwórz webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook został dodany",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Potwierdź usunięcie",
-          "MESSAGE": "Czy na pewno chcesz usunąć ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Tak, usuń ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index 29538f8a9..c45624ad6 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Rozmowy",
     "LOADING_CHART": "Ładowanie danych wykresów...",
     "NO_ENOUGH_DATA": "Nie otrzymaliśmy wystarczającej ilości punktów danych, aby wygenerować raport, spróbuj ponownie później.",
     "DOWNLOAD_AGENT_REPORTS": "Pobierz raporty agenta",
@@ -18,12 +18,16 @@
         "DESC": "( łącznie )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Czas pierwszej odpowiedzi",
-        "DESC": "( Średnie )"
+        "NAME": "First Response Time",
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Czas rozwiązania",
-        "DESC": "( Średnie )"
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Liczba rozwiązań",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Godziny pracy"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( łącznie )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Czas pierwszej odpowiedzi",
-        "DESC": "( Średnie )"
+        "NAME": "First Response Time",
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Czas rozwiązania",
-        "DESC": "( Średnie )"
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Liczba rozwiązań",
@@ -193,12 +202,16 @@
         "DESC": "( łącznie )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Czas pierwszej odpowiedzi",
-        "DESC": "( Średnie )"
+        "NAME": "First Response Time",
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Czas rozwiązania",
-        "DESC": "( Średnie )"
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Liczba rozwiązań",
@@ -256,12 +269,16 @@
         "DESC": "( łącznie )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Czas pierwszej odpowiedzi",
-        "DESC": "( Średnie )"
+        "NAME": "First Response Time",
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Czas rozwiązania",
-        "DESC": "( Średnie )"
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Liczba rozwiązań",
@@ -319,12 +336,16 @@
         "DESC": "( łącznie )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Czas pierwszej odpowiedzi",
-        "DESC": "( Średnie )"
+        "NAME": "First Response Time",
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Czas rozwiązania",
-        "DESC": "( Średnie )"
+        "DESC": "( Średnie )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Liczba rozwiązań",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Całkowita liczba odpowiedzi / całkowita liczba wysłanych komunikatów z ankiety CSAT * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Overview",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Otwórz",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Nieprzypisane"
+    },
+    "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": "Zajęty",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
index e096cee49..9265b0288 100644
--- a/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pl/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Pomyślnie zmienione hasło",
       "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Prześlij"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 5f1313b83..4921d3546 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Pobierz",
       "UPLOADING": "Przesyłanie..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Rozmowy",
     "ALL_CONVERSATIONS": "Rozmowy",
     "MENTIONED_CONVERSATIONS": "Wzmianki",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Rozmowy",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampania",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Skrzynka odbiorcza",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/signup.json b/app/javascript/dashboard/i18n/locale/pl/signup.json
index e311b2d32..eac56ba83 100644
--- a/app/javascript/dashboard/i18n/locale/pl/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pl/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Hasło",
       "PLACEHOLDER": "Hasło",
-      "ERROR": "Hasło jest zbyt krótkie"
+      "ERROR": "Hasło jest zbyt krótkie",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Potwierdź hasło",
diff --git a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
index a10a789cc..6e0b5a1f4 100644
--- a/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "zaznacz wszystkich agentów",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Dodaj agentów",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Twój zespół jest gotowy!",
diff --git a/app/javascript/dashboard/i18n/locale/pt/automation.json b/app/javascript/dashboard/i18n/locale/pt/automation.json
index 3e5f99df3..b83b9f772 100644
--- a/app/javascript/dashboard/i18n/locale/pt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "É necessário ter pelo menos uma condição para salvar"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "É necessário ter pelo menos uma ação para salvar"
+      "DELETE_MESSAGE": "É necessário ter pelo menos uma ação para salvar",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Ativar Regra de Automação",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Não foi possível Desativar a Automação, por favor, tente novamente mais tarde",
       "CONFIRMATION_LABEL": "Sim",
       "CANCEL_LABEL": "Não"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "A carregar...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index 1e4b84072..aefe5b0c4 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Nenhuma mensagem",
     "NO_CONTENT": "Sem conteúdo disponível",
     "HIDE_QUOTED_TEXT": "Ocultar Texto Citado",
-    "SHOW_QUOTED_TEXT": "Mostrar Texto Citado"
+    "SHOW_QUOTED_TEXT": "Mostrar Texto Citado",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 4c03e2c62..9ae54c705 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -1,6 +1,6 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Não disponível",
+    "NOT_AVAILABLE": "Não Disponível",
     "EMAIL_ADDRESS": "Endereço de email",
     "PHONE_NUMBER": "Número de telefone",
     "COPY_SUCCESSFUL": "Copiado para área de transferência com sucesso",
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contactos guardados com sucesso",
     "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirmar Exclusão",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Não, mantenha isso"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Apagar Contacto",
     "TITLE": "Excluir contato",
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 0bf4afa2f..5158c4f34 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificaçoes",
     "MARK_ALL_DONE": "Marcar todos como Resolvidos",
+    "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": "A carregar notificações...",
       "404": "Sem Notificações",
@@ -101,6 +108,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_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",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 3055f5ad2..01c8a433f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Características",
       "DISPLAY_FILE_PICKER": "Mostrar o selecionador de ficheiros no widget",
-      "DISPLAY_EMOJI_PICKER": "Mostrar seletor de emojis no widget"
+      "DISPLAY_EMOJI_PICKER": "Mostrar seletor de emojis no widget",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script do Messenger",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "O formulário de Pré-Chat permite-lhe capturar informações do utilizador antes de iniciar uma conversa.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Chave",
+        "TYPE": "Tipo",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Ativar formulário de Pré-chat",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Mensagem de Pré-Chat",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Esta mensagem estará visível aos utilizadores juntamente com o formulário"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Defina os seus dados IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Atualizar configurações IMAP",
       "TOGGLE_AVAILABILITY": "Ativar a configuração IMAP para esta caixa de entrada",
       "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
@@ -483,9 +494,9 @@
         "LABEL": "Porta",
         "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "e-mail",
-        "PLACE_HOLDER": "e-mail"
+      "LOGIN": {
+        "LABEL": "Iniciar sessão",
+        "PLACE_HOLDER": "Iniciar sessão"
       },
       "PASSWORD": {
         "LABEL": "Palavra-passe",
@@ -511,9 +522,9 @@
         "LABEL": "Porta",
         "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "e-mail",
-        "PLACE_HOLDER": "e-mail"
+      "LOGIN": {
+        "LABEL": "Iniciar sessão",
+        "PLACE_HOLDER": "Iniciar sessão"
       },
       "PASSWORD": {
         "LABEL": "Palavra-passe",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encriptação",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Abrir Modo de Verificação SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Abrir Modo de Verificação SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index fc67295ee..16eb340d2 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrações",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "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",
+          "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL do Webhook",
+          "PLACEHOLDER": "Exemplo: https://example/api/webhook",
+          "ERROR": "Por favor, insira uma URL válida"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Criar webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configurar",
       "HEADER": "Configurações de webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Alterar",
         "TITLE": "Editar Webhooks",
-        "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.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL do Webhook",
-            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
-            "ERROR": "Por favor, insira uma URL válida"
-          },
-          "SUBMIT": "Editar Webhooks"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL do Webhook atualizado com sucesso",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
         }
       },
       "ADD": {
         "CANCEL": "cancelar",
         "TITLE": "Adicionar novo webhook",
-        "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.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL do Webhook",
-            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
-            "ERROR": "Por favor, insira uma URL válida"
-          },
-          "SUBMIT": "Criar webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook adicionado com sucesso",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmar Exclusão",
-          "MESSAGE": "Tem certeza que deseja excluir ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Sim, excluir ",
           "NO": "Não, mantenha isso"
         }
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index 8d4570f5f..0d8fc3e46 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Visão geral",
+    "HEADER": "Conversas",
     "LOADING_CHART": "Carregando dados da carta...",
     "NO_ENOUGH_DATA": "Não recebemos pontos de dados suficientes para gerar o relatório. Por favor, tente novamente mais tarde.",
     "DOWNLOAD_AGENT_REPORTS": "Descarregar relatórios de agentes",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeiro tempo de resposta",
-        "DESC": "(Méd. )"
+        "NAME": "First Response Time",
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Méd. )"
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de resolução",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Ano"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Horário comercial"
   },
   "AGENT_REPORTS": {
     "HEADER": "Visão Geral de Agentes",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeiro tempo de resposta",
-        "DESC": "(Méd. )"
+        "NAME": "First Response Time",
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Méd. )"
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de resolução",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeiro tempo de resposta",
-        "DESC": "(Méd. )"
+        "NAME": "First Response Time",
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Méd. )"
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de resolução",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeiro tempo de resposta",
-        "DESC": "(Méd. )"
+        "NAME": "First Response Time",
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Méd. )"
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de resolução",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeiro tempo de resposta",
-        "DESC": "(Méd. )"
+        "NAME": "First Response Time",
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Méd. )"
+        "DESC": "(Méd. )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de resolução",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Número total de respostas / Número total de mensagens CSAT enviadas * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Visão geral",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Abertas",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Não atribuído"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Representante",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "SItuação"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Disponível",
+      "BUSY": "Ocupado",
+      "OFFLINE": "Ausente"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
index 19dab2f47..36b65ee6f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Senha alterada com sucesso",
       "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "submeter"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 5b8a508bc..005c6c4f5 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copiar",
       "COPY_SUCCESSFUL": "Código copiado com sucesso para área de transferência"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "BAIXAR",
       "UPLOADING": "A carregar..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversas",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Nova etiqueta",
     "NEW_TEAM": "Nova equipa",
     "NEW_INBOX": "Nova caixa de entrada",
-    "REPORTS_OVERVIEW": "Visão geral",
+    "REPORTS_CONVERSATION": "Conversas",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campanhas",
     "ONGOING": "Em curso",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Caixa de Entrada",
     "REPORTS_TEAM": "Equipa",
     "SET_AVAILABILITY_TITLE": "Defina-se como",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Visão geral"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Não conseguimos encontrar nenhuma conta do Chatwoot. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/signup.json b/app/javascript/dashboard/i18n/locale/pt/signup.json
index b9a33c407..7d8919e08 100644
--- a/app/javascript/dashboard/i18n/locale/pt/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Palavra-passe",
       "PLACEHOLDER": "Palavra-passe",
-      "ERROR": "A senha é muito curta"
+      "ERROR": "A senha é muito curta",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar senha",
diff --git a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
index 2cf86f0a7..6cf74913f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "escolher todos os agentes",
       "SELECTED_COUNT": "%{selected} de %{total} agentes escolhidos.",
       "BUTTON_TEXT": "Adicionar agentes",
-      "AGENT_VALIDATION_ERROR": "Escolher pelo menos um Agente."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "A sua equipa está pronta!",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
index 3fe6b8d3b..229914f0a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/advancedFilters.json
@@ -22,7 +22,7 @@
       "is_not_present": "Não está presente",
       "is_greater_than": "É maior que",
       "is_less_than": "É menor que",
-      "days_before": "Is x days before"
+      "days_before": "É x dias antes"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Verdadeiro",
@@ -44,7 +44,7 @@
       "CUSTOM_ATTRIBUTE_NUMBER": "Número",
       "CUSTOM_ATTRIBUTE_LINK": "Link",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
+      "CREATED_AT": "Criado em",
       "LAST_ACTIVITY": "Última atividade"
     },
     "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
index 86fe1a7fe..5d67f894f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "Você precisa ter pelo menos uma condição para salvar"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Você precisa ter pelo menos uma ação para salvar"
+      "DELETE_MESSAGE": "Você precisa ter pelo menos uma ação para salvar",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Escreva sua mensagem aqui",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Selecionar times"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Ativar regra de automação",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Não foi possível desativar a automação, por favor, tente novamente mais tarde",
       "CONFIRMATION_LABEL": "Sim",
       "CANCEL_LABEL": "Não"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Não foi possível fazer upload do anexo, por favor, tente novamente",
+      "LABEL_IDLE": "Fazer upload de arquivo",
+      "LABEL_UPLOADING": "Enviando...",
+      "LABEL_UPLOADED": "Upload feito com sucesso",
+      "LABEL_UPLOAD_FAILED": "Faha no upload"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 82f139901..0278274e5 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Nova Mensagem",
     "NO_CONTENT": "Nenhum conteúdo disponível",
     "HIDE_QUOTED_TEXT": "Ocultar Texto Citado",
-    "SHOW_QUOTED_TEXT": "Mostrar Texto Citado"
+    "SHOW_QUOTED_TEXT": "Mostrar Texto Citado",
+    "MESSAGE_READ": "Lida"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 2ece6f162..c7c8a9eeb 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contatos salvos com sucesso",
     "ERROR_MESSAGE": "Ocorreu um erro, por favor tente novamente"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirmar exclusão",
+      "MESSAGE": "Tem certeza que deseja excluir esta nota?",
+      "YES": "Sim, exclua",
+      "NO": "Não, mantenha"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Excluir contato",
     "TITLE": "Excluir contato",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
index dd00b06f7..255dc2ca4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contactFilters.json
@@ -23,7 +23,7 @@
             "is_not_present": "Não está presente",
             "is_greater_than": "É maior que",
             "is_lesser_than": "É menor que",
-            "days_before": "Is x days before"
+            "days_before": "É x dias antes"
         },
         "ATTRIBUTES": {
             "NAME": "Nome",
@@ -37,7 +37,7 @@
             "CUSTOM_ATTRIBUTE_NUMBER": "Número",
             "CUSTOM_ATTRIBUTE_LINK": "Link",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-            "CREATED_AT": "Created At",
+            "CREATED_AT": "Criado em",
             "LAST_ACTIVITY": "Última atividade"
         },
         "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 0db4c62b5..b7826a47e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -48,7 +48,7 @@
       }
     },
     "UPDATE_CHATWOOT": "Uma atualização %{latestChatwootVersion} para o Chatwoot está disponível. Por favor, atualize sua instância.",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "Saiba mais"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notificações",
     "MARK_ALL_DONE": "Marcar Tudo Feito",
+    "DELETE_TITLE": "Excluído",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Notificações não lidas",
+      "ALL_NOTIFICATIONS": "Visualizar 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": "Carregando notificações...",
       "404": "Sem Notificações",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Ir para Painel de Conversação",
       "GO_TO_CONTACTS_DASHBOARD": "Ir para Painel de Contatos",
       "GO_TO_REPORTS_OVERVIEW": "Ir para Resumo de Relatórios",
+      "GO_TO_CONVERSATION_REPORTS": "Ir para Relatórios das Conversas",
       "GO_TO_AGENT_REPORTS": "Ir para Relatórios do Agente",
       "GO_TO_LABEL_REPORTS": "Ir para Relatórios de Rótulos",
       "GO_TO_INBOX_REPORTS": "Ir para Relatórios da Caixa de Entrada",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 0b224d744..1e2fa9cec 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -100,7 +100,7 @@
         "SUBMIT_BUTTON": "Criar caixa de entrada"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
+        "TITLE": "Canal Twilio SMS/WhatsApp",
         "DESC": "Integre o Twilio e comece a oferecer suporte a seus clientes por SMS ou WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "SID da Conta",
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funcionalidades",
       "DISPLAY_FILE_PICKER": "Exibir seletor de arquivos no widget",
-      "DISPLAY_EMOJI_PICKER": "Exibir seletor de emoji no widget"
+      "DISPLAY_EMOJI_PICKER": "Exibir seletor de emoji no widget",
+      "ALLOW_END_CONVERSATION": "Permitir que usuários terminem a conversa a partir do widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Código Menssageiro <scripit>",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Formulários de bate-papo permitem que você capture informações de usuário antes de iniciar uma conversa com você.",
+      "SET_FIELDS": "Campos do formulário Pré Chat",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Campos",
+        "LABEL": "Nome do campo",
+        "PLACE_HOLDER": "Valor de exemplo",
+        "KEY": "Chave",
+        "TYPE": "Tipo",
+        "REQUIRED": "Obrigatório"
+      },
       "ENABLE": {
         "LABEL": "Ativar formulário de bate-papo antes",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pré Mensagem de bate-papo",
+        "LABEL": "Mensagem pré chat",
         "PLACEHOLDER": "Esta mensagem será visível para os usuários junto com o formulário"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Defina seus dados IMAP",
+      "NOTE_TEXT": "Para habilitar o SMTP, por favor configure o IMAP.",
       "UPDATE": "Atualizar configurações do IMAP",
       "TOGGLE_AVAILABILITY": "Habilitar a configuração IMAP para esta caixa de entrada",
       "TOGGLE_HELP": "Habilitar o IMAP ajudará o usuário a receber e-mail",
@@ -483,9 +494,9 @@
         "LABEL": "Porta",
         "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "e-mail",
-        "PLACE_HOLDER": "e-mail"
+      "LOGIN": {
+        "LABEL": "Entrar",
+        "PLACE_HOLDER": "Entrar"
       },
       "PASSWORD": {
         "LABEL": "Senha",
@@ -511,9 +522,9 @@
         "LABEL": "Porta",
         "PLACE_HOLDER": "Porta"
       },
-      "EMAIL": {
-        "LABEL": "e-mail",
-        "PLACE_HOLDER": "e-mail"
+      "LOGIN": {
+        "LABEL": "Entrar",
+        "PLACE_HOLDER": "Entrar"
       },
       "PASSWORD": {
         "LABEL": "Senha",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Criptografia",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificação SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificação SSL",
+      "AUTH_MECHANISM": "Autenticação"
+    },
+    "NOTE": "Observação: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 034ec1e31..06a5db9cb 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrações",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Eventos Inscritos",
+      "FORM": {
+        "CANCEL": "Cancelar",
+        "DESC": "Webhook Os eventos fornecem informações em tempo real sobre o que está acontecendo na sua conta do Chatwoot. Digite um URL válido para configurar um retorno de chamada.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Eventos",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Conversa Criada",
+            "CONVERSATION_STATUS_CHANGED": "Status de conversa alterado",
+            "CONVERSATION_UPDATED": "Conversa Atualizada",
+            "MESSAGE_CREATED": "Mensagem criada",
+            "MESSAGE_UPDATED": "Mensagem atualizada",
+            "WEBWIDGET_TRIGGERED": "Widget de chat aberto pelo usuário"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL do Webhook",
+          "PLACEHOLDER": "Exemplo: https://example/api/webhook",
+          "ERROR": "Por favor, insira uma URL válida"
+        },
+        "EDIT_SUBMIT": "Atualizar webhook",
+        "ADD_SUBMIT": "Criar webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configurar",
       "HEADER": "Configurações do Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Alterar",
         "TITLE": "Editar webhook",
-        "CANCEL": "Cancelar",
-        "DESC": "Webhook Os eventos fornecem informações em tempo real sobre o que está acontecendo na sua conta do Chatwoot. Digite um URL válido para configurar um retorno de chamada.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL do webhook",
-            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
-            "ERROR": "Por favor, insira uma URL válida"
-          },
-          "SUBMIT": "Editar webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL do Webhook atualizado com sucesso",
+          "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"
         }
       },
       "ADD": {
         "CANCEL": "Cancelar",
         "TITLE": "Adicionar novo webhook",
-        "DESC": "Webhook Os eventos fornecem informações em tempo real sobre o que está acontecendo na sua conta do Chatwoot. Digite um URL válido para configurar um retorno de chamada.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL do webhook",
-            "PLACEHOLDER": "Exemplo: https://example/api/webhook",
-            "ERROR": "Por favor, insira uma URL válida"
-          },
-          "SUBMIT": "Criar webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook adicionado com sucesso",
+          "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"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmar exclusão",
-          "MESSAGE": "Você tem certeza que deseja excluir ",
+          "MESSAGE": "Tem certeza que deseja excluir o webhook? (%{webhookURL})",
           "YES": "Sim, excluir ",
           "NO": "Não, mantenha"
         }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index 707601417..fb3c83861 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Visão geral",
+    "HEADER": "Conversas",
     "LOADING_CHART": "Carregando dados do gráfico...",
     "NO_ENOUGH_DATA": "Não existem dados suficientes para gerar o relatório. Tente novamente mais tarde.",
     "DOWNLOAD_AGENT_REPORTS": "Baixar relatórios de agentes",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeira resposta",
-        "DESC": "(Média)"
+        "NAME": "Tempo da Primeira Resposta",
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo da primeira resposta é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Média)"
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo de resolução é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Ano"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Horários de funcionamento"
   },
   "AGENT_REPORTS": {
     "HEADER": "Visão Geral de Agentes",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeira resposta",
-        "DESC": "(Média)"
+        "NAME": "Tempo da Primeira Resposta",
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo da primeira resposta é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Média)"
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo de resolução é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeira resposta",
-        "DESC": "(Média)"
+        "NAME": "Tempo da Primeira Resposta",
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo da primeira resposta é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Média)"
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo de resolução é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeira resposta",
-        "DESC": "(Média)"
+        "NAME": "Tempo da Primeira Resposta",
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo da primeira resposta é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Média)"
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo de resolução é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primeira resposta",
-        "DESC": "(Média)"
+        "NAME": "Tempo da Primeira Resposta",
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo da primeira resposta é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tempo de resolução",
-        "DESC": "(Média)"
+        "DESC": "(Média)",
+        "INFO_TEXT": "Número total de conversas utilizadas para computação:",
+        "TOOLTIP_TEXT": "O tempo de resolução é de %{metricValue} (com base em %{conversationCount} conversas)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Contagem de Resolução",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Número total de respostas / Número total de mensagens CSAT de pesquisa enviadas * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Visão geral",
+    "LIVE": "Disponível",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Abrir Conversas",
+      "LOADING_MESSAGE": "Carregando métricas de conversa...",
+      "OPEN": "Abertas",
+      "UNATTENDED": "Não atendidas",
+      "UNASSIGNED": "Não atribuída"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversas por agentes",
+      "LOADING_MESSAGE": "Carregando métricas de agente...",
+      "NO_AGENTS": "Não há conversas por agentes",
+      "TABLE_HEADER": {
+        "AGENT": "Agente",
+        "OPEN": "ABERTO",
+        "UNATTENDED": "Não atendidas",
+        "STATUS": "SItuação"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Status do agente",
+      "ONLINE": "Disponível",
+      "BUSY": "Ocupado",
+      "OFFLINE": "Desconectado"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
index 8ae0aaa7e..5206b58f4 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Senha alterada com sucesso",
       "ERROR_MESSAGE": "Não foi possível conectar ao servidor Woot, por favor tente novamente mais tarde"
     },
+    "CAPTCHA": {
+      "ERROR": "Verificação expirada. Por favor, resolva o captcha novamente."
+    },
     "SUBMIT": "Enviar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 803d005d1..aa3eab28a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copiar",
       "COPY_SUCCESSFUL": "Código copiado para área de transferência com sucesso"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Mostrar Mais",
+      "SHOW_LESS": "Mostrar Menos"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Baixar",
       "UPLOADING": "Enviando..."
@@ -146,7 +150,8 @@
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "CURRENTLY_VIEWING_ACCOUNT": "Visualização atual:",
+    "SWITCH": "Trocar",
     "CONVERSATIONS": "Conversas",
     "ALL_CONVERSATIONS": "Todas as conversas",
     "MENTIONED_CONVERSATIONS": "Menções",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Nova etiqueta",
     "NEW_TEAM": "Novo time",
     "NEW_INBOX": "Nova caixa de entrada",
-    "REPORTS_OVERVIEW": "Visão geral",
+    "REPORTS_CONVERSATION": "Conversas",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campanhas",
     "ONGOING": "Em andamento",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Caixa de Entrada",
     "REPORTS_TEAM": "Times",
     "SET_AVAILABILITY_TITLE": "Defina como",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Visão geral"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ah oh! Não conseguimos encontrar nenhuma conta. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
index ade19e053..a0c4ae1b8 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Senha",
       "PLACEHOLDER": "Senha",
-      "ERROR": "A senha é muito curta"
+      "ERROR": "A senha é muito curta",
+      "IS_INVALID_PASSWORD": "A senha deve conter pelo menos 1 letra maiúscula, 1 letra minúscula, 1 número e 1 caractere especial"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirme a senha",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
index 0fc7e7dd3..6f982b469 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "Selecionar todos os agentes",
       "SELECTED_COUNT": "%{selected} de %{total} agentes selecionados.",
       "BUTTON_TEXT": "Adicionar agentes",
-      "AGENT_VALIDATION_ERROR": "Selecione pelo menos um agente"
+      "AGENT_VALIDATION_ERROR": "Selecione pelo menos um agente."
     },
     "FINISH": {
       "TITLE": "Sua caixa de entrada está pronta!",
diff --git a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
index 96f37958f..b4d5ce726 100644
--- a/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ro/advancedFilters.json
@@ -1,91 +1,91 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Filtrarea conversațiilor",
+    "SUBTITLE": "Adăugați filtre mai jos și apăsați pe \"Aplicați filtre\" pentru a filtra conversațiile.",
+    "ADD_NEW_FILTER": "Adăugare filtru",
+    "FILTER_DELETE_ERROR": "Ar trebui să aveți atleast un filtru pentru a salva",
+    "SUBMIT_BUTTON_LABEL": "Aplicarea filtrelor",
     "CANCEL_BUTTON_LABEL": "Renunță",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Elimină filtre",
+    "EMPTY_VALUE_ERROR": "Este necesară o valoare validă",
+    "TOOLTIP_LABEL": "Filtrarea conversațiilor",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "ȘI",
+      "OR": "SAU"
     },
     "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"
+      "equal_to": "Egal cu",
+      "not_equal_to": "Nu este egal cu",
+      "contains": "Conține",
+      "does_not_contain": "Nu conține",
+      "is_present": "Este prezent",
+      "is_not_present": "Nu este prezent",
+      "is_greater_than": "Este mai mare decât",
+      "is_less_than": "Este mai mică decât",
+      "days_before": "Este x zile înainte"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "Adevărat",
+      "FALSE": "Fals"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Nume cesionar",
       "INBOX_NAME": "Nume Inbox",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Numele echipei",
+      "CONVERSATION_IDENTIFIER": "Identificator de conversație",
+      "CAMPAIGN_NAME": "Numele campaniei",
       "LABELS": "Etichete",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "BROWSER_LANGUAGE": "Limba browserului",
+      "COUNTRY_NAME": "Numele țării",
+      "REFERER_LINK": "Link referer",
+      "CUSTOM_ATTRIBUTE_LIST": "Listă",
       "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Număr",
+      "CUSTOM_ATTRIBUTE_LINK": "Legătură",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Căsuță de bifat",
+      "CREATED_AT": "Creat la",
       "LAST_ACTIVITY": "Ultima activitate"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Filtre standard",
+      "ADDITIONAL_FILTERS": "Filtre suplimentare",
       "CUSTOM_ATTRIBUTES": "Editează atribut personalizat"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
+        "TITLE": "Doriți să salvați acest filtru?",
+        "LABEL": "Denumiți acest filtru",
+        "PLACEHOLDER": "Introduceți un nume pentru acest filtru",
         "ERROR_MESSAGE": "Numele este obligatoriu",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "Salvare filtru",
         "CANCEL_BUTTON": "Renunță",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Folder creat cu succes",
+          "ERROR_MESSAGE": "Eroare la crearea folderului"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Segment creat cu succes",
+          "ERROR_MESSAGE": "Eroare la crearea segmentului"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Ștergere filtru",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Confirmă ștergerea",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Sunteți sigur că ștergeți filtrul ",
             "YES": "Da, șterge",
             "NO": "Nu, păstreaza"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Folder șters cu succes",
+          "ERROR_MESSAGE": "Eroare la ștergerea folderului"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Contact șters cu succes",
+          "ERROR_MESSAGE": "Eroare la ștergerea segmentului"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
index 1d0d44fa8..84c2da9bd 100644
--- a/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/agentMgmt.json
@@ -93,19 +93,19 @@
       "NO_RESULTS": "Niciun rezultat găsit."
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "Nimic",
       "TITLE": {
-        "AGENT": "Select agent",
-        "TEAM": "Select team"
+        "AGENT": "Selectați agentul",
+        "TEAM": "Selectați echipa"
       },
       "SEARCH": {
         "NO_RESULTS": {
           "AGENT": "Niciun agent găsit",
-          "TEAM": "No teams found"
+          "TEAM": "Nu au fost găsite echipe"
         },
         "PLACEHOLDER": {
-          "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "AGENT": "Agenți de căutare",
+          "TEAM": "Echipele de căutare"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
index ccc9676fe..67eb28a0a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/attributesMgmt.json
@@ -1,17 +1,17 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Editează atribut personalizat",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
-    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "HEADER_BTN_TXT": "Adauga atributii personalizate",
+    "LOADING": "Preluarea atributelor particularizate",
+    "SIDEBAR_TXT": "<p><b>Atribute personalizate</b> <p>Un atribut personalizat urmărește fapte despre persoanele de contact/conversație - cum ar fi planul de abonament sau când au comandat primul element etc. <br /><br />Pentru a crea un atribut personalizat, trebuie doar să faceți clic pe <b>Adăugare atribut personalizat.</b> De asemenea, puteți edita sau șterge un atribut personalizat existent făcând clic pe butonul Editare sau Ștergere.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "Adauga atributii personalizate",
       "SUBMIT": "Creeaza",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "FORM": {
         "NAME": {
           "LABEL": "Nume afișat",
-          "PLACEHOLDER": "Enter custom attribute display name",
+          "PLACEHOLDER": "Introducerea numelui afișat al atributului personalizat",
           "ERROR": "Numele este obligatoriu"
         },
         "DESC": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/automation.json b/app/javascript/dashboard/i18n/locale/ro/automation.json
index 7583ceb78..139f521bf 100644
--- a/app/javascript/dashboard/i18n/locale/ro/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/automation.json
@@ -1,54 +1,54 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automations",
+    "HEADER": "Automatizari",
     "HEADER_BTN_TXT": "Adaugă Regulă de Automatizare",
-    "LOADING": "Fetching automation rules",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "LOADING": "Preluarea regulilor de automatizare",
+    "SIDEBAR_TXT": "<p><b>Reguli de automatizare</b> <p>Automatizarea poate înlocui și automatiza procesele existente care necesită efort manual. Puteți face multe lucruri cu automatizarea, inclusiv adăugarea de etichete și atribuirea conversației celui mai bun agent. Astfel, echipa se concentrează pe ceea ce face cel mai bine și petrece mai mult timp pe sarcini manuale.</p>",
     "ADD": {
       "TITLE": "Adaugă Regulă de Automatizare",
       "SUBMIT": "Creeaza",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
+          "LABEL": "Nume Regulă",
+          "PLACEHOLDER": "Introduceți numele regulii",
           "ERROR": "Numele este obligatoriu"
         },
         "DESC": {
           "LABEL": "Descriere",
-          "PLACEHOLDER": "Enter rule description",
+          "PLACEHOLDER": "Introduceți descrierea regulii",
           "ERROR": "Descrierea este obligatorie"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "Eveniment",
           "PLACEHOLDER": "Vă rugăm să selectaţi un tip",
-          "ERROR": "Event is required"
+          "ERROR": "Evenimentul este necesar"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Condiții"
         },
         "ACTIONS": {
           "LABEL": "Actiuni"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Adauga condiţie",
+      "ACTION_BUTTON_LABEL": "Adăugare acțiune",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Regulă de automatizare adăugată cu succes",
+        "ERROR_MESSAGE": "Nu s-a putut crea o regulă de automatizare, Încercați din nou mai târziu"
       }
     },
     "LIST": {
       "TABLE_HEADER": [
         "Nume",
         "Descriere",
-        "Active",
-        "Created on"
+        "Activ",
+        "Creat in"
       ],
-      "404": "No automation rules found"
+      "404": "Nu s-au găsit reguli de automatizare"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "Ștergeți regula de automatizare",
       "SUBMIT": "Şterge",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "CONFIRM": {
@@ -58,24 +58,24 @@
         "NO": "Nu, păstreaza"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Regula de automatizare ștearsă cu succes",
+        "ERROR_MESSAGE": "Nu a putut șterge o regulă de automatizare, Încercați din nou mai târziu"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "Editarea regulii de automatizare",
       "SUBMIT": "Actualizare",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Regula de automatizare actualizată cu succes",
+        "ERROR_MESSAGE": "Nu s-a putut actualiza regula de automatizare, Încercați din nou mai târziu"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Clonare",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Automatizare clonată cu succes",
+        "ERROR_MESSAGE": "Nu s-a putut clona regula de automatizare, Încercați din nou mai târziu"
       }
     },
     "FORM": {
@@ -83,25 +83,34 @@
       "CREATE": "Creeaza",
       "DELETE": "Şterge",
       "CANCEL": "Renunță",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "Modificarea tipului de eveniment va reseta condițiile și evenimentele pe care le-ați adăugat mai jos"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+      "DELETE_MESSAGE": "Trebuie să aveți atleast o condiție pentru a salva"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "DELETE_MESSAGE": "Trebuie să aveți atleast o acțiune pentru a salva",
+      "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"
+      "ACTIVATION_TITLE": "Activați regula de automatizare",
+      "DEACTIVATION_TITLE": "Dezactivați regula de automatizare",
+      "ACTIVATION_DESCRIPTION": "Această acțiune va activa regula de automatizare \"{automationName}\". Sunteți sigur că doriți să continuați?",
+      "DEACTIVATION_DESCRIPTION": "Această acțiune va dezactiva regula de automatizare \"{automationName}\". Sunteți sigur că doriți să continuați?",
+      "ACTIVATION_SUCCESFUL": "Regulă de automatizare activată cu succes",
+      "DEACTIVATION_SUCCESFUL": "Regula de automatizare dezactivată cu succes",
+      "ACTIVATION_ERROR": "Nu s-a putut activa automatizarea, încercați din nou mai târziu",
+      "DEACTIVATION_ERROR": "Nu s-a putut dezactiva automatizarea, încercați din nou mai târziu",
+      "CONFIRMATION_LABEL": "Da",
+      "CANCEL_LABEL": "Nu"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Încărcare...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/campaign.json b/app/javascript/dashboard/i18n/locale/ro/campaign.json
index d865252a4..c9df336fb 100644
--- a/app/javascript/dashboard/i18n/locale/ro/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ro/campaign.json
@@ -105,22 +105,22 @@
       "STATUS": {
         "ENABLED": "Activat",
         "DISABLED": "Dezactivat",
-        "COMPLETED": "Completed",
-        "ACTIVE": "Active"
+        "COMPLETED": "Finalizată",
+        "ACTIVE": "Activ"
       },
       "SENDER": {
         "BOT": "Bot"
       }
     },
     "ONE_OFF": {
-      "HEADER": "One off campaigns",
-      "404": "There are no one off campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an sms inbox and start adding campaigns"
+      "HEADER": "Campanii unice",
+      "404": "Nu există o singură campanie creată",
+      "INBOXES_NOT_FOUND": "Vă rugăm să creați un inbox sms și să începeți să adăugați campanii"
     },
     "ONGOING": {
-      "HEADER": "Ongoing campaigns",
-      "404": "There are no ongoing campaigns created",
-      "INBOXES_NOT_FOUND": "Please create an website inbox and start adding campaigns"
+      "HEADER": "Campanii în curs de desfășurare",
+      "404": "Nu există campanii în curs de desfășurare create",
+      "INBOXES_NOT_FOUND": "Vă rugăm să creați un inbox de site web și să începeți să adăugați campanii"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
index adf9b60a2..4066ec2b4 100644
--- a/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Adauga Răspunsuri predefinite",
     "LOADING": "Preluarea Răspunsuri predefinite",
     "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
-    "SIDEBAR_TXT": "<p><b>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>Răspunsuri conservate</b> </p><p> Răspunsurile conservate sunt șabloane de răspuns salvate care pot fi utilizate pentru a trimite rapid un răspuns la o conversație. </p><p> Pentru a crea un răspuns conservat, trebuie doar să faceți clic pe <b>Adăugare răspuns conservat</b>. De asemenea, puteți edita sau șterge un răspuns conservat existent făcând clic pe butonul Editare sau Ștergere </p><p> Răspunsurile conservate sunt utilizate cu ajutorul <b>codurilor scurte</b>. Agenții pot accesa răspunsurile conservate în timp ce se află pe un chat tastând <b>\"/\"</b> urmat de codul scurt. </p>",
     "LIST": {
       "404": "Nu există răspunsuri predefinite disponibile în acest cont.",
       "TITLE": "Gestionare Răspunsuri predefinite",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Adauga Răspunsuri predefinite",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Răspunsurile conservate sunt salvate șabloane de răspuns care pot fi utilizate pentru a trimite rapid răspuns la conversație.",
       "CANCEL_BUTTON_TEXT": "Renunță",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Cod scurt",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "Vă rugăm să introduceți un cod scurt",
           "ERROR": "Codul scurt este necesar"
         },
         "CONTENT": {
@@ -69,7 +69,7 @@
         "TITLE": "Confirmă ștergerea",
         "MESSAGE": "Sigur doriți să ștergeți",
         "YES": "Da, șterge ",
-        "NO": "Nu, păstreaza"
+        "NO": "Nu, păstreaza "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/chatlist.json b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
index ede633abc..6525c0bd1 100644
--- a/app/javascript/dashboard/i18n/locale/ro/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
@@ -7,7 +7,7 @@
       "404": "Nu sunt conversații active în acest grup."
     },
     "TAB_HEADING": "Conversații",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Mențiuni",
     "SEARCH": {
       "INPUT": "Caută persoane, conversații, răspunsuri salvate .."
     },
@@ -47,7 +47,7 @@
         "TEXT": "Rezolvat"
       },
       "pending": {
-        "TEXT": "Asteptare"
+        "TEXT": "În aşteptare"
       },
       "snoozed": {
         "TEXT": "Amânat"
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "Primit prin e-mail",
     "VIEW_TWEET_IN_TWITTER": "Vezi tweet pe Twitter",
     "REPLY_TO_TWEET": "Răspunde la acest tweet",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Accesați povestea Instagram",
     "SENT": "Trimis cu succes",
     "NO_MESSAGES": "Niciun mesaj",
     "NO_CONTENT": "Nici un conținut disponibil",
     "HIDE_QUOTED_TEXT": "Ascunde textul citat",
-    "SHOW_QUOTED_TEXT": "Arată textul citat"
+    "SHOW_QUOTED_TEXT": "Arată textul citat",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 0dbdb6e82..2bb6a438a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -37,7 +37,7 @@
     "CONTACT_ACTIONS": "Acțiuni contact",
     "MUTE_CONTACT": "Silențios conversația",
     "UNMUTE_CONTACT": "Sunet conversația",
-    "MUTED_SUCCESS": "Această conversație este silentioasa pentru 6 ore",
+    "MUTED_SUCCESS": "Această conversație este dezactivată pentru 6 ore",
     "UNMUTED_SUCCESS": "Această conversație este reactivată",
     "SEND_TRANSCRIPT": "Trimite Transcriere",
     "EDIT_LABEL": "Editare",
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacte salvate cu succes",
     "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Confirmă ștergerea",
+      "MESSAGE": "Doriți să ștergeți această notă?",
+      "YES": "Da, șterge ",
+      "NO": "Nu, păstreaza"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Șterge contact",
     "TITLE": "Șterge contact",
@@ -78,7 +86,7 @@
       "TITLE": "Confirmă ștergerea",
       "MESSAGE": "Sigur doriți să ștergeți ",
       "YES": "Da, șterge",
-      "NO": "No, Keep"
+      "NO": "Nu, păstreaza"
     },
     "API": {
       "SUCCESS_MESSAGE": "Contact șters cu succes",
@@ -110,7 +118,7 @@
         "LABEL": "Număr de telefon",
         "HELP": "Numărul de telefon trebuie să aibă formatul E.164, ex. +1415555555 [+][country code][area code][local phone number]",
         "ERROR": "Numărul de telefon trebuie să fie gol sau in format E.164",
-        "DUPLICATE": "This phone number is in use for another contact."
+        "DUPLICATE": "Acest număr de telefon este utilizat pentru o altă persoană de contact."
       },
       "LOCATION": {
         "PLACEHOLDER": "Introduceți locația contactului",
@@ -149,7 +157,7 @@
     "NO_INBOX": "Nu s-a putut găsi un inbox pentru a iniția o nouă conversație cu acest contact.",
     "FORM": {
       "TO": {
-        "LABEL": "către"
+        "LABEL": "Către"
       },
       "INBOX": {
         "LABEL": "Inbox",
@@ -177,9 +185,9 @@
     "FIELDS": "Câmpuri de contact",
     "SEARCH_BUTTON": "Caută",
     "SEARCH_INPUT_PLACEHOLDER": "Caută contacte",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS": "Filtru",
+    "FILTER_CONTACTS_SAVE": "Salvare filtru",
+    "FILTER_CONTACTS_DELETE": "Ștergere filtru",
     "LIST": {
       "LOADING_MESSAGE": "Se încarcă contactele...",
       "404": "Niciun contact nu se potrivește cu căutarea ta 🔍",
@@ -219,7 +227,7 @@
       "TITLE": "Notițe"
     },
     "LIST": {
-      "LABEL": "Notă adaugată"
+      "LABEL": "notă adaugată"
     },
     "ADD": {
       "BUTTON": "Adaugă",
@@ -255,7 +263,7 @@
       "DESC": "Adăugați informații personalizate acestui contact."
     },
     "FORM": {
-      "CREATE": "Adaugă atributii",
+      "CREATE": "Adaugă atribut",
       "CANCEL": "Renunță",
       "NAME": {
         "LABEL": "Nume atribut personalizat",
@@ -280,14 +288,14 @@
         "ERROR": "Imposibil de șters atributul. Vă rugăm să încercați din nou mai târziu"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Adaugă atributii",
-        "PLACEHOLDER": "Cauta atributii",
-        "NO_RESULT": "Nu s-au găsit atributii"
+        "TITLE": "Adaugă atribute",
+        "PLACEHOLDER": "Cauta atribute",
+        "NO_RESULT": "Nu s-au găsit atribute"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
           "PLACEHOLDER": "Selectați valoarea",
-          "SEARCH_INPUT_PLACEHOLDER": "Valoarea de cautare",
+          "SEARCH_INPUT_PLACEHOLDER": "Valoarea căutării",
           "NO_RESULT": "Niciun rezultat găsit"
         }
       }
@@ -324,7 +332,7 @@
         "ERROR": "Selectați un contact copil pentru a imbina"
       },
       "SUCCESS_MESSAGE": "Contact unit cu succes",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "ERROR_MESSAGE": "Contactele nu au putut fi îmbinate, încercați din nou!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contactFilters.json b/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
index 0d9543a31..e1e2e25e5 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contactFilters.json
@@ -1,48 +1,48 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "Filtrarea persoanelor de contact",
+        "SUBTITLE": "Adăugați filtre mai jos și apăsați pe \"Aplicați filtre\" pentru a filtra conversațiile.",
+        "ADD_NEW_FILTER": "Adăugare filtru",
+        "CLEAR_ALL_FILTERS": "Şterge toate filtrele",
+        "FILTER_DELETE_ERROR": "Ar trebui să aveți atleast un filtru pentru a salva",
         "SUBMIT_BUTTON_LABEL": "Trimite",
         "CANCEL_BUTTON_LABEL": "Renunță",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "Elimină filtre",
+        "EMPTY_VALUE_ERROR": "Este necesară o valoare validă",
+        "TOOLTIP_LABEL": "Filtrarea persoanelor de contact",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "ȘI",
+            "OR": "SAU"
         },
         "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"
+            "equal_to": "Egal cu",
+            "not_equal_to": "Nu este egal cu",
+            "contains": "Conține",
+            "does_not_contain": "Nu conține",
+            "is_present": "Este prezent",
+            "is_not_present": "Nu este prezent",
+            "is_greater_than": "Este mai mare decât",
+            "is_lesser_than": "Este mai mică decât",
+            "days_before": "Este x zile înainte"
         },
         "ATTRIBUTES": {
             "NAME": "Nume",
             "EMAIL": "Email",
             "PHONE_NUMBER": "Număr de telefon",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "Identificator",
             "CITY": "Oraș",
             "COUNTRY": "Țară",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_LIST": "Listă",
             "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-            "CREATED_AT": "Created At",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Număr",
+            "CUSTOM_ATTRIBUTE_LINK": "Legătură",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Căsuță de bifat",
+            "CREATED_AT": "Creat la",
             "LAST_ACTIVITY": "Ultima activitate"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Filtre standard",
+            "ADDITIONAL_FILTERS": "Filtre suplimentare",
             "CUSTOM_ATTRIBUTES": "Editează atribut personalizat"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index e4fafa93a..aacc7f172 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -22,8 +22,8 @@
     "LOADING_CONVERSATIONS": "Încărcare conversații",
     "CANNOT_REPLY": "Nu poți răspunde din cauza",
     "24_HOURS_WINDOW": "Restricţie fereastră mesaj 24 de ore",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "NOT_ASSIGNED_TO_YOU": "Această conversație nu vă este atribuită. Doriți să vă atribuiți această conversație?",
+    "ASSIGN_TO_ME": "Atribuie-mi",
     "TWILIO_WHATSAPP_CAN_REPLY": "Poți răspunde la această conversație doar folosind un mesaj șablon datorat",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "Restricţie fereastră mesaj 24 de ore",
     "SELECT_A_TWEET_TO_REPLY": "Te rugăm să selectezi un tweet pentru a răspunde.",
@@ -57,13 +57,13 @@
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "Semnătura mesajului",
+      "ENABLE_SIGN_TOOLTIP": "Activarea semnăturii",
+      "DISABLE_SIGN_TOOLTIP": "Dezactivarea semnăturii",
       "MSG_INPUT": "Shift + enter pentru linie nouă. Începe cu '/' pentru a selecta un răspuns predeterminat.",
       "PRIVATE_MSG_INPUT": "Shift + enter pentru linie nouă. Acest lucru va fi vizibil doar pentru Agenți",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Semnătura mesajului nu este configurată, vă rugăm să o configurați în setările profilului.",
+      "CLICK_HERE": "Click aici pentru a actualiza"
     },
     "REPLYBOX": {
       "REPLY": "Răspunde",
@@ -72,15 +72,15 @@
       "CREATE": "Adaugă Notă",
       "TWEET": "Tweet",
       "TIP_FORMAT_ICON": "Arată editorul de text",
-      "TIP_EMOJI_ICON": "Arată emoji",
+      "TIP_EMOJI_ICON": "Arată selectorul emoji",
       "TIP_ATTACH_ICON": "Ataşează fişiere",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "TIP_AUDIORECORDER_ICON": "Înregistrare audio",
+      "TIP_AUDIORECORDER_PERMISSION": "Permiteți accesul la audio",
+      "TIP_AUDIORECORDER_ERROR": "Nu s-a putut deschide audio",
       "ENTER_TO_SEND": "Introduceţi pentru a trimite",
       "DRAG_DROP": "Trageți și plasați aici pentru atașare",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "START_AUDIO_RECORDING": "Pornirea înregistrării audio",
+      "STOP_AUDIO_RECORDING": "Mesaj audio",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Adaugă bcc",
@@ -104,8 +104,8 @@
     "MESSAGE_ERROR": "Mesajul nu poate fi trimis, te rugăm să încerci din nou mai târziu",
     "SENT_BY": "Trimis de:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Nu a putut trimite mesaj! Încearcă din nou",
+    "TRY_AGAIN": "Reîncercare",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Selectează agent",
       "REMOVE": "Elimină",
@@ -126,55 +126,55 @@
     "FORM": {
       "SEND_TO_CONTACT": "Trimite transcrierea către client",
       "SEND_TO_AGENT": "Trimite transcrierea către agentul atribuit",
-      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Această adresă de e-mail este folosită pentru un alt contact.",
       "EMAIL": {
-        "PLACEHOLDER": "Enter an email address",
+        "PLACEHOLDER": "Introduceți o adresă de e-mail",
         "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă"
       }
     }
   },
   "ONBOARDING": {
-    "TITLE": "Hey 👋, Welcome to %{installationName}!",
-    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
-    "READ_LATEST_UPDATES": "Read our latest updates",
+    "TITLE": "Hei 👋, Bine ati venit la %{installationName}!",
+    "DESCRIPTION": "Vă mulțumim pentru semnarea sus. Vrem să profitați la maximum de %{installationName}. Iată câteva lucruri pe care le puteți face în %{installationName} pentru a face experiența încântătoare.",
+    "READ_LATEST_UPDATES": "Citiți cele mai recente actualizări ale noastre",
     "ALL_CONVERSATION": {
-      "TITLE": "All your conversations in one place",
-      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+      "TITLE": "Toate conversațiile într-un singur loc",
+      "DESCRIPTION": "Vizualizați toate conversațiile de la clienți într-un singur tablou de bord. Puteți filtra conversațiile după canalul, eticheta și starea primite."
     },
     "TEAM_MEMBERS": {
-      "TITLE": "Invite your team members",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
-      "NEW_LINK": "Click here to invite a team member"
+      "TITLE": "Invită-ți membrii echipei",
+      "DESCRIPTION": "Din moment ce vă pregătiți să vorbiți cu clientul dvs., aduceți-vă coechipierii pentru a vă ajuta. Vă puteți invita colegii de echipă adăugând adresele lor de e-mail la lista de agenți.",
+      "NEW_LINK": "Faceți clic aici pentru a invita un membru al echipei"
     },
     "INBOXES": {
-      "TITLE": "Connect Inboxes",
-      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
-      "NEW_LINK": "Click here to create an inbox"
+      "TITLE": "Conectați casetele",
+      "DESCRIPTION": "Conectează diverse canale prin care clienții tăi ar vorbi cu tine. Poate fi un live-chat pe site, pagina ta de Facebook sau Twitter sau chiar numărul tău de WhatsApp.",
+      "NEW_LINK": "Click aici pentru a crea un 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"
+      "TITLE": "Organizarea conversațiilor cu etichete",
+      "DESCRIPTION": "Etichetele oferă o modalitate mai ușoară de a clasifica conversația. Creați unele etichete, cum ar fi #support-solicitare, #billing-întrebare etc., astfel încât să le puteți utiliza într-o conversație mai târziu.",
+      "NEW_LINK": "Click aici pentru a crea tag-uri"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "Assigned Agent",
-    "SELF_ASSIGN": "Assign to me",
-    "TEAM_LABEL": "Assigned Team",
+    "ASSIGNEE_LABEL": "Agent atribuit",
+    "SELF_ASSIGN": "Atribuie-mi",
+    "TEAM_LABEL": "Echipa desemnată",
     "SELECT": {
-      "PLACEHOLDER": "None"
+      "PLACEHOLDER": "Nimic"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONTACT_DETAILS": "Detalii contact",
+      "CONVERSATION_ACTIONS": "Acțiuni de conversație",
       "CONVERSATION_LABELS": "Etichete conversație",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONVERSATION_INFO": "Informații despre conversație",
+      "CONTACT_ATTRIBUTES": "Atribute Contacte",
       "PREVIOUS_CONVERSATION": "Conversații anterioare"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Creare atribut",
     "UPDATE": {
       "SUCCESS": "Atribut actualizat cu succes",
       "ERROR": "Imposibil de actualizat atributul. Vă rugăm să încercați din nou mai târziu"
@@ -195,10 +195,10 @@
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "către",
+    "FROM": "De la",
+    "TO": "Către",
     "BCC": "Bcc",
     "CC": "Cc",
-    "SUBJECT": "Subject"
+    "SUBJECT": "Subiect"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index 4af6f9dbf..9e2cea6a8 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID cont",
+        "NOTE": "Acest ID este necesar dacă construiți o integrare bazată pe API"
       },
       "NAME": {
         "LABEL": "Nume cont",
@@ -40,93 +40,101 @@
       "AUTO_RESOLVE_DURATION": {
         "LABEL": "Numărul de zile de pe bilet ar trebui să se rezolve automat dacă nu există activitate",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Vă rugăm să introduceți o durată validă de rezolvare automată (minim 1 zi și maximum 999 de zile)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "Continuitatea conversației cu e-mailurile este activată pentru contul dvs.",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "Puteți primi e-mailuri în domeniul dvs. personalizat acum."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
-    "LEARN_MORE": "Learn more"
+    "UPDATE_CHATWOOT": "Este disponibilă o actualizare %{latestChatwootVersion} pentru Chatwoot. Vă rugăm să actualizați instanța.",
+    "LEARN_MORE": "Află mai mult"
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Apăsați enter pentru a selecta",
+      "ENTER_TO_REMOVE": "Introduceți numele complet al persoanei de contact",
+      "SELECT_ONE": "Alege una"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "Notificări",
+    "MARK_ALL_DONE": "Marcați toate gata",
+    "DELETE_TITLE": "șterse",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Notificări necitite",
+      "ALL_NOTIFICATIONS": "Vizualizarea tuturor notificărilor",
+      "LOADING_UNREAD_MESSAGE": "Încărcarea notificărilor necitite...",
+      "EMPTY_MESSAGE": "Nu aveți notificări necitite"
+    },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Se încarcă contactele...",
+      "404": "Notificări prin e-mail",
       "TABLE_HEADER": [
         "Nume",
-        "Phone Number",
+        "Număr de telefon",
         "Conversații",
-        "Last Contacted"
+        "Ultimul contactat"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Conversație nouă",
+      "conversation_assignment": "Conversație atribuită",
+      "assigned_conversation_new_message": "Trimite mesaj nou",
+      "conversation_mention": "a menţiona"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "Oferit de Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Reîmprospătare"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Căutarea sau saltul la",
     "SECTIONS": {
       "GENERAL": "General",
       "REPORTS": "Rapoarte",
       "CONVERSATION": "Conversație",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CHANGE_ASSIGNEE": "Modificarea cesionarului",
+      "CHANGE_TEAM": "Schimbarea echipei",
+      "ADD_LABEL": "Adăugarea etichetei la conversație",
+      "REMOVE_LABEL": "Eliminarea etichetei din conversație",
       "SETTINGS": "Setări"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_CONVERSATION_DASHBOARD": "Accesați Tabloul de bord conversație",
+      "GO_TO_CONTACTS_DASHBOARD": "Accesați Tabloul de bord persoane de contact",
+      "GO_TO_REPORTS_OVERVIEW": "Accesați Prezentare generală a rapoartelor",
+      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
+      "GO_TO_AGENT_REPORTS": "Accesați povestea Instagram",
+      "GO_TO_LABEL_REPORTS": "Accesați Etichetarea rapoartelor",
+      "GO_TO_INBOX_REPORTS": "Accesați Rapoarte Inbox",
+      "GO_TO_TEAM_REPORTS": "Accesați Rapoarte de echipă",
+      "GO_TO_SETTINGS_AGENTS": "Accesați Setări agent",
+      "GO_TO_SETTINGS_TEAMS": "Accesați Setările echipei",
+      "GO_TO_SETTINGS_INBOXES": "Accesați Setări Inbox",
+      "GO_TO_SETTINGS_LABELS": "Accesați Setări etichetă",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "Accesați Setări răspuns conservat",
+      "GO_TO_SETTINGS_APPLICATIONS": "Accesați Setări aplicație",
+      "GO_TO_SETTINGS_ACCOUNT": "Accesați Setări cont",
+      "GO_TO_SETTINGS_PROFILE": "Accesați Setări profil",
+      "GO_TO_NOTIFICATIONS": "Accesați Notificări",
+      "ADD_LABELS_TO_CONVERSATION": "Adăugarea etichetei la conversație",
+      "ASSIGN_AN_AGENT": "Atribuirea unui agent",
+      "ASSIGN_A_TEAM": "Atribuirea unei echipe",
+      "MUTE_CONVERSATION": "Silențios conversația",
+      "UNMUTE_CONVERSATION": "Sunet conversația",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Eliminarea etichetei din conversație",
+      "REOPEN_CONVERSATION": "Redeschiderea conversației",
+      "RESOLVE_CONVERSATION": "Rezolvarea conversației",
+      "SEND_TRANSCRIPT": "Trimiterea unei transcrieri a e-mailului",
+      "SNOOZE_CONVERSATION": "Snooze conversație",
+      "UNTIL_NEXT_REPLY": "Până la următorul răspuns",
+      "UNTIL_NEXT_WEEK": "Până săptămâna viitoare",
+      "UNTIL_TOMORROW": "Până mâine"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 5c892cfb5..39e4ead6d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -30,7 +30,7 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "Nume Inbox",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "PLACEHOLDER": "Introduceți numele inboxului (de exemplu: Acme Inc)"
       },
       "WEBSITE_NAME": {
         "LABEL": "Nume website",
@@ -47,9 +47,9 @@
       },
       "TWITTER": {
         "HELP": "Pentru a vă adăuga profilul de Twitter ca si canal, trebuie să vă autentificați profilul de Twitter făcând clic pe \"Conectați-vă cu Twitter\" ",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "ERROR_MESSAGE": "A existat o eroare de conectare la Twitter, vă rugăm să încercați din nou",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Creați conversații din tweet-urile menționate"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -57,11 +57,11 @@
         "DESC": "Creați un canal pentru site-ul dvs. și începeți să asigurati suportul clienților prin intermediul widget-ului nostru web.",
         "LOADING_MESSAGE": "Crearea canalului de suport pe site",
         "CHANNEL_AVATAR": {
-          "LABEL": "avatar pentru canal"
+          "LABEL": "Avatar canal"
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "Introduceți adresa URL Webhook",
           "ERROR": "Te rog introdu un URL valid"
         },
         "CHANNEL_DOMAIN": {
@@ -82,16 +82,16 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Activare salut canal",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Trimiteți un mesaj de salut utilizatorilor atunci când încep conversația.",
           "ENABLED": "Activat",
           "DISABLED": "Dezactivat"
         },
         "REPLY_TIME": {
-          "TITLE": "Set Reply time",
-          "IN_A_FEW_MINUTES": "In a few minutes",
-          "IN_A_FEW_HOURS": "In a few hours",
-          "IN_A_DAY": "In a day",
-          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+          "TITLE": "Setarea orei de răspuns",
+          "IN_A_FEW_MINUTES": "În câteva minute",
+          "IN_A_FEW_HOURS": "În câteva ore",
+          "IN_A_DAY": "Într-o zi",
+          "HELP_TEXT": "Acest timp de răspuns va fi afișat pe widget-ul de chat live"
         },
         "WIDGET_COLOR": {
           "LABEL": "Culoare widget",
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "Crează inbox"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "Twilio SMS/Canal WhatsApp",
+        "DESC": "Integrați Twilio și începeți să vă sprijiniți clienții prin SMS sau WhatsApp.",
         "ACCOUNT_SID": {
           "LABEL": "Cont SID",
           "PLACEHOLDER": "Te rugăm să introduci ID-ul contului Twilio",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "Nume Inbox",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "Vă rugăm să introduceți un nume de inbox",
           "ERROR": "Acest câmp este obligatoriu"
         },
         "PHONE_NUMBER": {
@@ -136,40 +136,40 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "Canal SMS",
+        "DESC": "Începeți să vă sprijiniți clienții prin SMS.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Furnizor API",
           "TWILIO": "Twilio",
-          "BANDWIDTH": "Bandwidth"
+          "BANDWIDTH": "Banda"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Nu am reușit să salvăm canalul SMS"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "LABEL": "ID cont",
+            "PLACEHOLDER": "Vă rugăm să introduceți ID-ul contului de lățime de bandă",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "Cheie API",
+            "PLACEHOLDER": "Vă rugăm să introduceți cheia API Bandwith",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "LABEL": "API secret",
+            "PLACEHOLDER": "Vă rugăm să introduceți Bandwith API Secret",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "ID Aplicaţie",
+            "PLACEHOLDER": "Vă rugăm să introduceți ID-ul aplicației lățimea de bandă",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "INBOX_NAME": {
             "LABEL": "Nume Inbox",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "Vă rugăm să introduceți un nume de inbox",
             "ERROR": "Acest câmp este obligatoriu"
           },
           "PHONE_NUMBER": {
@@ -177,27 +177,27 @@
             "PLACEHOLDER": "Introduceți numărul de telefon de la care va fi trimis mesajul.",
             "ERROR": "Introduceți o valoare validă. Numărul de telefon ar trebui să înceapă cu semnul `+`."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Creați un canal de lățime de bandă",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Nu am reușit să autentificăm acreditările de lățime de bandă, vă rugăm să încercați din nou"
           },
           "API_CALLBACK": {
             "TITLE": "Callback URL",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "Trebuie să configurați URL-ul de apelare inversă a mesajului în Lățime de bandă cu URL-ul menționat aici."
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "Canalul WhatsApp",
+        "DESC": "Începeți să vă sprijiniți clienții prin WhatsApp.",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "Furnizor API",
           "TWILIO": "Twilio",
           "360_DIALOG": "360Dialog"
         },
         "INBOX_NAME": {
           "LABEL": "Nume Inbox",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "Vă rugăm să introduceți un nume de inbox",
           "ERROR": "Acest câmp este obligatoriu"
         },
         "PHONE_NUMBER": {
@@ -206,20 +206,20 @@
           "ERROR": "Introduceți o valoare validă. Numărul de telefon ar trebui să înceapă cu semnul `+`."
         },
         "API_KEY": {
-          "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
-          "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "LABEL": "Cheie API",
+          "SUBTITLE": "Configurați cheia API WhatsApp.",
+          "PLACEHOLDER": "Cheie API",
+          "APPLY_FOR_ACCESS": "Nu aveți nicio cheie API? Aplicați pentru acces aici",
+          "ERROR": "Vă rugăm să introduceți o valoare validă."
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "Creați canalul WhatsApp",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "Nu am reușit să salvăm canalul WhatsApp"
         }
       },
       "API_CHANNEL": {
         "TITLE": "Canal API",
-        "DESC": "Integrate with API channel and start supporting your customers.",
+        "DESC": "Integrați-vă cu canalul API și începeți să vă sprijiniți clienții.",
         "CHANNEL_NAME": {
           "LABEL": "Nume canal",
           "PLACEHOLDER": "Te rugăm să introduci un conținut",
@@ -227,7 +227,7 @@
         },
         "WEBHOOK_URL": {
           "LABEL": "URL Webhook",
-          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "SUBTITLE": "Configurați adresa URL în cazul în care doriți să primiți apeluri inverse pentru evenimente.",
           "PLACEHOLDER": "URL Webhook"
         },
         "SUBMIT_BUTTON": "Creare canal API",
@@ -237,7 +237,7 @@
       },
       "EMAIL_CHANNEL": {
         "TITLE": "Canal de e-mail",
-        "DESC": "Integrate you email inbox.",
+        "DESC": "Integrați-vă inboxul de e-mail.",
         "CHANNEL_NAME": {
           "LABEL": "Nume canal",
           "PLACEHOLDER": "Te rugăm să introduci un conținut",
@@ -255,56 +255,56 @@
         "FINISH_MESSAGE": "Începeți să vă trimiteți e-mailuri la următoarea adresă de e-mail."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "Canal LINE",
+        "DESC": "Integrați-vă cu canalul LINE și începeți să vă sprijiniți clienții.",
         "CHANNEL_NAME": {
           "LABEL": "Nume canal",
           "PLACEHOLDER": "Te rugăm să introduci un conținut",
           "ERROR": "Acest câmp este obligatoriu"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "ID-ul canalului LINE",
+          "PLACEHOLDER": "ID-ul canalului LINE"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Secret canal LINE",
+          "PLACEHOLDER": "Secret canal LINE"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Token canal LINE",
+          "PLACEHOLDER": "Token canal LINE"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Crearea canalului LINE",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "Nu am reușit să salvăm canalul LINE"
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "SUBTITLE": "Trebuie să configurați URL-ul webhook în aplicația LINE cu URL-ul menționat aici."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Canal Telegram",
+        "DESC": "Integrați-vă cu canalul Telegram și începeți să vă sprijiniți clienții.",
         "BOT_TOKEN": {
-          "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
-          "PLACEHOLDER": "Bot Token"
+          "LABEL": "Token de bot",
+          "SUBTITLE": "Configurați simbolul bot pe care l-ați obținut de la Telegram BotFather.",
+          "PLACEHOLDER": "Token de bot"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Creați canal Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "Nu am reușit să salvăm canalul de telegramă"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "Alege un canal",
+        "DESC": "Chatwoot acceptă widget live-chat, pagina de Facebook, profilul Twitter, WhatsApp, e-mail etc., ca și canale. Dacă doriți să construiți un canal personalizat, îl puteți crea folosind canalul API. Selectați un canal din opțiunile de mai jos pentru a continua."
       },
       "AGENTS": {
         "TITLE": "Agenți",
         "DESC": "Aici puteți adăuga agenți care să gestioneze inboxul nou creat. Numai acești agenți selectați vor avea acces la căsuța poștală. Agenții care nu fac parte din această căsuță poștală nu vor putea vedea sau răspunde la mesajele din această căsuță atunci când se autentifică. <br> <b>PS:</b> În calitate de administrator, dacă aveţi nevoie de acces la toate mesajele, ar trebui să vă adăugați ca agent la toate cutiile de mesaje pe care le creați.",
-        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
-        "PICK_AGENTS": "Pick agents for the inbox"
+        "VALIDATION_ERROR": "Adăugați cel puțin un agent în noul Inbox",
+        "PICK_AGENTS": "Alegerea agenților pentru inbox"
       },
       "DETAILS": {
         "TITLE": "Detalii inbox",
@@ -330,7 +330,7 @@
       "TITLE": "Inbox-ul este gata!",
       "MESSAGE": "Acum poți intra în contact cu clienții tăi prin noul tău Canal. Suport fericit ",
       "BUTTON_TEXT": "Du-mă acolo",
-      "MORE_SETTINGS": "More settings",
+      "MORE_SETTINGS": "Mai multe setări",
       "WEBSITE_SUCCESS": "Ați finalizat cu succes crearea unui canal web. Copiați codul de mai jos și inserati-l pe site-ul dvs. Data viitoare când un client folosește conversația live, conversația va apărea automat pe căsuța poștală."
     },
     "REAUTH": "Reautorizează",
@@ -362,39 +362,40 @@
         "DISABLED": "Dezactivat"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Permite"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Şterge",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Șterge avatarul",
       "CONFIRM": {
         "TITLE": "Confirmă ștergerea",
         "MESSAGE": "Sigur doriți să ștergeți ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "Vă rugăm să tastați {inboxName} pentru a confirma",
         "YES": "Da, șterge ",
         "NO": "Nu, păstreaza"
       },
       "API": {
         "SUCCESS_MESSAGE": "Inbox șters cu succes",
         "ERROR_MESSAGE": "Nu s-a putut șterge inbox-ul. Vă rugăm să încercați din nou mai târziu.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "Avatar inbox șters cu succes",
+        "AVATAR_ERROR_MESSAGE": "Nu s-a putut șterge avatarul inboxului. Încercați din nou mai târziu."
       }
     },
     "TABS": {
       "SETTINGS": "Setări",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
+      "COLLABORATORS": "Colaboratori",
+      "CONFIGURATION": "Configurare",
       "CAMPAIGN": "Campanii",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "PRE_CHAT_FORM": "Formular pre chat",
+      "BUSINESS_HOURS": "Program de lucru"
     },
     "SETTINGS": "Setări",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "Caracteristici",
+      "DISPLAY_FILE_PICKER": "Afișarea selectorului de fișiere pe widget",
+      "DISPLAY_EMOJI_PICKER": "Afișarea selectorului de emoji pe widget",
+      "ALLOW_END_CONVERSATION": "Permite utilizatorilor să încheie conversația din widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Script Messenger",
@@ -402,118 +403,128 @@
       "INBOX_AGENTS": "Agenți",
       "INBOX_AGENTS_SUB_TEXT": "Adaugă sau elimină agenți din acest inbox",
       "UPDATE": "Actualizare",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX": "Caseta Activare colectare e-mail",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Caseta Activarea sau dezactivarea colectării e-mailurilor în conversația nouă",
       "AUTO_ASSIGNMENT": "Activare atribuire automată",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "ENABLE_CSAT": "Activați CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Activați/dezactivați sondajul CSAT (Satisfacția clienților) după rezolvarea unei conversații",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Activați continuitatea conversației prin e-mail",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversațiile vor continua prin e-mail dacă adresa de e-mail de contact este disponibilă.",
       "INBOX_UPDATE_TITLE": "Setări Inbox",
       "INBOX_UPDATE_SUB_TEXT": "Actualizează setările de inbox",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activează sau dezactivează atribuirea automată a conversațiilor noi la agenții adăugați la această căsuță poștală.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "HMAC_VERIFICATION": "Validarea identității utilizatorului",
+      "HMAC_DESCRIPTION": "Pentru a valida identitatea utilizatorului, SDK-ul vă permite să treceți un \"identifier_hash\" pentru fiecare utilizator. Puteți genera HMAC folosind \"sha256\" cu cheia afișată aici.",
+      "HMAC_MANDATORY_VERIFICATION": "Impuneți validarea identității utilizatorului",
+      "HMAC_MANDATORY_DESCRIPTION": "Dacă este activată, metoda chatwoot SDK setUser nu va funcționa decât dacă \"identifier_hash\" este furnizată pentru fiecare utilizator.",
+      "INBOX_IDENTIFIER": "Identificator inbox",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Utilizați simbolul \"inbox_identifier\" afișat aici pentru a vă autentifica clienții API.",
+      "FORWARD_EMAIL_TITLE": "Redirecționare către e-mail",
       "FORWARD_EMAIL_SUB_TEXT": "Începeți să vă trimiteți e-mailuri la următoarea adresă de e-mail.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Permiteți rezolvarea mesajelor după ce conversația a fost rezolvată",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Permiteți utilizatorilor finali să trimită mesaje chiar și după rezolvarea conversației."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Reautorizează",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
+      "SUBTITLE": "Conexiunea ta de Facebook a expirat, te rugăm să-ți reconectezi pagina de Facebook pentru a continua serviciile",
+      "MESSAGE_SUCCESS": "Reconectarea cu succes",
       "MESSAGE_ERROR": "A apărut o eroare, încercați din nou"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "Formularele pre-chat vă permit să capturați informații despre utilizatori înainte de a începe conversația cu dvs.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Cheie",
+        "TYPE": "Tip",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "Activați formularul de pre chat",
         "OPTIONS": {
-          "ENABLED": "Yes",
-          "DISABLED": "No"
+          "ENABLED": "Da",
+          "DISABLED": "Nu"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "Pre chat message",
+        "PLACEHOLDER": "Acest mesaj ar fi vizibil pentru utilizatori împreună cu formularul"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "Vizitatorii ar trebui să furnizeze numele și adresa lor de e-mail înainte de a începe chat-ul"
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
-      "WEEKLY_TITLE": "Set your weekly hours",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TITLE": "Setați-vă disponibilitatea",
+      "SUBTITLE": "Setați-vă disponibilitatea pe widget-ul livechat",
+      "WEEKLY_TITLE": "Setarea orelor săptămânale",
+      "TIMEZONE_LABEL": "Selectați fusul orar",
+      "UPDATE": "Actualizarea setărilor orelor de lucru",
+      "TOGGLE_AVAILABILITY": "Activați disponibilitatea afacerii pentru acest inbox",
+      "UNAVAILABLE_MESSAGE_LABEL": "Mesaj indisponibil pentru vizitatori",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "Suntem indisponibili în acest moment. Lăsați un mesaj la care vom răspunde după ce ne vom întoarce.",
+      "TOGGLE_HELP": "Activarea disponibilității afacerii va afișa orele disponibile pe widget-ul de chat live, chiar dacă toți agenții sunt offline. În afara orelor disponibile, vizitorii pot fi avertizați cu un mesaj și un formular de pre-chat.",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
-        "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "ENABLE": "Activați disponibilitatea pentru această zi",
+        "UNAVAILABLE": "Indisponibil",
+        "HOURS": "ore",
+        "VALIDATION_ERROR": "Ora de începere ar trebui să fie înainte de ora închiderii.",
+        "CHOOSE": "Alege"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "Toată ziua"
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Setarea detaliilor IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
+      "UPDATE": "Actualizarea setărilor IMAP",
+      "TOGGLE_AVAILABILITY": "Activarea configurației IMAP pentru acest inbox",
+      "TOGGLE_HELP": "Activarea IMAP va ajuta utilizatorul să primească e-mailuri",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Setările IMAP actualizate cu succes",
+        "ERROR_MESSAGE": "Imposibil de actualizat setările IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Adresa",
+        "PLACE_HOLDER": "Adresa (De exemplu: imap.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Conectează-te",
+        "PLACE_HOLDER": "Conectează-te"
       },
       "PASSWORD": {
         "LABEL": "Parola",
         "PLACE_HOLDER": "Parola"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Activare SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Setarea detaliilor SMTP",
+      "UPDATE": "Actualizarea setărilor SMTP",
+      "TOGGLE_AVAILABILITY": "Activați configurația SMTP pentru acest inbox",
+      "TOGGLE_HELP": "Activarea SMTP va ajuta utilizatorul să trimită e-mailuri",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Setările SMTP actualizate cu succes",
+        "ERROR_MESSAGE": "Imposibil de actualizat setările SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Adresa",
+        "PLACE_HOLDER": "Adresă (De exemplu: smtp.gmail.com)"
       },
       "PORT": {
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Conectează-te",
+        "PLACE_HOLDER": "Conectează-te"
       },
       "PASSWORD": {
         "LABEL": "Parola",
@@ -523,10 +534,12 @@
         "LABEL": "Domeniu",
         "PLACE_HOLDER": "Domeniu"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Criptare",
       "SSL_TLS": "SSL/TLS",
-      "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "START_TLS": "STARTTL-URI",
+      "OPEN_SSL_VERIFY_MODE": "Deschideți modul de verificare SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrationApps.json b/app/javascript/dashboard/i18n/locale/ro/integrationApps.json
index 9fddc4487..87f622203 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrationApps.json
@@ -1,35 +1,35 @@
 {
   "INTEGRATION_APPS": {
-    "FETCHING": "Fetching Integrations",
-    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
-    "HEADER": "Applications",
+    "FETCHING": "Preluarea integrărilor",
+    "NO_HOOK_CONFIGURED": "Nu există integrări %{integrationId} configurate în acest cont.",
+    "HEADER": "Aplicatii",
     "STATUS": {
       "ENABLED": "Activat",
       "DISABLED": "Dezactivat"
     },
     "CONFIGURE": "Configurare",
-    "ADD_BUTTON": "Add a new hook",
+    "ADD_BUTTON": "Adăugați un cârlig nou",
     "DELETE": {
       "TITLE": {
-        "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "INBOX": "Confirmă ștergerea",
+        "ACCOUNT": "Deconectare"
       },
       "MESSAGE": {
         "INBOX": "Sigur doriți să ștergeți?",
-        "ACCOUNT": "Are you sure to disconnect?"
+        "ACCOUNT": "Sunteți sigur că vă deconectați?"
       },
       "CONFIRM_BUTTON_TEXT": {
         "INBOX": "Da, șterge",
-        "ACCOUNT": "Yes, Disconnect"
+        "ACCOUNT": "Da, Deconectați-vă"
       },
       "CANCEL_BUTTON_TEXT": "Renunță",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "Cârlig șters cu succes",
         "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
+      "FETCHING": "Preluarea cârligelor de integrare",
       "INBOX": "Inbox",
       "DELETE": {
         "BUTTON_TEXT": "Şterge"
@@ -38,14 +38,14 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "Selectați Inbox",
+          "PLACEHOLDER": "Selectați Inbox"
         },
         "SUBMIT": "Creeaza",
         "CANCEL": "Renunță"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "Regulă de automatizare adăugată cu succes",
         "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
       }
     },
@@ -53,10 +53,10 @@
       "BUTTON_TEXT": "Conectează-te"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "Deconectare"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow este o platformă naturală de înțelegere a limbajului, care facilitează proiectarea și integrarea unei interfețe de utilizator conversaționale în aplicația mobilă, aplicația web, dispozitivul, botul, sistemul interactiv de răspuns vocal și așa mai departe. <br /> <br /> Integrarea fluxului de dialog vă %{installationName} permite să configurați un bot Dialogflow cu casetele dvs., ceea ce permite botului să gestioneze interogările inițial și să le predea unui agent atunci când este necesar. Dialogflow poate fi folosit pentru a califica clienții potențiali, pentru a reduce volumul de muncă al agenților prin furnizarea de întrebări frecvente etc. <br /> <br /> Pentru a adăuga Dialogflow, trebuie să creați un cont de serviciu în consola de proiect Google și să partajați acreditările. Vă rugăm să consultați documentele Dialogflow pentru mai multe informații."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index ab3cf0bd5..5a51b6f9c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrări",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Renunță",
+        "DESC": "Evenimentele Webhook vă oferă informații în timp real despre ce se întâmplă în contul dvs. Chatwoot. Introduceți un URL valid pentru a configura un 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL Webhook",
+          "PLACEHOLDER": "Exemplu: https://example/api/webhook",
+          "ERROR": "Te rog introdu un URL valid"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Creează webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configurare",
       "HEADER": "Setări Webhook",
@@ -19,36 +42,17 @@
       },
       "EDIT": {
         "BUTTON_TEXT": "Editare",
-        "TITLE": "Edit webhook",
-        "CANCEL": "Renunță",
-        "DESC": "Evenimentele Webhook vă oferă informații în timp real despre ce se întâmplă în contul dvs. Chatwoot. Introduceți un URL valid pentru a configura un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL Webhook",
-            "PLACEHOLDER": "Exemplu: https://example/api/webhook",
-            "ERROR": "Te rog introdu un URL valid"
-          },
-          "SUBMIT": "Edit webhook"
-        },
+        "TITLE": "Editare webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
         }
       },
       "ADD": {
         "CANCEL": "Renunță",
         "TITLE": "Adaugă un nou webhook",
-        "DESC": "Evenimentele Webhook vă oferă informații în timp real despre ce se întâmplă în contul dvs. Chatwoot. Introduceți un URL valid pentru a configura un callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL Webhook",
-            "PLACEHOLDER": "Exemplu: https://example/api/webhook",
-            "ERROR": "Te rog introdu un URL valid"
-          },
-          "SUBMIT": "Creează webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook adăugat cu succes",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmă ștergerea",
-          "MESSAGE": "Sigur doriți să ștergeți ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Da, șterge ",
           "NO": "Nu, păstreaza"
         }
@@ -68,8 +72,8 @@
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+        "TITLE": "Utilizarea integrării Slack",
+        "BODY": "<br/><p>Chatwoot va sincroniza acum toate conversațiile primite în canalul <b><i>de conversații cu clienții</i></b> din interiorul locului de muncă slăbit.</p><p>Răspunsul la un fir de conversație în canalul de slăbire <b><i>a conversațiilor clienților</i></b> va crea un răspuns înapoi la client prin chatwoot.</p><p>Începeți răspunsurile cu <b><i>notă:</i></b> pentru a crea note private în loc de răspunsuri.</p><p>În cazul în care replier pe slack are un profil de agent în chatwoot sub același e-mail, răspunsurile vor fi asociate în consecință.</p><p>Atunci când replierul nu are un profil de agent asociat, răspunsurile vor fi făcute din profilul botului.</p>"
       }
     },
     "DELETE": {
diff --git a/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
index f5a532966..be7b48367 100644
--- a/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
@@ -19,9 +19,9 @@
       "NAME": {
         "LABEL": "Nume etichetă",
         "PLACEHOLDER": "Nume etichetă",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "REQUIRED_ERROR": "Este necesar numele etichetei",
+        "MINIMUM_LENGTH_ERROR": "Lungimea minimă 2 este necesară",
+        "VALID_ERROR": "Numai alfabetele, numerele, cratima și sublinierea sunt permise"
       },
       "DESCRIPTION": {
         "LABEL": "Descriere",
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index 00452843f..e20f8888d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -1,9 +1,9 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Conversații",
     "LOADING_CHART": "Încărcare date grafic...",
     "NO_ENOUGH_DATA": "Nu am primit suficiente date pentru a genera raportul. Vă rugăm să încercați din nou mai târziu.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "Descărcați rapoartele agenților",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversații",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primul răspuns",
-        "DESC": "(Medie)"
+        "NAME": "Primul timp de răspuns",
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
-        "DESC": "(Medie)"
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -41,80 +45,81 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ultimele 3 luni"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ultimele 6 luni"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Anul trecut"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Interval de date particularizat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Aplică",
+      "PLACEHOLDER": "Selectarea intervalului de date"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Nu sunt conversații active în acest grup.",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Zi"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Zi"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Săptămână"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Zi"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Săptămână"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Luna"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Zi"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Săptămână"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Luna"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Anul"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Program de lucru"
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
+    "HEADER": "Prezentare generală a agenților",
     "LOADING_CHART": "Încărcare date grafic...",
     "NO_ENOUGH_DATA": "Nu am primit suficiente date pentru a genera raportul. Vă rugăm să încercați din nou mai târziu.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "DOWNLOAD_AGENT_REPORTS": "Descărcați rapoartele agenților",
     "FILTER_DROPDOWN_LABEL": "Selectează agent",
     "METRICS": {
       "CONVERSATIONS": {
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primul răspuns",
-        "DESC": "(Medie)"
+        "NAME": "Primul timp de răspuns",
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
-        "DESC": "(Medie)"
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -153,32 +162,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ultimele 3 luni"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ultimele 6 luni"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Anul trecut"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Interval de date particularizat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Aplică",
+      "PLACEHOLDER": "Selectarea intervalului de date"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "Prezentare generală a etichetelor",
     "LOADING_CHART": "Încărcare date grafic...",
     "NO_ENOUGH_DATA": "Nu am primit suficiente date pentru a genera raportul. Vă rugăm să încercați din nou mai târziu.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "Descărcarea rapoartelor de etichete",
+    "FILTER_DROPDOWN_LABEL": "Selectați etichetă",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversații",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primul răspuns",
-        "DESC": "(Medie)"
+        "NAME": "Primul timp de răspuns",
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
-        "DESC": "(Medie)"
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -216,32 +229,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ultimele 3 luni"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ultimele 6 luni"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Anul trecut"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Interval de date particularizat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Aplică",
+      "PLACEHOLDER": "Selectarea intervalului de date"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
+    "HEADER": "Prezentare generală a inboxului",
     "LOADING_CHART": "Încărcare date grafic...",
     "NO_ENOUGH_DATA": "Nu am primit suficiente date pentru a genera raportul. Vă rugăm să încercați din nou mai târziu.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "DOWNLOAD_INBOX_REPORTS": "Descarcă un formular csv.",
+    "FILTER_DROPDOWN_LABEL": "Selectați Inbox",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversații",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primul răspuns",
-        "DESC": "(Medie)"
+        "NAME": "Primul timp de răspuns",
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
-        "DESC": "(Medie)"
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -279,32 +296,32 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ultimele 3 luni"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ultimele 6 luni"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Anul trecut"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Interval de date particularizat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Aplică",
+      "PLACEHOLDER": "Selectarea intervalului de date"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "Prezentare generală a echipei",
     "LOADING_CHART": "Încărcare date grafic...",
     "NO_ENOUGH_DATA": "Nu am primit suficiente date pentru a genera raportul. Vă rugăm să încercați din nou mai târziu.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "Descărcați rapoartele echipei",
+    "FILTER_DROPDOWN_LABEL": "Selectați echipa",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Conversații",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Primul răspuns",
-        "DESC": "(Medie)"
+        "NAME": "Primul timp de răspuns",
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Timp Rezolutie",
-        "DESC": "(Medie)"
+        "DESC": "(Medie)",
+        "INFO_TEXT": "Numărul total de conversații utilizate pentru calcul:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Număr de rezoluții",
@@ -342,55 +363,83 @@
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "Ultimele 3 luni"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "Ultimele 6 luni"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Anul trecut"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "Interval de date particularizat"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Aplică",
+      "PLACEHOLDER": "Selectarea intervalului de date"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "Rapoarte CSAT",
+    "NO_RECORDS": "Nu există răspunsuri predefinite disponibile în acest cont.",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "Alege agenți"
       }
     },
     "TABLE": {
       "HEADER": {
         "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
+        "AGENT_NAME": "Agent atribuit",
         "RATING": "Evaluare",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "FEEDBACK_TEXT": "Comentariu feedback"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "Răspunsuri totale",
+        "TOOLTIP": "Numărul total de răspunsuri colectate"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "Scorul de satisfacție",
+        "TOOLTIP": "Numărul total de răspunsuri pozitive / Numărul total de răspunsuri * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "Rata de răspuns",
+        "TOOLTIP": "Numărul total de răspunsuri / Numărul total de mesaje de sondaj CSAT trimise * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Prezentare generală",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Deschide",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Neatribuit"
+    },
+    "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": "Ocupat",
+      "OFFLINE": "Deconectat"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
index 0408723eb..72fc275bf 100644
--- a/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ro/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Parola a fost schimbată cu succes",
       "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
     },
+    "CAPTCHA": {
+      "ERROR": "Verificarea a expirat. Vă rugăm să rezolvați captcha din nou."
+    },
     "SUBMIT": "Trimite"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 64b011d0b..f23e35c9d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -3,10 +3,10 @@
     "LINK": "Setări profil",
     "TITLE": "Setări profil",
     "BTN_TEXT": "Actualizeaza profil",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
+    "DELETE_AVATAR": "Șterge avatarul",
+    "AVATAR_DELETE_SUCCESS": "Avatar a fost șters cu succes",
+    "AVATAR_DELETE_FAILED": "Există o eroare în timp ce ștergeți avatarul, vă rugăm să încercați din nou",
+    "UPDATE_SUCCESS": "Profilul dvs. a fost actualizat cu succes",
     "PASSWORD_UPDATE_SUCCESS": "Parola ta a fost schimbată cu succes",
     "AFTER_EMAIL_CHANGED": "Profilul tău a fost actualizat cu succes, te rugăm să te autentifici din nou pentru că datele tale de autentificare au fost modificate",
     "FORM": {
@@ -20,40 +20,40 @@
         "NOTE": "Adresa ta de email este identitatea ta și este folosită pentru a te autentifica."
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "TITLE": "Semnătura mesajului personal",
+        "NOTE": "Creați o semnătură de mesaj personal care ar fi adăugată la toate mesajele pe care le trimiteți de pe platformă. Utilizați editorul de conținut îmbogățit pentru a crea o semnătură extrem de personalizată.",
+        "BTN_TEXT": "Salvarea semnăturii mesajului",
+        "API_ERROR": "Nu s-a putut trimite! Încearcă din nou",
+        "API_SUCCESS": "Semnătura salvată cu succes"
       },
       "MESSAGE_SIGNATURE": {
-        "LABEL": "Message Signature",
-        "ERROR": "Message Signature cannot be empty",
-        "PLACEHOLDER": "Insert your personal message signature here."
+        "LABEL": "Semnătura mesajului",
+        "ERROR": "Semnătura mesajului nu poate fi goală",
+        "PLACEHOLDER": "Introduceți semnătura mesajului personal aici."
       },
       "PASSWORD_SECTION": {
         "TITLE": "Parola",
         "NOTE": "Actualizarea parolei ar reseta autentificările pe mai multe dispozitive.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Schimba parola"
       },
       "ACCESS_TOKEN": {
         "TITLE": "Token acces",
         "NOTE": "Acest token poate fi utilizat dacă construiți o integrare bazată pe API"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
-        "NONE": "None",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "TITLE": "Notificări audio",
+        "NOTE": "Activați notificările audio în tabloul de bord pentru mesaje și conversații noi.",
+        "NONE": "Nimic",
+        "ASSIGNED": "Conversații atribuite",
+        "ALL_CONVERSATIONS": "Toate conversațiile"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Notificări prin e-mail",
         "NOTE": "Actualizați preferințele de notificare prin e-mail aici",
         "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": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "CONVERSATION_MENTION": "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ă"
       },
       "API": {
         "UPDATE_SUCCESS": "Preferințele de notificare sunt actualizate cu succes",
@@ -64,8 +64,8 @@
         "NOTE": "Actualizați preferințele de notificare push aici",
         "CONVERSATION_ASSIGNMENT": "Trimite notificări push atunci când o conversație îmi este atribuită",
         "CONVERSATION_CREATION": "Trimite notificări push atunci când o conversație nouă este creată",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "CONVERSATION_MENTION": "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ă",
         "HAS_ENABLED_PUSH": "Ați activat apăsarea pentru acest browser.",
         "REQUEST_PUSH": "Activează notificările push"
       },
@@ -96,41 +96,45 @@
         "PLACEHOLDER": "Te rugăm să introduci adresa ta de e-mail, aceasta va fi afișată în conversații"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "Parola curentă",
+        "ERROR": "Vă rugăm să introduceţi un nume de agent",
+        "PLACEHOLDER": "Vă rugăm să introduceți parola curentă"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Parolă nouă",
         "ERROR": "Te rugăm să introduci o parolă pentru lungimea de 6 caractere sau mai mult",
         "PLACEHOLDER": "Te rog introdu o noua parola"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Confirmare parolă nouă",
         "ERROR": "Confirmarea parolei trebuie să se potrivească cu parola",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Vă rugăm să reintroduceți noua parolă"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Schimba",
     "CHANGE_ACCOUNTS": "Comută contul",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "Contact Suport",
     "SELECTOR_SUBTITLE": "Selectaţi un cont din următoarea listă",
     "PROFILE_SETTINGS": "Setări profil",
-    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "KEYBOARD_SHORTCUTS": "Scurtături Tastatură",
     "LOGOUT": "Deconectare"
   },
   "APP_GLOBAL": {
     "TRIAL_MESSAGE": "zile de încercare rămase.",
     "TRAIL_BUTTON": "Cumpara acum",
-    "DELETED_USER": "Deleted User"
+    "DELETED_USER": "Utilizator șters"
   },
   "COMPONENTS": {
     "CODE": {
       "BUTTON_TEXT": "Copiază",
       "COPY_SUCCESSFUL": "Cod copiat în clipboard cu succes"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descărcare",
       "UPLOADING": "Încărcare..."
@@ -146,47 +150,49 @@
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "CURRENTLY_VIEWING_ACCOUNT": "În prezent, vizualizarea:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Conversații",
-    "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "ALL_CONVERSATIONS": "Toate conversațiile",
+    "MENTIONED_CONVERSATIONS": "Menţionări",
     "REPORTS": "Rapoarte",
     "SETTINGS": "Setări",
     "CONTACTS": "Contacte",
     "HOME": "Acasa",
     "AGENTS": "Agenți",
     "INBOXES": "Căsuțe",
-    "NOTIFICATIONS": "Notifications",
+    "NOTIFICATIONS": "Notificări",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
     "INTEGRATIONS": "Integrări",
     "PROFILE_SETTINGS": "Setări profil",
     "ACCOUNT_SETTINGS": "Setările contului",
-    "APPLICATIONS": "Applications",
+    "APPLICATIONS": "Aplicatii",
     "LABELS": "Etichete",
     "CUSTOM_ATTRIBUTES": "Editează atribut personalizat",
     "AUTOMATION": "Automatizare",
-    "TEAMS": "Teams",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
-    "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "TEAMS": "Echipe",
+    "CUSTOM_VIEWS_FOLDER": "Foldere",
+    "CUSTOM_VIEWS_SEGMENTS": "Segmente",
+    "ALL_CONTACTS": "Toate persoanele de contact",
+    "TAGGED_WITH": "Etichetate cu",
+    "NEW_LABEL": "Etichetă nouă",
+    "NEW_TEAM": "Echipă nouă",
+    "NEW_INBOX": "Inbox nou",
+    "REPORTS_CONVERSATION": "Conversații",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campanii",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "ONGOING": "În derulare",
+    "ONE_OFF": "Unul oprit",
     "REPORTS_AGENT": "Agenți",
     "REPORTS_LABEL": "Etichete",
     "REPORTS_INBOX": "Inbox",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "REPORTS_TEAM": "Echipa",
+    "SET_AVAILABILITY_TITLE": "Setați-vă ca",
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Prezentare generală"
   },
   "CREATE_ACCOUNT": {
-    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NO_ACCOUNT_WARNING": "Uh oh! Nu am putut găsi niciun cont Chatwoot. Vă rugăm să creați un cont nou pentru a continua.",
     "NEW_ACCOUNT": "Cont Nou",
     "SELECTOR_SUBTITLE": "Creează un cont nou",
     "API": {
@@ -204,22 +210,22 @@
   },
   "KEYBOARD_SHORTCUTS": {
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
-      "RESOLVE_AND_NEXT": "Resolve and move to next",
-      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
-      "RESOLVE_CONVERSATION": "Resolve Conversation",
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "TOGGLE_SIDEBAR": "Toggle Sidebar",
-      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
-      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "Deschiderea conversației",
+      "RESOLVE_AND_NEXT": "Rezolvarea și trecerea la următorul",
+      "NAVIGATE_DROPDOWN": "Navigarea elementelor verticale",
+      "RESOLVE_CONVERSATION": "Detalii conversație",
+      "GO_TO_CONVERSATION_DASHBOARD": "Accesați Tabloul de bord conversație",
+      "ADD_ATTACHMENT": "Fişier ataşat",
+      "GO_TO_CONTACTS_DASHBOARD": "Accesați Tabloul de bord persoane de contact",
+      "TOGGLE_SIDEBAR": "Comutare bară laterală",
+      "GO_TO_REPORTS_SIDEBAR": "Accesați bara laterală Rapoarte",
+      "MOVE_TO_NEXT_TAB": "Deplasarea la fila următoare din lista de conversații",
+      "GO_TO_SETTINGS": "Accesați Pagina Setări",
+      "SWITCH_CONVERSATION_STATUS": "Comutarea la următoarea stare a conversației",
+      "SWITCH_TO_PRIVATE_NOTE": "Comutarea la Notă privată",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Comutarea editorului de conținut îmbogățit",
+      "SWITCH_TO_REPLY": "Comutarea la Răspuns",
+      "TOGGLE_SNOOZE_DROPDOWN": "Comutați snooze dropdown"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/ro/signup.json b/app/javascript/dashboard/i18n/locale/ro/signup.json
index 2bd21fe4a..357f56ea1 100644
--- a/app/javascript/dashboard/i18n/locale/ro/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ro/signup.json
@@ -5,23 +5,24 @@
     "TERMS_ACCEPT": "Prin înregistrare, ești de acord cu politica noastră de confidențialitate <a href=\"https://www.chatwoot.com/terms\">T & C</a> și <a href=\"https://www.chatwoot.com/privacy-policy\"></a>",
     "ACCOUNT_NAME": {
       "LABEL": "Nume cont",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "PLACEHOLDER": "Introduceți un nume de cont. de exemplu: Wayne Intreprinderi",
+      "ERROR": "Numele contului este prea scurt"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Nume complet",
+      "PLACEHOLDER": "Introduceți numele complet. de exemplu: Bruce Wayne",
+      "ERROR": "Numele complet este prea scurt"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "E-mail de lucru",
+      "PLACEHOLDER": "Introduceți adresa de e-mail de la locul de muncă. de exemplu: bruce@wayne.enterprises",
+      "ERROR": "Adresa de e-mail nu este validă"
     },
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola este prea scurta"
+      "ERROR": "Parola este prea scurta",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmă parola",
@@ -33,6 +34,6 @@
       "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
     },
     "SUBMIT": "Trimite",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "Ai deja un cont?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
index ce8f8790f..fd405ec2a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Crează o echipă nouă",
     "HEADER": "Echipe",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Echipe</b></p> <p>Echipele vă permit să vă organizați agenții în grupuri în funcție de responsabilitățile lor. <br /> Un agent poate face parte din mai multe echipe. Puteți atribui conversații unei echipe atunci când lucrați în colaborare. </p>",
     "LIST": {
       "404": "Nu există echipe create în acest cont.",
       "EDIT_TEAM": "Editează echipa"
@@ -15,111 +15,111 @@
       "AGENTS": {
         "BUTTON_TEXT": "Adaugă agenți în echipă",
         "TITLE": "Adăugați agenți în echipă - %{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."
+        "DESC": "Adăugați agenți în echipa nou creată. Acest lucru vă permite să colaborați ca echipă la conversații, să primiți notificări cu privire la evenimente noi din aceeași conversație."
       },
       "WIZARD": [
         {
           "title": "Creeaza",
-          "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "route": "setări_echipă_nou",
+          "body": "Creați o nouă echipă de agenți."
         },
         {
           "title": "Adaugă Agent",
-          "route": "settings_teams_add_agents",
-          "body": "Add agents to the team."
+          "route": "setări_echipă_adaugă_agenți",
+          "body": "Adăugați agenți în echipă."
         },
         {
-          "title": "Finish",
-          "route": "settings_teams_finish",
+          "title": "Finalizează",
+          "route": "setări_echipă_finalizare",
           "body": "Toate setarile sunt facute!"
         }
       ]
     },
     "EDIT_FLOW": {
       "CREATE": {
-        "TITLE": "Edit your team details",
-        "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "TITLE": "Editarea detaliilor echipei",
+        "DESC": "Editați titlul și descrierea echipei dvs.",
+        "BUTTON_TEXT": "Actualizați echipa"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Update agents in team",
+        "BUTTON_TEXT": "Actualizați agenții din echipă",
         "TITLE": "Adăugați agenți în echipă - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "DESC": "Adăugați agenți în echipa nou creată. Toți agenții adăugați vor fi anunțați atunci când o conversație este atribuită acestei echipe."
       },
       "WIZARD": [
         {
-          "title": "Team details",
-          "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "title": "Detalii despre echipă",
+          "route": "setări_echipă_editează",
+          "body": "Modificați numele, descrierea și alte detalii."
         },
         {
-          "title": "Edit Agents",
-          "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "title": "Editarea agenților",
+          "route": "setări_echipă_editează_membrii",
+          "body": "Editați agenții din echipa dvs."
         },
         {
-          "title": "Finish",
-          "route": "settings_teams_edit_finish",
+          "title": "Finalizează",
+          "route": "setări_echipă_editează_finalizare",
           "body": "Toate setarile sunt facute!"
         }
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+      "ERROR_MESSAGE": "Nu a putut salva detaliile echipei. Încearcă din nou."
     },
     "AGENTS": {
       "AGENT": "AGENT",
       "EMAIL": "E-MAIL",
       "BUTTON_TEXT": "Adaugă Agent",
-      "ADD_AGENTS": "Adding Agents to your Team...",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+      "ADD_AGENTS": "Adăugarea agenților în echipa ta...",
+      "SELECT": "selectează",
+      "SELECT_ALL": "selectați toți agenții",
+      "SELECTED_COUNT": "%{selected} din %{total} agenți selectați."
     },
     "ADD": {
       "TITLE": "Adăugați agenți în echipă - %{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.",
+      "DESC": "Adăugați agenți în echipa nou creată. Acest lucru vă permite să colaborați ca echipă la conversații, să primiți notificări cu privire la evenimente noi din aceeași conversație.",
+      "SELECT": "selectează",
+      "SELECT_ALL": "selectați toți agenții",
+      "SELECTED_COUNT": "%{selected} din %{total} agenți selectați.",
       "BUTTON_TEXT": "Adaugă Agent",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Selectați cel puțin un agent."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
-      "BUTTON_TEXT": "Finish"
+      "TITLE": "Echipa ta e gata!",
+      "MESSAGE": "Acum puteți colabora ca o echipă la conversații. Sprijin fericit ",
+      "BUTTON_TEXT": "Finalizează"
     },
     "DELETE": {
       "BUTTON_TEXT": "Şterge",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+        "SUCCESS_MESSAGE": "Echipa a fost ștearsă cu succes.",
+        "ERROR_MESSAGE": "Nu a putut șterge echipa. Încearcă din nou."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "TITLE": "Sunteți sigur că doriți să ștergeți - %{teamName}",
+        "PLACE_HOLDER": "Vă rugăm să tastați {teamName} pentru a confirma",
+        "MESSAGE": "Ștergerea echipei va elimina atribuirea echipei din conversațiile atribuite acestei echipe.",
         "YES": "Şterge ",
         "NO": "Renunță"
       }
     },
     "SETTINGS": "Setări",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "Actualizați echipa",
+      "CREATE": "Creați o echipă",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "Numele echipei",
+        "PLACEHOLDER": "Exemplu: Vânzări, Asistență clienți"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "Descrierea echipei",
+        "PLACEHOLDER": "Scurtă descriere despre această echipă."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "Permiteți atribuirea automată pentru această echipă."
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "Creați o echipă"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/automation.json b/app/javascript/dashboard/i18n/locale/ru/automation.json
index 1de04116e..33982a38a 100644
--- a/app/javascript/dashboard/i18n/locale/ru/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения"
+      "DELETE_MESSAGE": "Вам нужно иметь по крайней мере одно условие для сохранения",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Напишите здесь ваше сообщение",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Выберите команды"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Включить правило автоматизации",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Не удалось отключить правило автоматизации, пожалуйста, повторите попытку позже",
       "CONFIRMATION_LABEL": "Да",
       "CANCEL_LABEL": "Нет"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Не удалось загрузить вложение, попробуйте еще раз",
+      "LABEL_IDLE": "Загрузка вложений",
+      "LABEL_UPLOADING": "Загружаем...",
+      "LABEL_UPLOADED": "Успешно загружено",
+      "LABEL_UPLOAD_FAILED": "Загрузка не удалась"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 5719df0d6..7eaa00dfb 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Нет сообщений",
     "NO_CONTENT": "Содержимое отсутствует",
     "HIDE_QUOTED_TEXT": "Скрыть цитируемый текст",
-    "SHOW_QUOTED_TEXT": "Показать цитируемый текст"
+    "SHOW_QUOTED_TEXT": "Показать цитируемый текст",
+    "MESSAGE_READ": "Читать"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
index d10d37c56..79d522295 100644
--- a/app/javascript/dashboard/i18n/locale/ru/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Контакты успешно сохранены",
     "ERROR_MESSAGE": "Произошла ошибка, попробуйте еще раз"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Подтвердите удаление",
+      "MESSAGE": "Вы уверены, что хотите удалить эту заметку?",
+      "YES": "Да, удалить",
+      "NO": "Нет, не удалять"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Удалить контакт",
     "TITLE": "Удалить контакт",
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
index 36cd7dcf3..5e3fe5e8f 100644
--- a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Уведомления",
     "MARK_ALL_DONE": "Отметить все прочитанными",
+    "DELETE_TITLE": "удалено",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Непрочитанные уведомления",
+      "ALL_NOTIFICATIONS": "Просмотр всех уведомлений",
+      "LOADING_UNREAD_MESSAGE": "Загрузка непрочитанных уведомлений...",
+      "EMPTY_MESSAGE": "У вас нет непрочитанных уведомлений"
+    },
     "LIST": {
       "LOADING_MESSAGE": "Загрузка уведомлений...",
       "404": "Уведомления отсутствуют",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти к панели разговоров",
       "GO_TO_CONTACTS_DASHBOARD": "Перейти к панели контактов",
       "GO_TO_REPORTS_OVERVIEW": "Перейти к обзору отчетов",
+      "GO_TO_CONVERSATION_REPORTS": "Перейти к отчетам по диалогам",
       "GO_TO_AGENT_REPORTS": "Перейти к отчетам по сотрудникам",
       "GO_TO_LABEL_REPORTS": "Перейти к отчетам по меткам",
       "GO_TO_INBOX_REPORTS": "Перейти к отчётам по \"Входящим\"",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 9c0c276a8..ea3b76ba2 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Возможности",
       "DISPLAY_FILE_PICKER": "Показывать выбор файла на виджете",
-      "DISPLAY_EMOJI_PICKER": "Показывать эмодзи на виджете"
+      "DISPLAY_EMOJI_PICKER": "Показывать эмодзи на виджете",
+      "ALLOW_END_CONVERSATION": "Разрешить пользователям завершать разговор из виджета"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Скрипт",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Предварительные формы позволяют получить информацию о пользователе, прежде чем они начнут разговор.",
+      "SET_FIELDS": "Поля отображаемые перед началом диалога",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Поля",
+        "LABEL": "Метка",
+        "PLACE_HOLDER": "Вариант ввода в поле",
+        "KEY": "Ключ",
+        "TYPE": "Тип",
+        "REQUIRED": "Обязательно"
+      },
       "ENABLE": {
         "LABEL": "Включить форму сбора предварительной информации",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Сообщение для формы, показываемой перед стартом диалога",
+        "LABEL": "Сообщение отображаемое перед началом диалога",
         "PLACEHOLDER": "Это сообщение будет отображаться вместе с формой для пользователя"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Настроить параметры IMAP",
+      "NOTE_TEXT": "Для включения SMTP, настройте IMAP.",
       "UPDATE": "Обновить настройки IMAP",
       "TOGGLE_AVAILABILITY": "Включить конфигурацию IMAP для этого ящика",
       "TOGGLE_HELP": "Включение IMAP поможет пользователю получить электронную почту",
@@ -483,9 +494,9 @@
         "LABEL": "Порт",
         "PLACE_HOLDER": "Порт"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Вход",
+        "PLACE_HOLDER": "Вход"
       },
       "PASSWORD": {
         "LABEL": "Пароль",
@@ -511,9 +522,9 @@
         "LABEL": "Порт",
         "PLACE_HOLDER": "Порт"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Вход",
+        "PLACE_HOLDER": "Вход"
       },
       "PASSWORD": {
         "LABEL": "Пароль",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Шифрование",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Режим проверки Open SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Режим проверки Open SSL",
+      "AUTH_MECHANISM": "Авторизация"
+    },
+    "NOTE": "Примечание: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
index d249a2231..f3e77bc28 100644
--- a/app/javascript/dashboard/i18n/locale/ru/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Интеграции",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "События с подпиской",
+      "FORM": {
+        "CANCEL": "Отменить",
+        "DESC": "Вебхуки позволяют получить вам информацию о том, что происходит в вашей учетной записи Chatwoot. Пожалуйста, введите корректный URL.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "События",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Диалог создан",
+            "CONVERSATION_STATUS_CHANGED": "Статус диалога изменён",
+            "CONVERSATION_UPDATED": "Диалог обновлён",
+            "MESSAGE_CREATED": "Сообщение создано",
+            "MESSAGE_UPDATED": "Сообщение обновлено",
+            "WEBWIDGET_TRIGGERED": "Виджет онлайн чата, открыт пользователем"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL вебхука",
+          "PLACEHOLDER": "Пример: https://example/api/webhook",
+          "ERROR": "Пожалуйста, введите правильный URL"
+        },
+        "EDIT_SUBMIT": "Обновить webhook",
+        "ADD_SUBMIT": "Создать вебхук"
+      },
       "TITLE": "Вебхук",
       "CONFIGURE": "Настроить",
       "HEADER": "Настройки вебхуков",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Редактировать",
         "TITLE": "Редактировать вебхук",
-        "CANCEL": "Отменить",
-        "DESC": "Вебхуки позволяют получить вам информацию о том, что происходит в вашей учетной записи Chatwoot. Пожалуйста, введите корректный URL.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL вебхука",
-            "PLACEHOLDER": "Пример: https://example/api/webhook",
-            "ERROR": "Пожалуйста, введите правильный URL"
-          },
-          "SUBMIT": "Редактировать вебхук"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Вебхук добавлен",
+          "SUCCESS_MESSAGE": "Конфигурация вебхука успешно обновлена",
           "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
         }
       },
       "ADD": {
         "CANCEL": "Отменить",
         "TITLE": "Добавить новый вебхук",
-        "DESC": "Вебхуки позволяют получить вам информацию о том, что происходит в вашей учетной записи Chatwoot. Пожалуйста, введите корректный URL.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL вебхука",
-            "PLACEHOLDER": "Пример: https://example/api/webhook",
-            "ERROR": "Пожалуйста, введите правильный URL"
-          },
-          "SUBMIT": "Создать вебхук"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Вебхук добавлен",
+          "SUCCESS_MESSAGE": "Конфигурация вебхука успешно добавлена",
           "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Подтвердите удаление",
-          "MESSAGE": "Вы точно хотите удалить ",
+          "MESSAGE": "Вы уверены, что хотите удалить вебхук? (%{webhookURL})",
           "YES": "Да, удалить ",
           "NO": "Нет, не удалять"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index d73a15598..483646a14 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Обзор",
+    "HEADER": "Диалоги",
     "LOADING_CHART": "Загрузка данных графика...",
     "NO_ENOUGH_DATA": "Недостаточно данных для создания отчета, пожалуйста, повторите попытку позже.",
     "DOWNLOAD_AGENT_REPORTS": "Сказать отчёт по агентам",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Время первого ответа",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время первого ответа — %{metricValue} (на основе %{conversationCount} сообщений)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Время Завершения",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время на решение %{metricValue} (основано на %{conversationCount} разговорах)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Количество завершенных",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Год"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Время работы"
   },
   "AGENT_REPORTS": {
     "HEADER": "Обзор агентов",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Время первого ответа",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время первого ответа — %{metricValue} (на основе %{conversationCount} сообщений)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Время Завершения",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время на решение %{metricValue} (основано на %{conversationCount} разговорах)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Количество завершенных",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Время первого ответа",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время первого ответа — %{metricValue} (на основе %{conversationCount} сообщений)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Время Завершения",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время на решение %{metricValue} (основано на %{conversationCount} разговорах)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Количество завершенных",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Время первого ответа",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время первого ответа — %{metricValue} (на основе %{conversationCount} сообщений)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Время Завершения",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время на решение %{metricValue} (основано на %{conversationCount} разговорах)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Количество завершенных",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Время первого ответа",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время первого ответа — %{metricValue} (на основе %{conversationCount} сообщений)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Время Завершения",
-        "DESC": "(Среднее)"
+        "DESC": "(Среднее)",
+        "INFO_TEXT": "Общее количество разговоров, используемых для вычисления:",
+        "TOOLTIP_TEXT": "Время на решение %{metricValue} (основано на %{conversationCount} разговорах)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Количество завершенных",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Общее количество ответов / Общее количество отправленных сообщений CSAT опросов * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Обзор",
+    "LIVE": "Онлайн",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Открытые диалоги",
+      "LOADING_MESSAGE": "Загрузка метрик разговора...",
+      "OPEN": "Открыть",
+      "UNATTENDED": "Несвязанные",
+      "UNASSIGNED": "Неназначен"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Диалоги по операторам",
+      "LOADING_MESSAGE": "Загрузка метрик оператора...",
+      "NO_AGENTS": "Нет диалогов связанных с операторами",
+      "TABLE_HEADER": {
+        "AGENT": "Оператор",
+        "OPEN": "ОТКРЫТЬ",
+        "UNATTENDED": "Несвязанные",
+        "STATUS": "Статус"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Статус Оператора",
+      "ONLINE": "В сети",
+      "BUSY": "Занят",
+      "OFFLINE": "Оффлайн"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
index bb9eb11ff..2eb18fe18 100644
--- a/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Пароль изменен",
       "ERROR_MESSAGE": "Не удается соединиться с сервером Woot, попробуйте позже"
     },
+    "CAPTCHA": {
+      "ERROR": "Время проверки истекло. Пожалуйста, решите задачу captcha еще раз."
+    },
     "SUBMIT": "Отправить"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 0400ec167..b55938b42 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Копировать",
       "COPY_SUCCESSFUL": "Код скопирован в буфер обмена"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Показать больше",
+      "SHOW_LESS": "Показать меньше"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Скачать",
       "UPLOADING": "Загружаем..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Сейчас просматривается:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Диалоги",
     "ALL_CONVERSATIONS": "Диалоги",
     "MENTIONED_CONVERSATIONS": "Упоминания",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Новая метка",
     "NEW_TEAM": "Новая команда",
     "NEW_INBOX": "Новые канал",
-    "REPORTS_OVERVIEW": "Обзор",
+    "REPORTS_CONVERSATION": "Диалоги",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Кампании",
     "ONGOING": "В настоящее время",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Электронная почта",
     "REPORTS_TEAM": "Команда",
     "SET_AVAILABILITY_TITLE": "Установить себя",
-    "BETA": "Бета"
+    "BETA": "Бета",
+    "REPORTS_OVERVIEW": "Обзор"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Мы не смогли найти ни одного аккаунта в Chatwoot. Пожалуйста, создайте новый аккаунт, чтобы продолжить.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/signup.json b/app/javascript/dashboard/i18n/locale/ru/signup.json
index 05b098c04..03657d650 100644
--- a/app/javascript/dashboard/i18n/locale/ru/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ru/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль слишком короткий"
+      "ERROR": "Пароль слишком короткий",
+      "IS_INVALID_PASSWORD": "Пароль должен содержать хотя бы одну заглавную букву, одну строчную букву, 1 цифру и 1 специальный символ"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Подтвердить пароль",
diff --git a/app/javascript/dashboard/i18n/locale/sk/automation.json b/app/javascript/dashboard/i18n/locale/sk/automation.json
index 79e2d4825..2c56650e7 100644
--- a/app/javascript/dashboard/i18n/locale/sk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Áno",
       "CANCEL_LABEL": "Nie"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Nahrávanie...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/chatlist.json b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
index b2062de94..f60a4456b 100644
--- a/app/javascript/dashboard/i18n/locale/sk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Žiadne správy",
     "NO_CONTENT": "Žiaden obsah nie je k dispozícii",
     "HIDE_QUOTED_TEXT": "Skryť citovaný text",
-    "SHOW_QUOTED_TEXT": "Ukázať citovaný text"
+    "SHOW_QUOTED_TEXT": "Ukázať citovaný text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
index 313dcd3da..c25bcbf4c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kontakty boli úspešne uložené",
     "ERROR_MESSAGE": "Vyskytla sa chyba, skúste to prosím znova"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Potvrdiť vymazanie",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "No, Keep it"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Vymazať kontakt",
     "TITLE": "Vymazať kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
index 6ef6e1406..c4e98d269 100644
--- a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Upozornenia",
     "MARK_ALL_DONE": "Označiť všetky ako hotové",
+    "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": "Načítavajú sa notifikácie...",
       "404": "Žiadne notifikácie",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Prejsť na ovládací panel konverzácie",
       "GO_TO_CONTACTS_DASHBOARD": "Prejsť na ovládací panel kontaktov",
       "GO_TO_REPORTS_OVERVIEW": "Prejsť na prehľad reportov",
+      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
       "GO_TO_AGENT_REPORTS": "Prejsť na reporty o agentoch",
       "GO_TO_LABEL_REPORTS": "Prejsť na reporty o štítkoch",
       "GO_TO_INBOX_REPORTS": "Prejsť na reporty o schránkach",
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index c2b9e4064..d76b4b231 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Formuláre pred konverzáciou vám umožnia zachytiť informácie o používateľovi ešte predtým, ako s vami začne konverzovať.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Povoliť formulár pred konverzáciou",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Správa pred konverzáciou",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Táto správa sa zobrazí používateľom spolu s formulárom"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Nastaviť IMAP detaily",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Aktualizovať IMAP nastavenia",
       "TOGGLE_AVAILABILITY": "Povolenie konfigurácie IMAP pre túto schránku",
       "TOGGLE_HELP": "Povolenie protokolu IMAP pomôže používateľovi prijímať e-maily",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-mail",
-        "PLACE_HOLDER": "E-mail"
+      "LOGIN": {
+        "LABEL": "Prihlásenie",
+        "PLACE_HOLDER": "Prihlásenie"
       },
       "PASSWORD": {
         "LABEL": "Heslo",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Prihlásenie",
+        "PLACE_HOLDER": "Prihlásenie"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
index 6cca45acb..ea8b7d36e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrations",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Zrušiť",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Example: https://example/api/webhook",
+          "ERROR": "Prosím zadajte platnú URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Configure",
       "HEADER": "Webhook settings",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Upraviť",
         "TITLE": "Edit webhook",
-        "CANCEL": "Zrušiť",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
         }
       },
       "ADD": {
         "CANCEL": "Zrušiť",
         "TITLE": "Add new webhook",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Potvrdiť vymazanie",
-          "MESSAGE": "Určite chcete vymazať ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Áno, vymazať ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index ee25fb58b..1bf58d067 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Prehľad",
+    "HEADER": "Rozhovory",
     "LOADING_CHART": "Načítanie grafu...",
     "NO_ENOUGH_DATA": "Na vygenerovanie reportu sme nedostali dostatok dát, skúste to prosím neskôr.",
     "DOWNLOAD_AGENT_REPORTS": "Stiahnutie reportov o agentoch",
@@ -18,12 +18,16 @@
         "DESC": "( Spolu )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas do prvej reakcie",
-        "DESC": "( Priemer )"
+        "NAME": "First Response Time",
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas do riešenia",
-        "DESC": "( Priemer )"
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet vyriešených problémov",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Prehľad agentov",
@@ -130,12 +135,16 @@
         "DESC": "( Spolu )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas do prvej reakcie",
-        "DESC": "( Priemer )"
+        "NAME": "First Response Time",
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas do riešenia",
-        "DESC": "( Priemer )"
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet vyriešených problémov",
@@ -193,12 +202,16 @@
         "DESC": "( Spolu )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas do prvej reakcie",
-        "DESC": "( Priemer )"
+        "NAME": "First Response Time",
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas do riešenia",
-        "DESC": "( Priemer )"
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet vyriešených problémov",
@@ -256,12 +269,16 @@
         "DESC": "( Spolu )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas do prvej reakcie",
-        "DESC": "( Priemer )"
+        "NAME": "First Response Time",
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas do riešenia",
-        "DESC": "( Priemer )"
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet vyriešených problémov",
@@ -319,12 +336,16 @@
         "DESC": "( Spolu )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Čas do prvej reakcie",
-        "DESC": "( Priemer )"
+        "NAME": "First Response Time",
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Čas do riešenia",
-        "DESC": "( Priemer )"
+        "DESC": "( Priemer )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Počet vyriešených problémov",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Prehľad",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Otvorené",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Nepriradené"
+    },
+    "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": "Zaneprázdnený",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
index e23de3ce6..8beaa9920 100644
--- a/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Successfully changed the password",
       "ERROR_MESSAGE": "Nepodarilo sa pripojiť k serveru Woot, skúste to prosím neskôr"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Odoslať"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index 9aff2e107..ee2176c1c 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Stiahnuť",
       "UPLOADING": "Nahrávanie..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Rozhovory",
     "ALL_CONVERSATIONS": "Všetky konverzácie",
     "MENTIONED_CONVERSATIONS": "Zmienky",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Prehľad",
+    "REPORTS_CONVERSATION": "Rozhovory",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Schránka",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Prehľad"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/signup.json b/app/javascript/dashboard/i18n/locale/sk/signup.json
index e2a1eaf81..1f0e348ab 100644
--- a/app/javascript/dashboard/i18n/locale/sk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sk/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Heslo",
       "PLACEHOLDER": "Heslo",
-      "ERROR": "Heslo je príliš krátke"
+      "ERROR": "Heslo je príliš krátke",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Potvrďte heslo",
diff --git a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
index 85f9669ab..f709a7b18 100644
--- a/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "vybrať všetkých agentov",
       "SELECTED_COUNT": "%{selected} z %{total} vybraných agentov.",
       "BUTTON_TEXT": "Pridať agentov",
-      "AGENT_VALIDATION_ERROR": "Vyberte aspoň jedného agenta."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Váš tím je pripravený!",
diff --git a/app/javascript/dashboard/i18n/locale/sr/automation.json b/app/javascript/dashboard/i18n/locale/sr/automation.json
index 4691c2a98..327a124a2 100644
--- a/app/javascript/dashboard/i18n/locale/sr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "Dodavanje...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/chatlist.json b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
index b36caa03e..44d87f299 100644
--- a/app/javascript/dashboard/i18n/locale/sr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Nema poruka",
     "NO_CONTENT": "Nema sadržaja",
     "HIDE_QUOTED_TEXT": "Sakriji citirani tekst",
-    "SHOW_QUOTED_TEXT": "Prikaži citirani tekst"
+    "SHOW_QUOTED_TEXT": "Prikaži citirani tekst",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/contact.json b/app/javascript/dashboard/i18n/locale/sr/contact.json
index 4f519b5ac..182ed3211 100644
--- a/app/javascript/dashboard/i18n/locale/sr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sr/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Potvrdite brisanje",
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
index 4d552deed..8f83be37c 100644
--- a/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index 5a7577f8c..e50721a9b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Login",
+        "PLACE_HOLDER": "Login"
       },
       "PASSWORD": {
         "LABEL": "Password",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/integrations.json b/app/javascript/dashboard/i18n/locale/sr/integrations.json
index 4e1589dfc..c8b898fc0 100644
--- a/app/javascript/dashboard/i18n/locale/sr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sr/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrations",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Otkaži",
+        "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"
+          }
+        },
+        "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",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Uredi",
         "TITLE": "Edit webhook",
-        "CANCEL": "Otkaži",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
         }
       },
       "ADD": {
         "CANCEL": "Otkaži",
         "TITLE": "Add new webhook",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "Please enter a valid URL"
-          },
-          "SUBMIT": "Create webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Potvrdite brisanje",
-          "MESSAGE": "Sigurni ste da želite izbrisati ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Da, izbriši ",
           "NO": "No, Keep it"
         }
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index d51e28cc2..f67447fe5 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Razgovori",
     "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",
@@ -18,12 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -193,12 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -256,12 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -319,12 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "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 )"
+        "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",
@@ -392,5 +413,33 @@
         "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": "Otvoreni",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Nedodeljen"
+    },
+    "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"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
index 379dda5ef..2896943d9 100644
--- a/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sr/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Successfully changed the password",
       "ERROR_MESSAGE": "Nije moguće se povezati sa Woot serverom, pokušajte ponovo kasnije"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Pošalji"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index f580912ea..e248e028f 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Copy",
       "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Download",
       "UPLOADING": "Dodavanje..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Razgovori",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Spominjanja",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Razgovori",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/signup.json b/app/javascript/dashboard/i18n/locale/sr/signup.json
index d66ac5d91..bff1182d9 100644
--- a/app/javascript/dashboard/i18n/locale/sr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sr/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Password",
       "PLACEHOLDER": "Password",
-      "ERROR": "Password is too short"
+      "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",
diff --git a/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
index 3c8999d67..25c32d819 100644
--- a/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/sv/automation.json b/app/javascript/dashboard/i18n/locale/sv/automation.json
index ef127150c..ced7b4555 100644
--- a/app/javascript/dashboard/i18n/locale/sv/automation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Ja",
       "CANCEL_LABEL": "Nej"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Laddar upp...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/chatlist.json b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
index 454ea84cf..6bf34759c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Inga meddelanden",
     "NO_CONTENT": "Inget innehåll tillgängligt",
     "HIDE_QUOTED_TEXT": "Dölj citerad text",
-    "SHOW_QUOTED_TEXT": "Visa citerad text"
+    "SHOW_QUOTED_TEXT": "Visa citerad text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 021fc2ee5..37199503e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kontakter har sparats",
     "ERROR_MESSAGE": "Ett fel uppstod, vänligen försök igen"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Bekräfta borttagning",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Nej, behåll"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Ta bort kontakt",
     "TITLE": "Ta bort kontakt",
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
index ac807d3b1..e16546ccb 100644
--- a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Aviseringar",
     "MARK_ALL_DONE": "Markera alla som klara",
+    "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": "Laddar aviseringar...",
       "404": "Inga aviseringar",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index 54973df52..ae67e6a20 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Funktioner",
       "DISPLAY_FILE_PICKER": "Visa filväljare på widgeten",
-      "DISPLAY_EMOJI_PICKER": "Visa emoji-väljare på widgeten"
+      "DISPLAY_EMOJI_PICKER": "Visa emoji-väljare på widgeten",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Skript för Messenger",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Förre chattformulär gör det möjligt för dig att samla in användarinformation innan de börjar samtala med dig.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Key",
+        "TYPE": "Type",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Aktivera förchattformulär",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Förre chattinlägg",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Detta meddelande skulle vara synligt för användarna tillsammans med formuläret"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-post",
-        "PLACE_HOLDER": "E-post"
+      "LOGIN": {
+        "LABEL": "Logga in",
+        "PLACE_HOLDER": "Logga in"
       },
       "PASSWORD": {
         "LABEL": "Lösenord",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-post",
-        "PLACE_HOLDER": "E-post"
+      "LOGIN": {
+        "LABEL": "Logga in",
+        "PLACE_HOLDER": "Logga in"
       },
       "PASSWORD": {
         "LABEL": "Lösenord",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 29cd79650..a779c137e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integrationer",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Avbryt",
+        "DESC": "Webbhook-händelser ger dig realtidsinformation om vad som händer i ditt Chatwoot-konto. Ange en giltig URL för att konfigurera en 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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Exempel: https://exempel/api/webhook",
+          "ERROR": "Ange en giltig URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Create webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Konfigurera",
       "HEADER": "Webhook-inställningar",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Redigera",
         "TITLE": "Edit webhook",
-        "CANCEL": "Avbryt",
-        "DESC": "Webbhook-händelser ger dig realtidsinformation om vad som händer i ditt Chatwoot-konto. Ange en giltig URL för att konfigurera en callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Exempel: https://exempel/api/webhook",
-            "ERROR": "Ange en giltig URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
         }
       },
       "ADD": {
         "CANCEL": "Avbryt",
         "TITLE": "Lägg till ny webhook",
-        "DESC": "Webbhook-händelser ger dig realtidsinformation om vad som händer i ditt Chatwoot-konto. Ange en giltig URL för att konfigurera en callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Exempel: https://exempel/api/webhook",
-            "ERROR": "Ange en giltig URL"
-          },
-          "SUBMIT": "Skapa webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook har lagts till",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Bekräfta borttagning",
-          "MESSAGE": "Är du säker på att ta bort ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Ja, ta bort ",
           "NO": "Nej, behåll"
         }
diff --git a/app/javascript/dashboard/i18n/locale/sv/report.json b/app/javascript/dashboard/i18n/locale/sv/report.json
index d32275aab..ebe38abe0 100644
--- a/app/javascript/dashboard/i18n/locale/sv/report.json
+++ b/app/javascript/dashboard/i18n/locale/sv/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Konversationer",
     "LOADING_CHART": "Laddar diagramdata...",
     "NO_ENOUGH_DATA": "Vi har inte fått tillräckligt många datapunkter för att generera en rapport, försök igen senare.",
     "DOWNLOAD_AGENT_REPORTS": "Ladda ner agentrapporter",
@@ -18,12 +18,16 @@
         "DESC": "( Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Första svarstiden",
-        "DESC": "( Genomsnitt )"
+        "NAME": "First Response Time",
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösningstid",
-        "DESC": "( Genomsnitt )"
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal lösta",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Affärstimmar"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Första svarstiden",
-        "DESC": "( Genomsnitt )"
+        "NAME": "First Response Time",
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösningstid",
-        "DESC": "( Genomsnitt )"
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal lösta",
@@ -193,12 +202,16 @@
         "DESC": "( Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Första svarstiden",
-        "DESC": "( Genomsnitt )"
+        "NAME": "First Response Time",
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösningstid",
-        "DESC": "( Genomsnitt )"
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal lösta",
@@ -256,12 +269,16 @@
         "DESC": "( Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Första svarstiden",
-        "DESC": "( Genomsnitt )"
+        "NAME": "First Response Time",
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösningstid",
-        "DESC": "( Genomsnitt )"
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal lösta",
@@ -319,12 +336,16 @@
         "DESC": "( Totalt )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Första svarstiden",
-        "DESC": "( Genomsnitt )"
+        "NAME": "First Response Time",
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Lösningstid",
-        "DESC": "( Genomsnitt )"
+        "DESC": "( Genomsnitt )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Antal lösta",
@@ -392,5 +413,33 @@
         "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": "Öppna",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Otilldelade"
+    },
+    "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": "Upptagen",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
index 224786c1a..eefdb1a29 100644
--- a/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/sv/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Lösenordet ändrat",
       "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Skicka"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 3e598d78e..46489d342 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopiera",
       "COPY_SUCCESSFUL": "Koden har kopierats till urklipp"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Hämta",
       "UPLOADING": "Laddar upp..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Konversationer",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "Konversationer",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inkorg",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/signup.json b/app/javascript/dashboard/i18n/locale/sv/signup.json
index ae3c7d79e..9ceb2530e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/signup.json
+++ b/app/javascript/dashboard/i18n/locale/sv/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Lösenord",
       "PLACEHOLDER": "Lösenord",
-      "ERROR": "Lösenordet är för kort"
+      "ERROR": "Lösenordet är för kort",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Bekräfta lösenord",
diff --git a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
index 4296d57f8..c9667d362 100644
--- a/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "Lägg till agenter",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/ta/automation.json b/app/javascript/dashboard/i18n/locale/ta/automation.json
index 3ae24a44e..c4ed6546c 100644
--- a/app/javascript/dashboard/i18n/locale/ta/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "பதிவேறுகிறது...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/chatlist.json b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
index 34a97d8e1..dd518b8d4 100644
--- a/app/javascript/dashboard/i18n/locale/ta/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "No Messages",
     "NO_CONTENT": "No content available",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "SHOW_QUOTED_TEXT": "Show Quoted Text",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
index 830af5ba4..f0599bf96 100644
--- a/app/javascript/dashboard/i18n/locale/ta/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "There was an error, please try again"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "இல்லை, அதை வைத்திரு"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Delete Contact",
     "TITLE": "Delete contact",
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
index 049f049a2..afce6591e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -60,6 +60,13 @@
   "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 1334b4c77..6862fe14e 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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": "மெசஞ்சர் ஸ்கிரிப்ட்",
@@ -431,6 +432,15 @@
     },
     "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": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "இமெயில்",
-        "PLACE_HOLDER": "இமெயில்"
+      "LOGIN": {
+        "LABEL": "உள்நுழையவும்",
+        "PLACE_HOLDER": "உள்நுழையவும்"
       },
       "PASSWORD": {
         "LABEL": "பாஸ்வேர்ட்",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "இமெயில்",
-        "PLACE_HOLDER": "இமெயில்"
+      "LOGIN": {
+        "LABEL": "உள்நுழையவும்",
+        "PLACE_HOLDER": "உள்நுழையவும்"
       },
       "PASSWORD": {
         "LABEL": "பாஸ்வேர்ட்",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
index 53c248139..ace9301c6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "சேர்ப்புகள்",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "ரத்துசெய்",
+        "DESC": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. மீட்டமைக்க சரியான URL ஐ உள்ளிடவும்.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "வெப்ஹூக் URL",
+          "PLACEHOLDER": "உதாரணமாக: https://example/api/webhook",
+          "ERROR": "சரியான URL ஐ பதிவிடவும்"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "வெப்ஹூக்கை உருவாக்கவும்"
+      },
       "TITLE": "வெப்ஹூக்",
       "CONFIGURE": "உள்ளமைக்கவும்",
       "HEADER": "வெப்ஹூக் அமைப்புகள்",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "திருத்து",
         "TITLE": "Edit webhook",
-        "CANCEL": "ரத்துசெய்",
-        "DESC": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. மீட்டமைக்க சரியான URL ஐ உள்ளிடவும்.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "வெப்ஹூக் URL",
-            "PLACEHOLDER": "உதாரணமாக: https://example/api/webhook",
-            "ERROR": "சரியான URL ஐ பதிவிடவும்"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
         }
       },
       "ADD": {
         "CANCEL": "ரத்துசெய்",
         "TITLE": "புதிய வெப்ஹூக் சேர்க்கவும்",
-        "DESC": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. மீட்டமைக்க சரியான URL ஐ உள்ளிடவும்.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "வெப்ஹூக் URL",
-            "PLACEHOLDER": "உதாரணமாக: https://example/api/webhook",
-            "ERROR": "சரியான URL ஐ பதிவிடவும்"
-          },
-          "SUBMIT": "வெப்ஹூக்கை உருவாக்கவும்"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "வெப்ஹூக் வெற்றிகரமாக சேர்க்கப்பட்டது",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
-          "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "ஆம், நீக்கு ",
           "NO": "இல்லை, அதை வைத்திரு"
         }
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
index 9a990937c..a9af84a42 100644
--- a/app/javascript/dashboard/i18n/locale/ta/report.json
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "உரையாடல்கள்",
     "LOADING_CHART": "சார்ட்டுக்கான டேட்டாவை பெறுகிறது...",
     "NO_ENOUGH_DATA": "அறிக்கையை உருவாக்க போதுமான தரவுகளை பெறவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.",
     "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
@@ -18,12 +18,16 @@
         "DESC": "( மொத்தம் )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "NAME": "First Response Time",
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "தீர்மான எண்ணிக்கை",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( மொத்தம் )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "NAME": "First Response Time",
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "தீர்மான எண்ணிக்கை",
@@ -193,12 +202,16 @@
         "DESC": "( மொத்தம் )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "NAME": "First Response Time",
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "தீர்மான எண்ணிக்கை",
@@ -256,12 +269,16 @@
         "DESC": "( மொத்தம் )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "NAME": "First Response Time",
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "தீர்மான எண்ணிக்கை",
@@ -319,12 +336,16 @@
         "DESC": "( மொத்தம் )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "NAME": "First Response Time",
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
-        "DESC": "(சராசரி)"
+        "DESC": "(சராசரி)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "தீர்மான எண்ணிக்கை",
@@ -392,5 +413,33 @@
         "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": "திற",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "ஒதுக்கப்படாதது"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "ஏஜென்ட்",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "நிலை"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Online",
+      "BUSY": "Busy",
+      "OFFLINE": "Offline"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
index d3be57b80..e21f0fcd2 100644
--- a/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "பாஸ்வேர்டு வெற்றிகரமாக மாற்றப்பட்டது",
       "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "சமர்பிக்கவும்"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 401786d97..896ae0d6d 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "நகல்",
       "COPY_SUCCESSFUL": "குறியீடு கிளிப்போர்டில் வெற்றிகரமாக காப்பி செய்யப்பட்டது"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "பதிவிறக்கம்",
       "UPLOADING": "பதிவேறுகிறது..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "உரையாடல்கள்",
     "ALL_CONVERSATIONS": "All Conversations",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "உரையாடல்கள்",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/signup.json b/app/javascript/dashboard/i18n/locale/ta/signup.json
index 88200b88c..61099d7c8 100644
--- a/app/javascript/dashboard/i18n/locale/ta/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ta/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "பாஸ்வேர்ட்",
       "PLACEHOLDER": "பாஸ்வேர்ட்",
-      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது"
+      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
diff --git a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
index 7b61f6ad8..085d0d8c1 100644
--- a/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "ஏஜென்ட்களைச் சேர்க்க",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
index 80ae4b49c..c44c34f89 100644
--- a/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/th/advancedFilters.json
@@ -1,91 +1,91 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "กรองบทสนทนา",
+    "SUBTITLE": "เพิ่มตัวกรองด้านล่างและคลิก 'ใช้ตัวกรอง' เพื่อกรองการสนทนา",
+    "ADD_NEW_FILTER": "เพิ่มตัวกรอง",
+    "FILTER_DELETE_ERROR": "ควรเลือกอย่างน้อย 1 ตัวกรองเพื่อบันทึก",
+    "SUBMIT_BUTTON_LABEL": "ใช้ตัวกรอง",
     "CANCEL_BUTTON_LABEL": "ยกเลิก",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "ล้างตัวกรอง",
+    "EMPTY_VALUE_ERROR": "โปรดระบุค่า",
+    "TOOLTIP_LABEL": "กรองการสนทนา",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "และ",
+      "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"
+      "equal_to": "เท่ากับ",
+      "not_equal_to": "ไม่เท่ากับ",
+      "contains": "มี",
+      "does_not_contain": "ไม่มี",
+      "is_present": "ที่แสดง",
+      "is_not_present": "ไม่แสดงอยู่",
+      "is_greater_than": "หลังจาก",
+      "is_less_than": "ก่อนหน้า",
+      "days_before": "x วันก่อน"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "จริง",
+      "FALSE": "เท็จ"
     },
     "ATTRIBUTES": {
       "STATUS": "สถานะ",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_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",
+      "TEAM_NAME": "ชื่อทีม",
+      "CONVERSATION_IDENTIFIER": "ตัวระบุการสนทนา",
+      "CAMPAIGN_NAME": "ชื่อแคมเปญ",
+      "LABELS": "ป้ายกำกับ",
+      "BROWSER_LANGUAGE": "ภาษาของเบราว์เซอร์",
+      "COUNTRY_NAME": "ชื่อประเทศ",
+      "REFERER_LINK": "ลิงก์อ้างอิง",
+      "CUSTOM_ATTRIBUTE_LIST": "รายการ",
+      "CUSTOM_ATTRIBUTE_TEXT": "ข้อความ",
+      "CUSTOM_ATTRIBUTE_NUMBER": "ตัวเลข",
+      "CUSTOM_ATTRIBUTE_LINK": "ลิงก์",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "ช่องทำเครื่องหมาย",
+      "CREATED_AT": "สร้างเมื่อ",
       "LAST_ACTIVITY": "ล่าสุดเมื่อ"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "ตัวกรองมาตรฐาน",
+      "ADDITIONAL_FILTERS": "ตัวกรองเพิ่มเติม",
       "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
+        "TITLE": "ต้องการบันทึกตัวกรองนี้หรือไม่?",
+        "LABEL": "ตั้งชื่อตัวกรอง",
+        "PLACEHOLDER": "โปรดใส่ชื่อสำหรับตัวกรองนี้",
         "ERROR_MESSAGE": "โปรดระบุชื่อ",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "บันทึกตัวกรอง",
         "CANCEL_BUTTON": "ยกเลิก",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "สร้างโฟลเดอร์สำเร็จแล้ว",
+          "ERROR_MESSAGE": "เกิดข้อผิดพลาดระหว่างสร้างโฟลเดอร์"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "สร้างกลุ่มตามตัวกรองสำเร็จแล้ว",
+          "ERROR_MESSAGE": "มีปัญหาระหว่างสร้างกลุ่มตามตัวกรอง"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "ลบตัวกรอง",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "ยืนยันการลบ",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "คุณต้องการลบตัวกรองหรือไม่? ",
             "YES": "เอาเลย",
-            "NO": "No, Keep it"
+            "NO": "เก็บตัวกรองไว้"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "ลบโฟลเดอร์สำเร็จแล้ว",
+          "ERROR_MESSAGE": "เกิดข้อผิดพลาดระหว่างลบโฟลเดอร์"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "ลบกลุ่มตามตัวกรองสำเร็จแล้ว",
+          "ERROR_MESSAGE": "มีปัญหาระหว่างลบกลุ่มตามตัวกรอง"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/th/agentMgmt.json b/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
index d2788680e..78d268e4a 100644
--- a/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/agentMgmt.json
@@ -21,7 +21,7 @@
     },
     "ADD": {
       "TITLE": "เพิ่มพนักงานในทีมของคุณ",
-      "DESC": "คุณสามารถเพิ่มผู้ที่จะสามารถรองรับกล่องจดหมายของคุณได้",
+      "DESC": "คุณสามารถเพิ่มผู้ที่จะสามารถจัดการกล่องจดหมายของคุณได้",
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "FORM": {
         "NAME": {
@@ -34,22 +34,22 @@
           "ERROR": "ต้องระบุประเภทของพนักงาน"
         },
         "EMAIL": {
-          "LABEL": "ที่อยู่อีเมล์",
-          "PLACEHOLDER": "กรุณาระบุที่อยู่อีเมล์ของพนักงาน"
+          "LABEL": "อีเมล์",
+          "PLACEHOLDER": "กรุณาระบุอีเมล์ของพนักงาน"
         },
         "SUBMIT": "เพิ่มพนักงาน"
       },
       "API": {
-        "SUCCESS_MESSAGE": "เพิ่มพนักงานเสร็จสิ้น",
+        "SUCCESS_MESSAGE": "เพิ่มพนักงานสำเร็จแล้ว",
         "EXIST_MESSAGE": "อีเมล์นี้ถูกใช้เเล้วโปรดลองใช้อีเมล์อื่น",
-        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้ โปรดลองอีกครั้งในภายหลัง"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
-        "SUCCESS_MESSAGE": "ลบพนักงานเสร็จสิ้น",
-        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
+        "SUCCESS_MESSAGE": "ลบพนักงานสำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้ โปรดลองอีกครั้งในภายหลัง"
       },
       "CONFIRM": {
         "TITLE": "ยืนยันการลบ",
diff --git a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
index 143c08092..925864ed9 100644
--- a/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/attributesMgmt.json
@@ -3,31 +3,31 @@
     "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": "สร้าง",
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "FORM": {
         "NAME": {
-          "LABEL": "แสดงรายชื่อ",
-          "PLACEHOLDER": "กำหนดชื่อที่ต้องการให้แสดงผล",
+          "LABEL": "ชื่อแอตทริบิวต์",
+          "PLACEHOLDER": "โปรดใส่ชื่อของแอตทริบิวต์",
           "ERROR": "โปรดระบุชื่อ"
         },
         "DESC": {
           "LABEL": "คำอธิบาย",
-          "PLACEHOLDER": "รายละเอียดของแอตทริบิวต์",
+          "PLACEHOLDER": "โปรดใส่รายละเอียดของแอตทริบิวต์",
           "ERROR": "โปรดระบุคำอธิบาย"
         },
         "MODEL": {
-          "LABEL": "นำไปใช้",
+          "LABEL": "นำไปใช้กับ",
           "PLACEHOLDER": "กรุณาเลือกประเภท",
-          "ERROR": "Model is required"
+          "ERROR": "ต้องการ Model"
         },
         "TYPE": {
-          "LABEL": "Type",
+          "LABEL": "ประเภท",
           "PLACEHOLDER": "กรุณาเลือกประเภท",
-          "ERROR": "Type is required",
+          "ERROR": "โปรดระบุประเภท",
           "LIST": {
             "LABEL": "รายการ",
             "PLACEHOLDER": "โปรดระบุ Value และ Key",
@@ -35,64 +35,64 @@
           }
         },
         "KEY": {
-          "LABEL": "Key",
-          "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "LABEL": "คีย์",
+          "PLACEHOLDER": "โปรดใส่คีย์ของแอตทริบิวต์เเบบกำหนดเอง",
+          "ERROR": "โปรดระบุคีย์",
+          "IN_VALID": "คีย์นี้ใช้ไม่ได้"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "SUCCESS_MESSAGE": "เพิ่มแอตทริบิวต์เเบบกำหนดเองสำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถสร้างแอตทริบิวต์เเบบกำหนดเอง ได้โปรดลองใหม่อีกครั้ง"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "ลบแอตทริบิวต์เเบบกำหนดเองสำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถลบแอตทริบิวต์เเบบกำหนดเอง โปรดลองอีกครั้ง"
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{attributeName}",
-        "PLACE_HOLDER": "Please type {attributeName} to confirm",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "TITLE": "คุณแน่ใจว่าต้องการลบ %{attributeName} หรือไม่",
+        "PLACE_HOLDER": "โปรดใส่ {attributeName} เพื่อยืนยัน",
+        "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": {
       "HEADER": "แอตทริบิวต์ที่กำหนดเอง",
-      "CONVERSATION": "Conversation",
-      "CONTACT": "Contact"
+      "CONVERSATION": "การสนทนา",
+      "CONTACT": "รายชื่อผู้ติดต่อ"
     },
     "LIST": {
       "TABLE_HEADER": [
         "ชื่อ",
-        "Description",
-        "Type",
-        "Key"
+        "คำอธิบาย",
+        "ประเภท",
+        "คีย์"
       ],
       "BUTTONS": {
         "EDIT": "เเก้ไข",
         "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/th/automation.json b/app/javascript/dashboard/i18n/locale/th/automation.json
index cd502cb50..aee9fe2e7 100644
--- a/app/javascript/dashboard/i18n/locale/th/automation.json
+++ b/app/javascript/dashboard/i18n/locale/th/automation.json
@@ -1,54 +1,54 @@
 {
   "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": "Description",
-          "PLACEHOLDER": "Enter rule description",
+          "LABEL": "คำอธิบาย",
+          "PLACEHOLDER": "ใส่คำอธิบาย",
           "ERROR": "โปรดระบุคำอธิบาย"
         },
         "EVENT": {
-          "LABEL": "Event",
-          "PLACEHOLDER": "กรุณาเลือกประเภท",
-          "ERROR": "Event is required"
+          "LABEL": "เหตุการณ์",
+          "PLACEHOLDER": "โปรดเลือก",
+          "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": {
       "TABLE_HEADER": [
         "ชื่อ",
-        "Description",
+        "คำอธิบาย",
         "ใช้งานอยู่",
-        "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,25 +83,34 @@
       "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"
+      "DELETE_MESSAGE": "คุณต้องมีอย่างน้อย 1 เงื่อนไขเพื่อบันทึก"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "DELETE_MESSAGE": "คุณต้องมีเงื่อนไขอย่างน้อย 1 การกระทำเพื่อบันทึก",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Geben Sie hier Ihre Nachricht ein",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Teams auswählen"
     },
     "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"
+      "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": "ไม่สามารถอัปโหลดไฟล์แนบได้ โปรดลองใหม่อีกครั้ง",
+      "LABEL_IDLE": "อัปโหลดไฟล์แนบ",
+      "LABEL_UPLOADING": "กำลังอัปโหลด",
+      "LABEL_UPLOADED": "อัปโหลดสำเร็จแล้ว",
+      "LABEL_UPLOAD_FAILED": "อัปโหลดไม่สำเร็จ"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/campaign.json b/app/javascript/dashboard/i18n/locale/th/campaign.json
index 78fa274b2..112594952 100644
--- a/app/javascript/dashboard/i18n/locale/th/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/th/campaign.json
@@ -3,8 +3,8 @@
     "HEADER": "แคมเปญ",
     "SIDEBAR_TXT": "ข้อความที่ช่วยให้ลูกค้าสามารถส่งข้อควาไปยังผู้ติดต่อซึ่งจะทำให้เกิดการสนทนามากขึ้น คลิกที่ <b> เพิ่มแคมเปญ </b> เพื่อสร้างแคมเปญใหม่ คุณยังสามารถแก้ไขหรือลบแคมเปญที่มีอยู่ได้โดยคลิกที่ปุ่มแก้ไขหรือลบ",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "สร้างแคมเปญแบบครั้งเดียว",
-      "ONGOING": "สร้างแคมเปญแบบต่อเนื่อง"
+      "ONE_OFF": "สร้างแคมเปญครั้งเดียว",
+      "ONGOING": "สร้างแคมเปญต่อเนื่อง"
     },
     "ADD": {
       "TITLE": "สร้างแคมเปญใหม่",
@@ -18,20 +18,20 @@
           "ERROR": "โปรดระบุหัวข้อด้วย"
         },
         "SCHEDULED_AT": {
-          "LABEL": "ตารางเวลา",
-          "PLACEHOLDER": "กรุณาระบุเวลา",
+          "LABEL": "วันเริ่มแคมเปญ",
+          "PLACEHOLDER": "โปรดระบุเวลา",
           "CONFIRM": "ยืนยัน",
-          "ERROR": "กำหนดเวลา"
+          "ERROR": "โปรดระบุวันเริ่มแคมเปญ"
         },
         "AUDIENCE": {
-          "LABEL": "เป้าหมาย",
-          "PLACEHOLDER": "เลือกป้ายชื่อลูกค้า",
-          "ERROR": "จำเป็นต้องระบุเป้าหมาย"
+          "LABEL": "ผู้รับ",
+          "PLACEHOLDER": "เลือกป้ายกำกับลูกค้า",
+          "ERROR": "โปรดระบุผู้รับ"
         },
         "INBOX": {
           "LABEL": "เลือกกล่องข้อความ",
           "PLACEHOLDER": "เลือกกล่องข้อความ",
-          "ERROR": "จำเป็นต้องมีกล่องข้อความ"
+          "ERROR": "โปรดเลือกกล่องข้อความ"
         },
         "MESSAGE": {
           "LABEL": "ข้อความ",
@@ -54,7 +54,7 @@
           "ERROR": "กรุณาระบุเวลาที่อยู่ในหน้านั้นด้วย"
         },
         "ENABLED": "เปิดเเคมเปญ",
-        "TRIGGER_ONLY_BUSINESS_HOURS": "เรียกเฉพาะในเวลาทำการ",
+        "TRIGGER_ONLY_BUSINESS_HOURS": "เปิดใช้แค่ในเวลาทำการ",
         "SUBMIT": "เพิ่มเเคมเปญ"
       },
       "API": {
@@ -72,7 +72,7 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "ลบแคมเปญเรียบร้อยแล้ว",
-        "ERROR_MESSAGE": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง."
+        "ERROR_MESSAGE": "ไม่สามารถลบแคมเปญได้ โปรดลองใหม่อีกครั้ง"
       }
     },
     "EDIT": {
@@ -93,7 +93,7 @@
         "STATUS": "สถานะ",
         "SENDER": "ผู้ส่ง",
         "URL": "ลิ้ง",
-        "SCHEDULED_AT": "ตารางเวลา",
+        "SCHEDULED_AT": "วันเริ่มแคมเปญ",
         "TIME_ON_PAGE": "เวลา (วินาที)",
         "CREATED_AT": "สร้างเมื่อ"
       },
@@ -113,13 +113,13 @@
       }
     },
     "ONE_OFF": {
-      "HEADER": "แคมเปญเดียว",
-      "404": "ยังไม่มีใครสร้างแคมเปญ",
+      "HEADER": "แคมเปญครั้งเดียว",
+      "404": "ยังไม่มีแคมเปญครั้งเดียวที่ถูกสร้าง",
       "INBOXES_NOT_FOUND": "โปรดสร้างกล่องข้อความ SMS และเพิ่มแคมเปญ"
     },
     "ONGOING": {
       "HEADER": "แคมเปญต่อเนื่อง",
-      "404": "ไม่มีการสร้างแคมเปญต่อเนื่อง",
+      "404": "ยังไม่มีแคมเปญต่อเนื่องที่ถูกสร้าง",
       "INBOXES_NOT_FOUND": "โปรดสร้างกล่องข้อความของเว็บไซต์ และเพิ่มแคมเปญ"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
index 1e05e4ae6..e2840d7e3 100644
--- a/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "เพิ่มคำตอบสำเร็จรูป",
     "LOADING": "กำลังดึงการตอบสำเร็จรูป",
     "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
-    "SIDEBAR_TXT": "<p><b>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": "จัดกาาคำตอบสำเร็จรูป",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "เพิ่มคำตอบสำเร็จรูป",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "ข้อความลัด คือ รูปแบบการตอบกลับข้อความที่บันทึกไว้ สามารถใช้เพื่อตอบกลับการสนทนาได้อย่างรวดเร็ว",
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "หรัสสั้นๆ",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "กรุณากรอกคำย่อ",
           "ERROR": "จำเป็นต้องระบุหรัสสั่น"
         },
         "CONTENT": {
@@ -42,8 +42,8 @@
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "หรัสสั้นๆ",
-          "PLACEHOLDER": "กรุณากรอกหรัสสั่นๆ",
+          "LABEL": "รหัสสั้นๆ",
+          "PLACEHOLDER": "กรุณากรอกรหัสสั้น",
           "ERROR": "จำเป็นต้องระบุหรัสสั่น"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/th/chatlist.json b/app/javascript/dashboard/i18n/locale/th/chatlist.json
index f6799092a..94293972e 100644
--- a/app/javascript/dashboard/i18n/locale/th/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/th/chatlist.json
@@ -7,7 +7,7 @@
       "404": "ไม่มีการสนทนาที่ใช้งานในกลุ่มนี้"
     },
     "TAB_HEADING": "การสนทนา",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "กล่าวถึง",
     "SEARCH": {
       "INPUT": "ค้นหาผู้คน, เเชท, หรือการตอบกลับ"
     },
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "ได้รับทางอีเมลล์",
     "VIEW_TWEET_IN_TWITTER": "ดูทวิตในทวิตเตอร์",
     "REPLY_TO_TWEET": "ตอบกลับทวิตนี้",
-    "LINK_TO_STORY": "ดูการสนทนาย้อนหลัง",
-    "SENT": "จัดส่งสำเร็จ",
+    "LINK_TO_STORY": "ไปยังอินสตาแกรมสตอรี่",
+    "SENT": "ส่งสำเร็จแล้ว",
     "NO_MESSAGES": "ไม่มีข้อความ",
     "NO_CONTENT": "ไม่มีเนื้อหา",
     "HIDE_QUOTED_TEXT": "ซ่อนข้อความในเครื่องหมายคำพูด",
-    "SHOW_QUOTED_TEXT": "แสดงข้อความในเครื่องหมายคำพูด"
+    "SHOW_QUOTED_TEXT": "แสดงข้อความในเครื่องหมายคำพูด",
+    "MESSAGE_READ": "อ่านแล้ว"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contact.json b/app/javascript/dashboard/i18n/locale/th/contact.json
index 9cc933ca7..718b71c5e 100644
--- a/app/javascript/dashboard/i18n/locale/th/contact.json
+++ b/app/javascript/dashboard/i18n/locale/th/contact.json
@@ -21,7 +21,7 @@
     "LABELS": {
       "CONTACT": {
         "TITLE": "ป้ายกำกับผู้ติดต่อ",
-        "ERROR": "ไม่สามารถอัพเดทป้ายกำกับได้"
+        "ERROR": "ไม่สามารถอัปเดตป้ายกำกับได้"
       },
       "CONVERSATION": {
         "TITLE": "ป้ายกำกับการสนทนา",
@@ -33,7 +33,7 @@
         "NO_RESULT": "ไม่พบหัวข้อ"
       }
     },
-    "MERGE_CONTACT": "รวมผู้ติดต่อเข้าด้วยกัน",
+    "MERGE_CONTACT": "รวมผู้ติดต่อ",
     "CONTACT_ACTIONS": "ดำเนินการติดต่อ",
     "MUTE_CONTACT": "ระงับการสนทนา",
     "UNMUTE_CONTACT": "เลิกใบ้การสนทนา",
@@ -67,9 +67,17 @@
       "SUBMIT": "นำเข้า",
       "CANCEL": "ยกเลิก"
     },
-    "SUCCESS_MESSAGE": "บันทึกรายชื่อเรียบร้อยแล้ว",
+    "SUCCESS_MESSAGE": "บันทึกผู้ติดต่อเรียบร้อยแล้ว",
     "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "ยืนยันการลบ",
+      "MESSAGE": "คุณต้องการลบโน๊ตนี้หรือไม่?",
+      "YES": "ลบ",
+      "NO": "เก็บไว้"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "ลบผู้ติดต่อ",
     "TITLE": "ลบผู้ติดต่อ",
@@ -81,8 +89,8 @@
       "NO": "ไม่"
     },
     "API": {
-      "SUCCESS_MESSAGE": "ลบผู้ติดต่อเรียบร้อยแล้ว",
-      "ERROR_MESSAGE": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง."
+      "SUCCESS_MESSAGE": "ลบผู้ติดต่อสำเร็จแล้ว",
+      "ERROR_MESSAGE": "ไม่สามารถลบผู้ติดต่อได้ โปรดลองใหม่อีกครั้ง"
     }
   },
   "CONTACT_FORM": {
@@ -110,7 +118,7 @@
         "LABEL": "หมายเลขโทรศัพท์",
         "HELP": "เบอร์โทรศัพท์ควรจะเป็นเเบบนี้เช่น +663990214 [+][หรัสประเทศ][หรัสพื้นที่][เลขโทรศัพท์]",
         "ERROR": "หมายเลขโทรศัพท์ควรจะว่างปล่าวหรืออยู่ในรู้เเบบ E.164",
-        "DUPLICATE": "หมายเลขนี้ถูกใช้ในผู้ติดต่อคนอื่นเเล้ว"
+        "DUPLICATE": "หมายเลขนี้ถูกใช้สำหรับผู้ติดต่อคนอื่นเเล้ว"
       },
       "LOCATION": {
         "PLACEHOLDER": "กรอกที่อยู่ผู้ติดต่อ",
@@ -174,12 +182,12 @@
   },
   "CONTACTS_PAGE": {
     "HEADER": "ผู้ติดต่อ",
-    "FIELDS": "ฟิลส์ผู้ติดต่อ",
+    "FIELDS": "ข้อมูลผู้ติดต่อ",
     "SEARCH_BUTTON": "ค้นหา",
     "SEARCH_INPUT_PLACEHOLDER": "ค้อนหาผู้ติดต่อ",
-    "FILTER_CONTACTS": "กรอง",
-    "FILTER_CONTACTS_SAVE": "บันทึกฟิลเตอร์",
-    "FILTER_CONTACTS_DELETE": "ลบฟิลเตอร์",
+    "FILTER_CONTACTS": "ตัวกรอง",
+    "FILTER_CONTACTS_SAVE": "บันทึกตัวกรอง",
+    "FILTER_CONTACTS_DELETE": "ลบตัวกรอง",
     "LIST": {
       "LOADING_MESSAGE": "กำลังโหลดรายชื่อผู้ติดต่อ",
       "404": "ไม่มีผู้ติดต่อที่ตรงกัน 🔍",
@@ -213,13 +221,13 @@
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "กำลังเรียกบันทึก...",
-    "NOT_AVAILABLE": "ไม่มีข้อความที่สร้างขึ้นสำหรับผู้ติดต่อรายนี้",
+    "FETCHING_NOTES": "กำลังเรียกโน๊ต...",
+    "NOT_AVAILABLE": "ไม่มีโน๊ตที่สร้างขึ้นสำหรับผู้ติดต่อรายนี้",
     "HEADER": {
       "TITLE": "โน้ต"
     },
     "LIST": {
-      "LABEL": "เพิ่มข้อความ"
+      "LABEL": "เพิ่มโน๊ต"
     },
     "ADD": {
       "BUTTON": "เพิ่ม",
@@ -227,7 +235,7 @@
       "TITLE": "Shift + Enter เพื่อสร้างโน็ต"
     },
     "CONTENT_HEADER": {
-      "DELETE": "ลบข้อความ"
+      "DELETE": "ลบโน๊ต"
     }
   },
   "EVENTS": {
@@ -236,7 +244,7 @@
     },
     "BUTTON": {
       "PILL_BUTTON_NOTES": "โน้ต",
-      "PILL_BUTTON_EVENTS": "อีเว้นท์",
+      "PILL_BUTTON_EVENTS": "เหตุการณ์",
       "PILL_BUTTON_CONVO": "การสนทนา"
     }
   },
@@ -258,26 +266,26 @@
       "CREATE": "เพิ่มแอตทริบิวต์",
       "CANCEL": "ยกเลิก",
       "NAME": {
-        "LABEL": "สร้าบชื่อแอตทริบิวต์เเบบกำหนดเอง",
-        "PLACEHOLDER": "ตัวอย่าง: ไอดีผู้ใช้",
+        "LABEL": "ชื่อแอตทริบิวต์เเบบกำหนดเอง",
+        "PLACEHOLDER": "เช่น ไอดีผู้ใช้",
         "ERROR": "แอตทริบิวต์เเบบกำหนดเองไม่ถูกต้อง"
       },
       "VALUE": {
         "LABEL": "ค่าของแอตทริบิวต์",
-        "PLACEHOLDER": "ตัวอย่าง: 11901 "
+        "PLACEHOLDER": "เช่น 11901 "
       },
       "ADD": {
         "TITLE": "สร้างแอตทริบิวต์ใหม่ ",
-        "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
-        "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
+        "SUCCESS": "เพิ่มแอตทริบิวต์สำเร็จแล้ว",
+        "ERROR": "ไม่สามารถอัปเดตแอตทริบิวต์ได้ กรุณาลองใหม่อีกครั้ง"
       },
       "UPDATE": {
-        "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
-        "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
+        "SUCCESS": "อัปเดตแอตทริบิวต์เรียบร้อยแล้ว",
+        "ERROR": "ไม่สามารถอัปเดตแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
       },
       "DELETE": {
-        "SUCCESS": "ทำการลบเรียบร้อย",
-        "ERROR": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง"
+        "SUCCESS": "ลบแอตทริบิวต์สำเร็จแล้ว",
+        "ERROR": "ไม่สามารถลบแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "เพิ่มแอตทริบิวต์",
@@ -293,16 +301,16 @@
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "กรุณาระบุค่าที่ถูกต้อง",
+      "REQUIRED": "โปรดระบุค่าที่ถูกต้อง",
       "INVALID_URL": "URL ไม่ถูกต้อง"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "รวมผู้ติดต่อเข้าด้วยกัน",
-    "DESCRIPTION": "รวมรายชื่อติดต่อเพื่อรวมสองโปรไฟล์เข้าด้วยกัน รวมทั้งแอตทริบิวต์และการสนทนาทั้งหมด ในกรณีที่มีข้อขัดแย้ง แอตทริบิวต์ของผู้ติดต่อหลักจะมีความสำคัญเหนือกว่า",
+    "TITLE": "รวมผู้ติดต่อ",
+    "DESCRIPTION": "รวมผู้ติดต่อเพื่อรวมสองโปรไฟล์ทั้งสองเข้าด้วยกัน รวมถึงแอตทริบิวต์และการสนทนาทั้งหมด ในกรณีที่มีข้อขัดแย้ง แอตทริบิวต์ของผู้ติดต่อหลักจะมีความสำคัญมากกว่า",
     "PRIMARY": {
       "TITLE": "ผู้ติดต่อหลัก",
-      "HELP_LABEL": "เก็บไว้"
+      "HELP_LABEL": "ที่ต้องการเก็บไว้"
     },
     "CHILD": {
       "TITLE": "ผู้ติดต่อที่จะรวมเข้าด้วยกัน",
@@ -318,13 +326,13 @@
       "ERROR": "ข้อความผิดพลาด"
     },
     "FORM": {
-      "SUBMIT": " รวมผู้ติดต่อเข้าด้วยกัน",
+      "SUBMIT": " รวมผู้ติดต่อ",
       "CANCEL": "ยกเลิก",
       "CHILD_CONTACT": {
         "ERROR": "เลือกผู้ติดต่อที่จะรวมเข้าด้วยกัน"
       },
-      "SUCCESS_MESSAGE": "รวมผู้ติดต่อเข้าด้วยกันเรียบร้อยเเล้ว",
-      "ERROR_MESSAGE": "ไม่สามารถรวมผู้ติดต่อได้ ลองใหม่อีกครั้งด้วยนะ!"
+      "SUCCESS_MESSAGE": "รวมผู้ติดต่อสำเร็จเเล้ว",
+      "ERROR_MESSAGE": "ไม่สามารถรวมผู้ติดต่อได้ โปรดลองใหม่อีกครั้ง!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/contactFilters.json b/app/javascript/dashboard/i18n/locale/th/contactFilters.json
index 572f9e011..1b666918e 100644
--- a/app/javascript/dashboard/i18n/locale/th/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/th/contactFilters.json
@@ -1,48 +1,48 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "ตัวกรองรายชื่อผู้ติดต่อ",
+        "SUBTITLE": "เพิ่มตัวกรองด้านล่างและคลิก 'ส่ง' เพื่อกรองรายชื่อผู้ติดต่อ",
+        "ADD_NEW_FILTER": "เพิ่มตัวกรอง",
+        "CLEAR_ALL_FILTERS": "ล้างตัวกรองทั้งหมด",
+        "FILTER_DELETE_ERROR": "ควรเลือกอย่างน้อย 1 ตัวกรองเพื่อบันทึก",
         "SUBMIT_BUTTON_LABEL": "ส่ง",
         "CANCEL_BUTTON_LABEL": "ยกเลิก",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "ล้างตัวกรอง",
+        "EMPTY_VALUE_ERROR": "โปรดระบุค่า",
+        "TOOLTIP_LABEL": "ตัวกรองรายชื่อผู้ติดต่อ",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "และ",
+            "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"
+            "equal_to": "เท่ากับ",
+            "not_equal_to": "ไม่เท่ากับ",
+            "contains": "มี",
+            "does_not_contain": "ไม่มี",
+            "is_present": "ที่แสดง",
+            "is_not_present": "ที่ไม่แสดง",
+            "is_greater_than": "หลังจาก",
+            "is_lesser_than": "ก่อนหน้า",
+            "days_before": "x วันก่อน"
         },
         "ATTRIBUTES": {
             "NAME": "ชื่อ",
             "EMAIL": "อีเมล์",
             "PHONE_NUMBER": "หมายเลขโทรศัพท์",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "ตัวระบุ",
             "CITY": "เมือง",
             "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",
+            "CUSTOM_ATTRIBUTE_LIST": "รายการ",
+            "CUSTOM_ATTRIBUTE_TEXT": "ข้อความ",
+            "CUSTOM_ATTRIBUTE_NUMBER": "ตัวเลข",
+            "CUSTOM_ATTRIBUTE_LINK": "ลิงก์",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "ช่องทำเครื่องหมาย",
+            "CREATED_AT": "สร้างเมื่อ",
             "LAST_ACTIVITY": "ล่าสุดเมื่อ"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "ตัวกรองมาตรฐาน",
+            "ADDITIONAL_FILTERS": "ตัวกรองเพิ่มเติม",
             "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index 9e1f651c7..e55374670 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "กรุณาเลือกการสนทนาจากด้านซ้าย",
-    "UNVERIFIED_SESSION": "ข้อมูลประจำตัวของผู้ใช้รายนี้ยังไม่ได้รับการยืนยัน",
+    "UNVERIFIED_SESSION": "ข้อมูลระบุตัวตนของผู้ใช้รายนี้ยังไม่ได้รับการยืนยัน",
     "NO_MESSAGE_1": "โอ้ว ไม่นะเหมือนจะไม่มีข้อความจากลูกค้าของคุณในกล่องข้อความ",
     "NO_MESSAGE_2": " เพื่อส่งข้อความไปยังเพจของคุณ!",
     "NO_INBOX_1": "โฮล่า! ดูเหมือนว่าคุณยังไม่ได้เพิ่มกล่องจดหมายเลยนะ",
@@ -9,10 +9,10 @@
     "NO_INBOX_AGENT": "เอ่อโอ้! ดูเหมือนว่าคุณไม่ได้เป็นส่วนหนึ่งของกล่องจดหมายใด ๆ โปรดติดต่อผู้ดูแลระบบของคุณ",
     "SEARCH_MESSAGES": "ค้นหาข้อความในการสนทนา",
     "SEARCH": {
-      "TITLE": "ค้าหาข้อความ",
+      "TITLE": "ค้นหาข้อความ",
       "RESULT_TITLE": "ผลการค้นหา",
       "LOADING_MESSAGE": "กำลังโหลดข้อมูล",
-      "PLACEHOLDER": "พิมพ์สักอย่างเพื่อค้นหาข้อความ",
+      "PLACEHOLDER": "พิมพ์ข้อความที่ต้องการค้นหา",
       "NO_MATCHING_RESULTS": "ไม่พบผลการค้นหา"
     },
     "UNREAD_MESSAGES": "ข้อความที่ยังไม่ได้อ่าน",
@@ -22,17 +22,17 @@
     "LOADING_CONVERSATIONS": "กำลังโหลดการสนทนา",
     "CANNOT_REPLY": "คุณไม่สามารถตอบกลับได้เนื่องจาก",
     "24_HOURS_WINDOW": "การจำกัดหน้าต่างข้อความ 24 ชั่วโมง",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "การสนทนานี้ไม่ได้ถูกมอบหมายให้คุณ ต้องการที่จะจัดการด้วยตัวเองหรือไม่?",
     "ASSIGN_TO_ME": "มอบหมายให้ฉัน",
-    "TWILIO_WHATSAPP_CAN_REPLY": "คุณสามารถตอบกลับการสนทนานี้ได้โดยการใช้เเม่เเบบเวลาที่กำหนด",
+    "TWILIO_WHATSAPP_CAN_REPLY": "คุณสามารถตอบกลับการสนทนานี้ได้โดยใช้รูปแบบข้อความที่กำหนดเท่านั้น",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "การจำกัดหน้าต่างข้อความ 24 ชั่วโมง",
-    "SELECT_A_TWEET_TO_REPLY": "กรุณาเลือกทวีตที่ต้อวการติบกลับ",
+    "SELECT_A_TWEET_TO_REPLY": "โปรดเลือกทวีตที่ต้องการตอบกลับ",
     "REPLYING_TO": "คุณกำลังตอบกลับ:",
     "REMOVE_SELECTION": "ลบตัวเลือก",
     "DOWNLOAD": "ดาวโหลด",
-    "UPLOADING_ATTACHMENTS": "กำลังอัพโหลดไฟล์",
-    "SUCCESS_DELETE_MESSAGE": "ลบข้อความเรียบร้อยเเล้ว",
-    "FAIL_DELETE_MESSSAGE": "ไม่สามารถลบข้อความได้ กรุณาลองใหม่อีกครั้ง",
+    "UPLOADING_ATTACHMENTS": "กำลังอัปโหลดไฟล์แนบ",
+    "SUCCESS_DELETE_MESSAGE": "ลบข้อความสำเร็จเเล้ว",
+    "FAIL_DELETE_MESSSAGE": "ไม่สามารถลบข้อความได้ โปรดลองใหม่อีกครั้ง",
     "NO_RESPONSE": "ไม่มีการตอบกลับ",
     "RATING_TITLE": "การประเมิน",
     "FEEDBACK_TITLE": "ผลตอบรับ",
@@ -43,27 +43,27 @@
       "OPEN": "เพิ่มเติม",
       "CLOSE": "ปิด",
       "DETAILS": "รายละเอียด",
-      "SNOOZED_UNTIL_TOMORROW": "ปิดการแจ้งเตือนจนถึงพรุ่งนี้",
-      "SNOOZED_UNTIL_NEXT_WEEK": "ปิดการแจ้งเตือนจนถึงอาทิตย์หน้า",
-      "SNOOZED_UNTIL_NEXT_REPLY": "ปิดการแจ้งเตือนจนการตอบกลับถัดไป"
+      "SNOOZED_UNTIL_TOMORROW": "พักการสนทนาจนถึงพรุ่งนี้",
+      "SNOOZED_UNTIL_NEXT_WEEK": "พักการสนทนาจนถึงสัปดาห์หน้า",
+      "SNOOZED_UNTIL_NEXT_REPLY": "พักการสนทนาจนกว่าจะมีการตอบกลับถัดไป"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างการรอ",
+      "MARK_PENDING": "ทำเครื่องหมายว่าอยู่ระหว่างดำเนินการ",
       "SNOOZE": {
-        "TITLE": "หลับจนถึง",
-        "NEXT_REPLY": "การตอบกลับต่อไป",
+        "TITLE": "พักการสนทนาจนถึง",
+        "NEXT_REPLY": "การตอบกลับถัดไป",
         "TOMORROW": "พรุ่งนี้",
         "NEXT_WEEK": "สัปดาห์หน้า"
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "ข้อความลายเซ็น",
+      "ENABLE_SIGN_TOOLTIP": "เปิดการใช้ลายเซ็นต์",
+      "DISABLE_SIGN_TOOLTIP": "ปิดการใช้ลายเซ็นต์",
       "MSG_INPUT": "Shift + enter สำหรับบรรทัดใหม่ เริ่มต้นด้วย '/' เพื่อเลือกคำตอบสำเร็จรูป",
       "PRIVATE_MSG_INPUT": "Shift + enter สำหรับบรรทัดใหม่ สิ่งนี้จะปรากฏแก่พนักงานเท่านั้น",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "ข้อความลายเซ็นต์ไม่ได้ถูกตั้งค่า โปรดปรับแต่งในหน้าตั้งค่าข้อมูลส่วนตัว",
+      "CLICK_HERE": "คลิกที่นี่เพื่ออัปเดต"
     },
     "REPLYBOX": {
       "REPLY": "ตอบ",
@@ -71,28 +71,28 @@
       "SEND": "ส่ง",
       "CREATE": "เพิ่มโน้ต",
       "TWEET": "ทวิต",
-      "TIP_FORMAT_ICON": "เเสดงที่เเก้ไขข้อความ",
-      "TIP_EMOJI_ICON": "โชว์ตัวเลือกอีโมจิ",
-      "TIP_ATTACH_ICON": "เพิ่มไฟล์",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
-      "ENTER_TO_SEND": "กดเอ็นเทอร์เพื่อส่ง",
+      "TIP_FORMAT_ICON": "เเสดงเครื่องมือแก้ไขข้อความริช",
+      "TIP_EMOJI_ICON": "แสดงตัวเลือกอีโมจิ",
+      "TIP_ATTACH_ICON": "เพิ่มไฟล์แนบ",
+      "TIP_AUDIORECORDER_ICON": "บันทึกเสียง",
+      "TIP_AUDIORECORDER_PERMISSION": "ให้สิทธิ์เข้าถึงการใช้งานเสียง",
+      "TIP_AUDIORECORDER_ERROR": "ไม่สามารถเปิดการใช้งานเสียงได้",
+      "ENTER_TO_SEND": "กด Enter เพื่อส่ง",
       "DRAG_DROP": "ลากเเละปล่อยที่นี่เพื่อเพิ่ม",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "START_AUDIO_RECORDING": "เริ่มบันทึกเสียง",
+      "STOP_AUDIO_RECORDING": "หยุดบันทึกเสียง",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "เพิ่ม BCC",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "อีเมล์ถูกเเยกโดยคอมม่า",
-          "ERROR": "กรุณากรอกอีเมล์มห้ถูกต้อง"
+          "PLACEHOLDER": "แยกอีเมลโดยใช้เครื่องหมายคอมม่า",
+          "ERROR": "โปรดใส่ที่อยู่อีเมลที่ถูกต้อง"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "อีเมล์ถูกเเยกโดยคอมม่า",
-          "ERROR": "กรุณากรอกอีเมล์ให้ถูกต้อง"
+          "PLACEHOLDER": "แยกอีเมลโดยใช้เครื่องหมายคอมม่า",
+          "ERROR": "โปรดกรอกอีเมลที่ถูกต้อง"
         }
       }
     },
@@ -100,12 +100,12 @@
     "CHANGE_STATUS": "สถานะการสนทนามีการเปลี่ยนเเปลง",
     "CHANGE_AGENT": "ผู้ได้รับมอบหมายการสนทนานี้มีการเปลี่ยนแปลง",
     "CHANGE_TEAM": "เปลี่ยนทีมการสนทนาเเล้ว",
-    "FILE_SIZE_LIMIT": "ไฟล์ใหเกินกว่า {MAXIMUM_FILE_UPLOAD_SIZE} ที่กำหนดไว้",
-    "MESSAGE_ERROR": "ไม่สามารถส่งข้อความนี้ได้ กรุณาลองใหม่อีกครั้ง",
+    "FILE_SIZE_LIMIT": "ไม่สามารถแนบไฟล์ขนาดใหญ่เกิน {MAXIMUM_FILE_UPLOAD_SIZE} ได้",
+    "MESSAGE_ERROR": "ไม่สามารถส่งข้อความนี้ได้ โปรดลองใหม่อีกครั้ง",
     "SENT_BY": "ส่งโดย:",
     "BOT": "บอท",
-    "SEND_FAILED": "ไม่สามารถส่งข้อความได้กรุณาลองอีกครั้ง",
-    "TRY_AGAIN": "กรุณาลองอีกครั้ง",
+    "SEND_FAILED": "ไม่สามารถส่งข้อความได้ โปรดลองอีกครั้ง",
+    "TRY_AGAIN": "ส่งอีกครั้ง",
     "ASSIGNMENT": {
       "SELECT_AGENT": "เลือกพนักงาน",
       "REMOVE": "ลบออก",
@@ -134,68 +134,68 @@
     }
   },
   "ONBOARDING": {
-    "TITLE": "ว่าไง👋, ยินดีต้อนรับเข้าสู่ %{installationName}",
-    "DESCRIPTION": "ขอบคุสำหรับการสมัคร เราต้องดารให้คุณรับ %{installationName} มากที่สุดเเละนี่สิ่งเล็กน้อยที่คุณสามารถทำได้ใน %{installationName} เพื่อทำให้ประสพการณ์ทชการที่ดีขึ้น",
-    "READ_LATEST_UPDATES": "อ่านจดหมายล่าสุด",
+    "TITLE": "สวัสดี 👋, ยินดีต้อนรับเข้าสู่ %{installationName}!",
+    "DESCRIPTION": "ขอบคุณสำหรับการสมัคร เราอยากให้คุณได้ใช้งาน %{installationName} อย่างเต็มที่ เเละนี่คือสิ่งเล็กน้อยที่คุณสามารถทำได้ใน %{installationName} เพื่อประสบการณ์การใช้งานที่ดียิ่งขึ้น",
+    "READ_LATEST_UPDATES": "อ่านการอัปเดตล่าสุด",
     "ALL_CONVERSATION": {
-      "TITLE": "การสนทนาทั้งหมดขอบคุณในที่เดียว",
-      "DESCRIPTION": "ดูการสนทนาทั้งหมดจากลูกค้าของคุณในหน้าเเดสบอรด์เดียว คุณสามารถกรอกการสนทนาโดยช่องที่เข้ามา หรือ ป้ายกำกับเเละสถานะ"
+      "TITLE": "รวมการสนทนาของคุณทั้งหมดในที่เดียว",
+      "DESCRIPTION": "ดูการสนทนาทั้งหมดจากลูกค้าของคุณในหน้าเดียว คุณสามารถเลือกดูการสนทนาตามช่องทางที่ส่งข้อความ, ตามป้ายกำกับ หรือตามสถานะของการสนทนาได้"
     },
     "TEAM_MEMBERS": {
       "TITLE": "เชิญสมาชิกในทีมของคุณ",
-      "DESCRIPTION": "เมื่อคุณพร้อมที่จะคุยกับลูกค้าของคุณ กรุณาให้เพื่อนในทีมมาช่วยคุณ คุณสามารถเชิญเพื่อนในทีมได้โดยการใส่อีเมลของเขาใน Agent List",
+      "DESCRIPTION": "ในเมื่อคุณพร้อมจะคุยกับลูกค้าแล้ว ให้เพื่อนร่วมทีมเข้ามาช่วยคุณ คุณสามารถเชิญเพื่อนร่วมทีมได้โดยการเพิ่มอีเมลของเขาลงในรายชื่อพนักงาน",
       "NEW_LINK": "คลิกที่นี่เพื่อเชิญสมาชิกในทีม"
     },
     "INBOXES": {
       "TITLE": "เชื่อมต่อกล่องข้อความ",
-      "DESCRIPTION": "เชื่อมต่อช่องทางต่างๆ ที่ลูกค้าของคุณจะพูดคุยกับคุณ อาจเป็นเว็บไซต์แชทสด หน้า Facebook หรือ Twitter ของคุณ หรือแม้แต่หมายเลข WhatsApp ของคุณ",
+      "DESCRIPTION": "เชื่อมต่อช่องทางต่างๆ ที่ลูกค้าพูดคุยกับคุณ อาจเป็นแชทในเว็บไซต์, เพจ Facebook หรือ Twitter ของคุณ หรือแม้กระทั่งหมายเลข WhatsApp ของคุณ",
       "NEW_LINK": "คลิกที่นี่เพื่อสร้างกล่องข้อความ"
     },
     "LABELS": {
-      "TITLE": "จัดกลุ่มบทสนทนาด้วยฉลาก",
-      "DESCRIPTION": "การติดฉลากเป็นวิธีง่ายๆ ในการจัดกลุ่มบทสนทนาของคุณ คุณสามารถสร้างฉลากเช่น #การช่วยเหลือ #คำถามเรื่องใบเสร็จ เพื่อนำมาใช้ในบทสนทนาต่อไป",
+      "TITLE": "จัดกลุ่มการสนทนาด้วยป้ายกำกับ",
+      "DESCRIPTION": "การติดป้ายกำกับเป็นวิธีง่ายๆเพื่อจัดกลุ่มการสนทนาของคุณ ลองสร้างป้ายกำกับ เช่น #ต้องการความช่วยเหลือ, #คำถามเรื่องใบเสร็จ หรือป้ายอื่นๆ ที่คุณจะนำมาใช้จัดระเบียบการสนทนาในอนาคต",
       "NEW_LINK": "คลิกที่นี่เพื่อสร้างแท็ก"
     }
   },
   "CONVERSATION_SIDEBAR": {
-    "ASSIGNEE_LABEL": "ตัวแทนที่ได้รับมอบหมาย",
+    "ASSIGNEE_LABEL": "พนักงานที่ได้รับมอบหมาย",
     "SELF_ASSIGN": "มอบหมายให้ฉัน",
     "TEAM_LABEL": "ทีมที่ได้รับมอบหมาย",
     "SELECT": {
       "PLACEHOLDER": "ไม่มี"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "รายละเอียดการติดต่อ",
+      "CONTACT_DETAILS": "รายละเอียดผู้ติดต่อ",
       "CONVERSATION_ACTIONS": "การดำเนินการสนทนา",
       "CONVERSATION_LABELS": "ป้ายกำกับการสนทนา",
       "CONVERSATION_INFO": "ข้อมูลการสนทนา",
-      "CONTACT_ATTRIBUTES": "แอตทริบิวต์การติดต่อ",
+      "CONTACT_ATTRIBUTES": "แอตทริบิวต์ผู้ติดต่อ",
       "PREVIOUS_CONVERSATION": "การสนทนาก่อนหน้า"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "สร้างแอตทริบิวต์",
     "UPDATE": {
-      "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
-      "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
+      "SUCCESS": "อัปเดตแอตทริบิวต์สำเร็จแล้ว",
+      "ERROR": "ไม่สามารถอัปเดตแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
     },
     "ADD": {
       "TITLE": "เพิ่ม",
-      "SUCCESS": "อัปเดตเรียบร้อยแล้ว",
-      "ERROR": "ไม่สามารถอัปเดตได้ กรุณาลองใหม่อีกครั้ง"
+      "SUCCESS": "เพิ่มแอตทริบิวต์สำเร็จแล้ว",
+      "ERROR": "ไม่สามารถเพิ่มแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
     },
     "DELETE": {
-      "SUCCESS": "ทำการลบเรียบร้อย",
-      "ERROR": "ไม่สามารถลบได้ กรุณาลองใหม่อีกครั้ง"
+      "SUCCESS": "ลบแอตทริบิวต์สำเร็จแล้ว",
+      "ERROR": "ไม่สามารถลบแอตทริบิวต์ได้ โปรดลองใหม่อีกครั้ง"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "เพิ่มแอตทริบิวต์",
       "PLACEHOLDER": "ค้นหาแอตทริบิวต์",
-      "NO_RESULT": "ไม่พบข้อมูล"
+      "NO_RESULT": "ไม่พบแอตทริบิวต์ที่ค้นหา"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "จาก",
     "TO": "ถึง",
     "BCC": "สำเนาลับ",
     "CC": "สำเนา",
diff --git a/app/javascript/dashboard/i18n/locale/th/csatMgmt.json b/app/javascript/dashboard/i18n/locale/th/csatMgmt.json
index d7d2efc2a..5574dd611 100644
--- a/app/javascript/dashboard/i18n/locale/th/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "ให้คะแนนการสนทนาครั้งนี้",
+    "PLACEHOLDER": "บอกเราเพิ่มเติม..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/generalSettings.json b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
index 1d47566b3..0d5cd0d19 100644
--- a/app/javascript/dashboard/i18n/locale/th/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/generalSettings.json
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "หมายเลขบัญชี",
+        "NOTE": "โปรดระบุหมายเลขบัญชีหากคุณต้องการเชื่อมต่อกับ API"
       },
       "NAME": {
         "LABEL": "ชื่อบัญชี",
@@ -38,95 +38,103 @@
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "จำนวนวันที่จะเปลี่ยนสถานะเป็นสำเร็จถ้าไม่มีความเคลื่อนไหว",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "โปรดระบุช่วงเวลาในการปิดการสนทนาอัตโนมัติให้ถูกต้อง (ขั้นต่ำ 1 วัน มากสุด 999 วัน)"
       },
       "FEATURES": {
         "INBOUND_EMAIL_ENABLED": "การสนทนาด้วยอีเมล์ถูกเปิดสำหรับบัญชีของคุณ",
         "CUSTOM_EMAIL_DOMAIN_ENABLED": "คุณสามารถรับอีเมล์ในโดเมนเเบบกำหนดเองได้เเล้ว"
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
-    "LEARN_MORE": "Learn more"
+    "UPDATE_CHATWOOT": "Chatwoot เวอร์ชั่น %{latestChatwootVersion} พร้อมสำหรับการอัปเดต กรุณาอัปเดตเวอร์ชั่นของคุณ",
+    "LEARN_MORE": "เรียนรู้เพิ่มเติม"
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "กด enter เพื่อเลือก",
+      "ENTER_TO_REMOVE": "กด enter เพื่อลบ",
+      "SELECT_ONE": "เลือก"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "การแจ้งเตือน",
+    "MARK_ALL_DONE": "ทำเครื่องหมายว่าเสร็จแล้วทั้งหมด",
+    "DELETE_TITLE": "ลบ",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "การแจ้งเตือนที่ยังไม่ได้อ่าน",
+      "ALL_NOTIFICATIONS": "ดูการแจ้งเตือนทั้งหมด",
+      "LOADING_UNREAD_MESSAGE": "กำลังโหลดการแจ้งเตือนที่ยังไม่ได้อ่าน",
+      "EMPTY_MESSAGE": "ไม่มีการแจ้งเตือนที่ยังไม่ได้อ่าน"
+    },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "กำลังโหลดการแจ้งเตือน",
+      "404": "ไม่มีการแจ้งเตือน",
       "TABLE_HEADER": [
         "ชื่อ",
         "หมายเลขโทรศัพท์",
         "การสนทนา",
-        "Last Contacted"
+        "ติดต่อครั้งสุดท้าย"
       ]
     },
     "TYPE_LABEL": {
       "conversation_creation": "สร้างการสนทนาใหม่",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_assignment": "การสนทนาที่ถูกมอบหมาย",
+      "assigned_conversation_new_message": "ข้อความใหม่",
+      "conversation_mention": "กล่าวถึง"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "ยกเลิกการเชื่อมต่อกับ Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "โหลดใหม่"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "ค้นหาหรือไปยัง",
     "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"
+      "GENERAL": "ทั่วไป",
+      "REPORTS": "รายงาน",
+      "CONVERSATION": "การสนทนา",
+      "CHANGE_ASSIGNEE": "เปลี่ยนผู้รับมอบหมาย",
+      "CHANGE_TEAM": "เปลี่ยนทีม",
+      "ADD_LABEL": "เพิ่มป้ายกำกับให้การสนทนา",
+      "REMOVE_LABEL": "ลบป้ายกำกับออกจากการสนทนา",
+      "SETTINGS": "ตั้งค่า"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_CONVERSATION_DASHBOARD": "ไปยังแดชบอร์ดการสนทนา",
+      "GO_TO_CONTACTS_DASHBOARD": "ไปยังแดชบอร์ดรายชื่อผู้ติดต่อ",
+      "GO_TO_REPORTS_OVERVIEW": "ไปยังภาพรวมรายงาน",
+      "GO_TO_CONVERSATION_REPORTS": "ไปที่หน้ารายงานการสนทนา",
+      "GO_TO_AGENT_REPORTS": "ไปที่หน้ารายงานพนักงาน",
+      "GO_TO_LABEL_REPORTS": "ไปที่หน้ารายงานป้ายกำกับ",
+      "GO_TO_INBOX_REPORTS": "ไปที่หน้ารายงานกล่องข้อความ",
+      "GO_TO_TEAM_REPORTS": "ไปที่หน้ารายงานทีม",
+      "GO_TO_SETTINGS_AGENTS": "ไปที่หน้าจัดการพนักงาน",
+      "GO_TO_SETTINGS_TEAMS": "ไปที่หน้าจัดการทีม",
+      "GO_TO_SETTINGS_INBOXES": "ไปที่หน้าจัดการกล่องข้อความ",
+      "GO_TO_SETTINGS_LABELS": "ไปที่หน้าจัดการป้ายกำกับ",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "ไปที่หน้าจัดการข้อความลัด",
+      "GO_TO_SETTINGS_APPLICATIONS": "ไปที่หน้าตั้งค่าโปรแกรม",
+      "GO_TO_SETTINGS_ACCOUNT": "ไปที่หน้าตั้งค่าบัญชี",
+      "GO_TO_SETTINGS_PROFILE": "ไปที่หน้าตั้งค่าข้อมูลส่วนตัว",
+      "GO_TO_NOTIFICATIONS": "ไปที่หน้าการแจ้งเตือน",
+      "ADD_LABELS_TO_CONVERSATION": "เพิ่มป้ายกำกับให้บทสนทนา",
+      "ASSIGN_AN_AGENT": "กำหนดพนักงาน",
+      "ASSIGN_A_TEAM": "กำหนดทีม",
+      "MUTE_CONVERSATION": "ปิดการแจ้งเตือน",
+      "UNMUTE_CONVERSATION": "เปิดการแจ้งเตือน",
+      "REMOVE_LABEL_FROM_CONVERSATION": "ลบป้ายกำกับออกจากการสนทนา",
+      "REOPEN_CONVERSATION": "เปิดการสนทนาอีกครั้ง",
+      "RESOLVE_CONVERSATION": "เสร็จสิ้นการสนทนา",
+      "SEND_TRANSCRIPT": "ส่งรายละเอียดทางอีเมล",
+      "SNOOZE_CONVERSATION": "พักการสนทนา",
+      "UNTIL_NEXT_REPLY": "จนกว่าการตอบกลับถัดไป",
+      "UNTIL_NEXT_WEEK": "จนกว่าสัปดาห์หน้า",
+      "UNTIL_TOMORROW": "จนกว่าพรุ่งนี้"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index 8f44a5b57..a5ea9c617 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -30,7 +30,7 @@
     "ADD": {
       "CHANNEL_NAME": {
         "LABEL": "ชื่อกล่องข้อความ",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "PLACEHOLDER": "กรอกชื่อกล่องข้อความ (เช่น Acme Inc)"
       },
       "WEBSITE_NAME": {
         "LABEL": "ชื่อเว็บไซต์",
@@ -47,9 +47,9 @@
       },
       "TWITTER": {
         "HELP": "ในการเพิ่มโปรไฟล์ Twitter ของคุณเป็นช่องคุณต้องตรวจสอบสิทธิ์โปรไฟล์ Twitter ของคุณโดยคลิกที่ \"ลงชื่อเข้าใช้ด้วย Twitter\" ",
-        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "ERROR_MESSAGE": "เกิดข้อผิดพลาดในการเชื่อมต่อกับ Twitter โปรดลองอีกครั้ง",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "สร้างการสนทนาใหม่จากการกล่าวถึงในทวีต"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -61,7 +61,7 @@
         },
         "CHANNEL_WEBHOOK_URL": {
           "LABEL": "ลิ้ง Webhook",
-          "PLACEHOLDER": "Enter your Webhook URL",
+          "PLACEHOLDER": "กรอก Webhook URL",
           "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
         },
         "CHANNEL_DOMAIN": {
@@ -82,16 +82,16 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "เปิดข้อความต้อนรับ",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "ส่งข้อความต้อนรับให้ผู้ใช้ เมื่อพวกเขาเริ่มต้นการสนทนา",
           "ENABLED": "เปิด",
           "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"
+          "TITLE": "ตั้งเวลาตอบกลับ",
+          "IN_A_FEW_MINUTES": "ในไม่กี่นาที",
+          "IN_A_FEW_HOURS": "ในไม่กี่ชั่วโมง",
+          "IN_A_DAY": "ในหนึ่งวัน",
+          "HELP_TEXT": "เวลาในการตอบกลับจะแสดงใน live chat widget"
         },
         "WIDGET_COLOR": {
           "LABEL": "สีของวิดเจ็ต",
@@ -100,8 +100,8 @@
         "SUBMIT_BUTTON": "สร้างกล่องข้อความ"
       },
       "TWILIO": {
-        "TITLE": "Twilio SMS/WhatsApp Channel",
-        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "TITLE": "ช่องทาง Twilio SMS/WhatsApp",
+        "DESC": "เชื่อมต่อกับ Twilio และเริ่มสนับสนุนลูกค้าของคุณผ่าน SMS หรือ Whatsapp",
         "ACCOUNT_SID": {
           "LABEL": "Account SID",
           "PLACEHOLDER": "กรุณากรอก Twilio Account SID",
@@ -118,7 +118,7 @@
         },
         "CHANNEL_NAME": {
           "LABEL": "ชื่อกล่องข้อความ",
-          "PLACEHOLDER": "Please enter a inbox name",
+          "PLACEHOLDER": "โปรดกรอกชื่อกล่องข้อความ",
           "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
         },
         "PHONE_NUMBER": {
@@ -136,40 +136,40 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "ช่องทาง SMS",
+        "DESC": "เริ่มสนับสนุนลูกค้าของคุณผ่านช่องทาง SMS",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "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": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "PLACEHOLDER": "โปรดกรอก Account ID ของ Bandwidth",
             "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
           },
           "API_KEY": {
             "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith 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": {
             "LABEL": "ชื่อกล่องข้อความ",
-            "PLACEHOLDER": "Please enter a inbox name",
+            "PLACEHOLDER": "โปรดกรอกชื่อกล่องข้อความ",
             "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
           },
           "PHONE_NUMBER": {
@@ -177,27 +177,27 @@
             "PLACEHOLDER": "กรุณากรอกหมายเลขโทรศัพท์ที่จะส่งข้อความ",
             "ERROR": "กรุณากรอกหมายเลขโทรศัพท์ให้ถูกต้องต้องเริ่มด้วย \"+\""
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "สร้างช่องทาง Bandwidth",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "เราไม่สามารถยืนยันใบรับรองของ Bandwidth ได้กรุณาลองใหม่อีกครั้ง"
           },
           "API_CALLBACK": {
             "TITLE": "ลิ้งเรียกกลับ",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "คุณต้องตั้งค่าข้อความ callback URL ใน Bandwidth ด้วยลิงก์ที่มาจากที่นี่"
           }
         }
       },
       "WHATSAPP": {
-        "TITLE": "WhatsApp Channel",
-        "DESC": "Start supporting your customers via WhatsApp.",
+        "TITLE": "ช่องทาง WhatsApp",
+        "DESC": "เริ่มสนับสนุนลูกค้าของคุณผ่านช่องทาง WhatsApp",
         "PROVIDERS": {
-          "LABEL": "API Provider",
+          "LABEL": "ผู้ให้บริการ API",
           "TWILIO": "Twilio",
           "360_DIALOG": "360Dialog"
         },
         "INBOX_NAME": {
           "LABEL": "ชื่อกล่องข้อความ",
-          "PLACEHOLDER": "Please enter an inbox name",
+          "PLACEHOLDER": "กรุณากรอกชื่อกล่องข้อความ",
           "ERROR": "ฟิลด์นี้จำเป็นต้องกรอก"
         },
         "PHONE_NUMBER": {
@@ -207,14 +207,14 @@
         },
         "API_KEY": {
           "LABEL": "API key",
-          "SUBTITLE": "Configure the WhatsApp API key.",
+          "SUBTITLE": "ตั้งค่า WhatsApp API key",
           "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
-          "ERROR": "Please enter a valid value."
+          "APPLY_FOR_ACCESS": "ไม่มี API key ใช่ไหม? สมัครเปิดใช้ที่นี่",
+          "ERROR": "โปรดกรอกค่าที่ถูกต้อง"
         },
-        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "SUBMIT_BUTTON": "สร้างช่องทาง WhatsApp",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+          "ERROR_MESSAGE": "เราไม่สามารถบันทึกช่องทาง WhatsApp ได้"
         }
       },
       "API_CHANNEL": {
@@ -255,8 +255,8 @@
         "FINISH_MESSAGE": "เริ่มนำเข้าอีเมล์ของคุณไปที่อยู่อีเมล์"
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "ช่องทาง LINE",
+        "DESC": "เชื่อมต่อกับ LINE และเริ่มสนับสนุนลูกค้าของคุณ",
         "CHANNEL_NAME": {
           "LABEL": "ชื่อช่อง",
           "PLACEHOLDER": "กรุณากรอกชื่อช่อง",
@@ -274,72 +274,72 @@
           "LABEL": "LINE Channel Token",
           "PLACEHOLDER": "LINE Channel Token"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "สร้างช่องทาง LINE",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "เราไม่สามารถบันทึกช่องทาง LINE นี้ได้"
         },
         "API_CALLBACK": {
           "TITLE": "ลิ้งเรียกกลับ",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "SUBTITLE": "คุณต้องตั้งค่า webhook URL ที่ LINE ด้วย URL นี้"
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "ช่องทาง Telegram",
+        "DESC": "เชื่อมต่อกับ Telegram และเริ่มสนับสนุนลูกค้าของคุณ",
         "BOT_TOKEN": {
           "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "SUBTITLE": "ตั้งค่า bot token ที่ได้จาก Telegram BotFather",
           "PLACEHOLDER": "Bot Token"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "สร้างช่องทาง Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "เราไม่สามารถบันทึกช่องทาง Telegram นี้ได้"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "เลือกช่องทาง",
+        "DESC": "Chatwoot รองรับ live-chat widget, Facebook, Twitter, WhatsApp, Email และช่องทางอื่น ๆ ถ้าคุณต้องการสร้างช่องทางพิเศษ คุณสามารถสร้างได้โดยใช้ API channel เลือกช่องทางด้านล่างนี้เพื่อดำเนินการต่อ"
       },
       "AGENTS": {
         "TITLE": "พนักงาน",
-        "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"
+        "DESC": "คุณสามารถเพิ่มพนักงานเพื่อจัดการกล่องข้อความที่สร้างใหม่ พนักงานที่ได้รับสิทธิ์เท่านั้นที่สามารถเข้าถึงกล่องข้อความนี้ได้ พนักงานที่ไม่มีสิทธิ์จะไม่สามารถเห็นหรือใช้กล่องสนทนานี้ได้ <br><b>หมายเหตุ:</b>ในฐานะของผู้ดูแล คุณจะสามารถเพิ่มตัวเองในกล่องข้อความทุกกล่องที่คุณสร้าง",
+        "VALIDATION_ERROR": "ต้องเพิ่มพนักงานอย่างน้อยหนึ่งคนสำหรับกล่องข้อความใหม่",
+        "PICK_AGENTS": "เลือกพนักงานสำหรับกล่องข้อความนี้"
       },
       "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."
+        "TITLE": "รายละเอียดกล่องข้อความ",
+        "DESC": "คุณสามารถเลือก facebook Page ที่ต้องการเชื่อมต่อกับ Chatwoot จากรายการข้างล่าง คุณยังสามารถตั้งชื่อให้กล่องข้อความของคุณเพื่อการจัดการที่ง่ายขึ้น"
       },
       "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 :)"
+        "TITLE": "เรียบร้อย!",
+        "DESC": "เชื่อมต่อ Facebook Page กับ Chatwoot สำเร็จแล้ว เมื่อมีคนส่งข้อความมาที่เพจของคุณ การสนทนาจะแสดงในกล่องข้อความของคุณโดยอัตโนมัติ<br>เรายังได้เตรียมสคริปท์สำหรับสร้าง widget เพื่อให้คุณนำไปติดตั้งที่เว็บไซต์ของคุณได้ง่ายขึ้นอีกด้วย เมื่อคุณติดตั้งสำเร็จแล้ว ลูกค้าสามารถส่งข้อความมาหาคุณได้โดยตรงจากทางเว็บไซต์ของคุณโดยที่ไม่ต้องใช้เครื่องมืออื่นๆ อีก และการสนทนาจะมาปรากฎบน Chatwoot <br>เจ๋งใช่มั้ยล่ะ? นั่นแหละที่พวกเราพยายามจะเป็น :)"
       }
     },
     "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",
+      "LOADING_FB": "กำลังตรวจสอบสิทธิ์ของคุณกับ Facebook...",
+      "ERROR_FB_AUTH": "มีข้อผิดพลาดเกิดขึ้น โปรดโหลดหน้านี้ใหม่อีกครั้ง",
+      "CREATING_CHANNEL": "กำลังสร้างกล่องข้อความ...",
+      "TITLE": "ตั้งค่ารายละเอียดกล่องข้อความ",
       "DESC": ""
     },
     "AGENTS": {
-      "BUTTON_TEXT": "Add agents",
-      "ADD_AGENTS": "Adding Agents to your Inbox..."
+      "BUTTON_TEXT": "เพิ่มพนักงาน",
+      "ADD_AGENTS": "กำลังเพิ่มพนักงานสำหรับกล่องข้อความนี้..."
     },
     "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."
+      "TITLE": "กล่องข้อความของคุณพร้อมใช้แล้ว!",
+      "MESSAGE": "ตอนนี้คุณสามารถมีส่วนร่วมกับลูกค้าของคุณผ่านช่องทางใหม่ได้แล้ว ขอให้มีความสุขกับการคุย ",
+      "BUTTON_TEXT": "พาฉันไปที่นั่น",
+      "MORE_SETTINGS": "ตั้งค่าเพิ่มเติม",
+      "WEBSITE_SUCCESS": "คุณได้สร้างช่องทางเว็บไซต์สำเร็จแล้ว คัดลอกโค้ดข้างล่างแล้วนำไปแปะที่เว็บไซต์ของคุณ ครั้งถัดไปที่ลูกค้าใช้ live chat การสนทนาจะปรากฎที่กล่องข้อความของคุณโดยอัตโนมัติ"
     },
-    "REAUTH": "Reauthorize",
-    "VIEW": "View",
+    "REAUTH": "ขอสิทธิ์อีกครั้ง",
+    "VIEW": "ดู",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
-        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
-        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+        "SUCCESS_MESSAGE": "อัปเดตการตั้งค่ากล่องข้อความเรียบร้อยแล้ว",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "อัปเดตการมอบหมายอัตโนมัติเรียบร้อยแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถอัปเดตสี widget โปรดลองใหม่อีกครั้งในภายหลัง"
       },
       "AUTO_ASSIGNMENT": {
         "ENABLED": "เปิด",
@@ -362,171 +362,184 @@
         "DISABLED": "ปิด"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "เปิดใช้งาน"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "ลบรูป",
       "CONFIRM": {
         "TITLE": "ยืนยันการลบ",
         "MESSAGE": "คุณต้องการที่จะลบไหม ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "โปรดพิมพ์ {inboxName} เพื่อยืนยัน",
         "YES": "เอาเลย ",
         "NO": "ไม่อะเก็บไว้ "
       },
       "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."
+        "SUCCESS_MESSAGE": "ลบกล่องข้อความเรียบร้อยแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถลบกล่องข้อความได้ โปรดลองใหม่อีกครั้ง",
+        "AVATAR_SUCCESS_MESSAGE": "ลบรูปเรียบร้อยแล้ว",
+        "AVATAR_ERROR_MESSAGE": "ไม่สามารถลบรูปของกล่องข้อความได้ โปรดลองอีกครั้งในภายหลัง"
       }
     },
     "TABS": {
-      "SETTINGS": "Settings",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
+      "SETTINGS": "ตั้งค่า",
+      "COLLABORATORS": "การร่วมมือ",
+      "CONFIGURATION": "ตั้งค่า",
       "CAMPAIGN": "แคมเปญ",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "PRE_CHAT_FORM": "แบบสอบถามก่อนแชท",
+      "BUSINESS_HOURS": "เวลาทำการ"
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "ตั้งค่า",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "ฟีเจอร์",
+      "DISPLAY_FILE_PICKER": "แสดงตัวเลือกไฟล์ใน widget",
+      "DISPLAY_EMOJI_PICKER": "แสดงตัวเลือกอีโมจิใน widget",
+      "ALLOW_END_CONVERSATION": "อนุญาตให้ลูกค้าปิดการสนทนาจาก widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Script",
-      "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
+      "MESSENGER_SUB_HEAD": "ใส่ปุ่มนี้ใน body tag",
       "INBOX_AGENTS": "พนักงาน",
-      "INBOX_AGENTS_SUB_TEXT": "Add or remove agents from this inbox",
+      "INBOX_AGENTS_SUB_TEXT": "เพิ่มหรือลบพนักงานจากกล่องสนทนานี้",
       "UPDATE": "อัพเดท",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
-      "AUTO_ASSIGNMENT": "Enable auto assignment",
-      "ENABLE_CSAT": "Enable CSAT",
-      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
-      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
-      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
-      "INBOX_UPDATE_TITLE": "Inbox Settings",
-      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
-      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
-      "HMAC_VERIFICATION": "User Identity Validation",
-      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
-      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
-      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
-      "INBOX_IDENTIFIER": "Inbox Identifier",
-      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
-      "FORWARD_EMAIL_TITLE": "Forward to Email",
-      "FORWARD_EMAIL_SUB_TEXT": "เริ่มนำเข้าอีเมล์ของคุณไปที่อยู่อีเมล์",
-      "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."
+      "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_CONTINUITY_VIA_EMAIL_SUB_TEXT": "การสนทนาจะสามารถดำเนินการต่อผ่านทางอีเมลได้ หากลูกค้าให้อีเมลไว้",
+      "INBOX_UPDATE_TITLE": "ตั้งค่ากล่องข้อความ",
+      "INBOX_UPDATE_SUB_TEXT": "อัปเดตกล่องข้อความ",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "เปิดหรือปิดระบบมอบหมายงานอัตโนมัติสำหรับข้อความใหม่ให้กับพนักงานในกล่องสนทนานี้",
+      "HMAC_VERIFICATION": "การตรวจสอบตัวตนผู้ใช้งาน",
+      "HMAC_DESCRIPTION": "SDK อนุญาตให้คุณส่งต่อ `identifier_hash` สำหรับผู้ใช้งานแค่ละคนเพื่อที่ตรวจสอบตัวตนผู้ใช้งาน คุณสามารถสร้าง HMAC โดยใช้ 'sha256' ร่วมกับคีย์ที่ปรากฎอยู่",
+      "HMAC_MANDATORY_VERIFICATION": "บังคับใช้การตรวจสอบตัวตนผู้ใช้งาน",
+      "HMAC_MANDATORY_DESCRIPTION": "หากเปิดใช้งาน วิธี SDKs setUser ของ Chatwoot จะไม่สามารถใช้งานได้ นอกจากจะมีการสร้าง `identifier_hash` สำหรับแต่ละผู้ใช้งาน",
+      "INBOX_IDENTIFIER": "ตัวระบุกล่องข้อความ",
+      "INBOX_IDENTIFIER_SUB_TEXT": "ใช้ 'ตัวระบุกล่องข้อความ' ที่ปรากฎที่นี่เพื่อรับรองสิทธิ์ API clients ของคุณ",
+      "FORWARD_EMAIL_TITLE": "ส่งต่อไปยังอีเมล",
+      "FORWARD_EMAIL_SUB_TEXT": "เริ่มส่งต่ออีเมลของคุณไปยังที่อยู่ตามนี้",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "อนุญาตให้รับข้อความหลังจากจบการสนทนาแล้ว",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "อนุญาตให้ลูกค้าส่งข้อความหลังจากจบการสนทนาแล้ว"
     },
     "FACEBOOK_REAUTHORIZE": {
-      "TITLE": "Reauthorize",
-      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
-      "MESSAGE_SUCCESS": "Reconnection successful",
+      "TITLE": "ขอสิทธิ์อีกครั้ง",
+      "SUBTITLE": "การเชื่อมต่อกับ Facebook หมดอายุแล้ว โปรดเชื่อมต่อใหม่อีกครั้ง",
+      "MESSAGE_SUCCESS": "เชื่อมต่อสำเร็จ",
       "MESSAGE_ERROR": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
     },
     "PRE_CHAT_FORM": {
-      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "DESCRIPTION": "แบบสอบถามก่อนเริ่มแชทจะช่วยเก็บข้อมูลลูกค้าก่อนที่จะเริ่มการสนทนา",
+      "SET_FIELDS": "รูปแบบของแบบสอบถามก่อนเริ่มแชท",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "รูปแบบ",
+        "LABEL": "ป้ายกำกับ",
+        "PLACE_HOLDER": "ข้อความตัวอย่าง",
+        "KEY": "คีย์",
+        "TYPE": "ประเภท",
+        "REQUIRED": "โปรดระบุ"
+      },
       "ENABLE": {
-        "LABEL": "Enable pre chat form",
+        "LABEL": "เปิดใช้งานแบบสอบถามก่อนเริ่มแชท",
         "OPTIONS": {
-          "ENABLED": "Yes",
-          "DISABLED": "No"
+          "ENABLED": "ใช่",
+          "DISABLED": "ไม่"
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
-        "PLACEHOLDER": "This message would be visible to the users along with the form"
+        "LABEL": "ข้อความสำหรับแบบสอบถามก่อนเริ่มแชท",
+        "PLACEHOLDER": "ลูกค้าจะเห็นข้อความนี้ขณะที่กรอกข้อมูลในแบบสอบถาม"
       },
       "REQUIRE_EMAIL": {
-        "LABEL": "Visitors should provide their name and email address before starting the chat"
+        "LABEL": "ลูกค้าควรให้ชื่อและอีเมลก่อนเริ่มสนทนา"
       }
     },
     "BUSINESS_HOURS": {
-      "TITLE": "Set your availability",
-      "SUBTITLE": "Set your availability on your livechat widget",
-      "WEEKLY_TITLE": "Set your weekly hours",
-      "TIMEZONE_LABEL": "Select timezone",
-      "UPDATE": "Update business hours settings",
-      "TOGGLE_AVAILABILITY": "Enable business availability for this inbox",
-      "UNAVAILABLE_MESSAGE_LABEL": "Unavailable message for visitors",
-      "UNAVAILABLE_MESSAGE_DEFAULT": "We are unavailable at the moment. Leave a message we will respond once we are back.",
-      "TOGGLE_HELP": "Enabling business availability will show the available hours on live chat widget even if all the agents are offline. Outside available hours vistors can be warned with a message and a pre-chat form.",
+      "TITLE": "ตั้งค่าความพร้อมในการให้บริการ",
+      "SUBTITLE": "ตั้งค่าความพร้อมในการให้บริการของคุณบน livechat widget",
+      "WEEKLY_TITLE": "ตั้งค่าเวลาทำการ",
+      "TIMEZONE_LABEL": "ตั้งค่าโซนเวลา",
+      "UPDATE": "อัปเดตเวลาทำการ",
+      "TOGGLE_AVAILABILITY": "แสดงความพร้อมในการให้บริการสำหรับกล่องข้อความนี้",
+      "UNAVAILABLE_MESSAGE_LABEL": "ข้อความที่ต้องการแสดงเมื่ออยู่นอกเวลาทำการ",
+      "UNAVAILABLE_MESSAGE_DEFAULT": "เรายังไม่มีทีมที่พร้อมตอบคำถามในตอนนี้ โปรดทิ้งข้อความไว้ แล้วเราจะติดต่อกลับเมื่อทีมกลับมา",
+      "TOGGLE_HELP": "การเปิดใช้ความพร้อมในการให้บริการจะแสดงเวลาทำการบน live-chat widget แม้ว่าพนักงานทุกคนจะออฟไลน์ เมื่อมีลูกค้าต้องการติดต่อนอกเวลาทำการจะมีข้อความแจ้งเตือน และแสดงแบบสอบถามก่อนเริ่มแชทให้กับลูกค้า",
       "DAY": {
-        "ENABLE": "Enable availability for this day",
-        "UNAVAILABLE": "Unavailable",
-        "HOURS": "hours",
-        "VALIDATION_ERROR": "Starting time should be before closing time.",
-        "CHOOSE": "Choose"
+        "ENABLE": "เปิดใช้ความพร้อมในการให้บริการสำหรับวันนี้",
+        "UNAVAILABLE": "ไม่พร้อมให้บริการ",
+        "HOURS": "ชั่วโมง",
+        "VALIDATION_ERROR": "เวลาเปิดทำการควรเริ่มก่อนเวลาปิดทำการ",
+        "CHOOSE": "เลือก"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "ทั้งวัน"
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "ตั้งค่ารายละเอียด IMAP",
+      "NOTE_TEXT": "โปรดตั้งค่า IMAP หากคุณต้องการเปิดใช้ SMTP",
+      "UPDATE": "อัปเดตการตั้งค่า IMAP",
+      "TOGGLE_AVAILABILITY": "เปิดใช้งานการตั้งค่า IMAP สำหรับกล่องข้อความนี้",
+      "TOGGLE_HELP": "การเปิดใช้งาน IMAP จะช่วยให้ลูกค้าได้รับอีเมล",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "อัปเดตการตั้งค่า IMAP สำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถอัปเดตการตั้งค่า IMAP ได้"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "ที่อยู่",
+        "PLACE_HOLDER": "ที่อยู่ (เช่น imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "พอร์ท",
+        "PLACE_HOLDER": "พอร์ท"
       },
-      "EMAIL": {
-        "LABEL": "อีเมล์",
-        "PLACE_HOLDER": "อีเมล์"
+      "LOGIN": {
+        "LABEL": "เข้าสู่ระบบ",
+        "PLACE_HOLDER": "เข้าสู่ระบบ"
       },
       "PASSWORD": {
         "LABEL": "หรัสผ่าน",
         "PLACE_HOLDER": "หรัสผ่าน"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "เปิดใช้ SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "ตั้งค่า SMTP",
+      "UPDATE": "อัปเดตการตั้งค่า SMTP",
+      "TOGGLE_AVAILABILITY": "เปิดใช้งาน SMTP กับกล่องสนทนานี้",
+      "TOGGLE_HELP": "การเปิด SMTP จะช่วยให้ระบบส่งอีเมล์ได้",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "ตั้งค่า SMTP สำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถตั้งค่า SMTP ได้"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "ที่อยู่",
+        "PLACE_HOLDER": "ที่อยู่ (เช่น smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "พอร์ท",
+        "PLACE_HOLDER": "พอร์ท"
       },
-      "EMAIL": {
-        "LABEL": "อีเมล์",
-        "PLACE_HOLDER": "อีเมล์"
+      "LOGIN": {
+        "LABEL": "เข้าสู่ระบบ",
+        "PLACE_HOLDER": "เข้าสู่ระบบ"
       },
       "PASSWORD": {
         "LABEL": "หรัสผ่าน",
         "PLACE_HOLDER": "หรัสผ่าน"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
+        "LABEL": "โดเมน",
+        "PLACE_HOLDER": "โดเมน"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "การเข้ารหัส",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "เปิดโหมดตรวจสอบ SSL",
+      "AUTH_MECHANISM": "การตรวจสอบสิทธิ์"
+    },
+    "NOTE": "หมายเหตุ: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/integrationApps.json b/app/javascript/dashboard/i18n/locale/th/integrationApps.json
index a25afc823..cd76a0d15 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrationApps.json
@@ -1,35 +1,35 @@
 {
   "INTEGRATION_APPS": {
-    "FETCHING": "Fetching Integrations",
-    "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
-    "HEADER": "Applications",
+    "FETCHING": "กำลังโหลดการเชื่อมต่อ",
+    "NO_HOOK_CONFIGURED": "ไม่มี %{integrationId} ที่ตั้งค่าไว้กับบัญชีนี้",
+    "HEADER": "โปรแกรม",
     "STATUS": {
       "ENABLED": "เปิด",
       "DISABLED": "ปิด"
     },
-    "CONFIGURE": "Configure",
-    "ADD_BUTTON": "Add a new hook",
+    "CONFIGURE": "ตั้งค่า",
+    "ADD_BUTTON": "เพิ่ม Hook ใหม่",
     "DELETE": {
       "TITLE": {
-        "INBOX": "Confirm deletion",
-        "ACCOUNT": "Disconnect"
+        "INBOX": "ยืนยันการลบ",
+        "ACCOUNT": "ไม่เชื่อมต่อ"
       },
       "MESSAGE": {
         "INBOX": "คุณต้องการที่จะลบไหม?",
-        "ACCOUNT": "Are you sure to disconnect?"
+        "ACCOUNT": "คุณต้องการที่จะยกเลือกการเชื่อมต่อไหม?"
       },
       "CONFIRM_BUTTON_TEXT": {
         "INBOX": "เอาเลย",
-        "ACCOUNT": "Yes, Disconnect"
+        "ACCOUNT": "ใช่ ยกเลิกการเชื่อมต่อ"
       },
       "CANCEL_BUTTON_TEXT": "ยกเลิก",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "ลบ Hook แล้ว",
         "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
+      "FETCHING": "กำลังโหลด Hook",
       "INBOX": "กล่องข้อความ",
       "DELETE": {
         "BUTTON_TEXT": "ลบ"
@@ -38,25 +38,25 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "เลือกกล่องข้อความ",
+          "PLACEHOLDER": "เลือกกล่องข้อความ"
         },
         "SUBMIT": "สร้าง",
         "CANCEL": "ยกเลิก"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "เพิ่ม Hook แล้ว",
         "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "เชื่อมต่อ"
     },
     "DISCONNECT": {
-      "BUTTON_TEXT": "Disconnect"
+      "BUTTON_TEXT": "ไม่เชื่อมต่อ"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow เป็นเครื่องมือประมวลผลภาษาธรรมชาติ ที่ช่วยให้ง่ายต่อการออกแบบและการเชื่อมต่อหน้าจอสนทนากับแอปพลิเคชันมือถือ, เว็บแอปพลิเคชัน, บอท, ระบบตอบรับอัตโนมัติ และอื่นๆอีกมากมาย <br /><br /> Dialogflow ที่เชื่อมกับ %{installationName} ทำให้คุณสามารถตั้งค่าบอท Dialogflow ในกล่องข้อความของคุณซึ่งจะทำหน้าที่ในการรับมือกับการสนทนาเบื้องต้นก่อนส่งต่อไปให้พนักงานเมื่อจำเป็น Dialogflow ช่วยให้การทำงานง่ายขึ้นและลดภาระงานของพนักงานโดยการให้ข้อมูลเบื้องต้นกับลูกค้า หรือด้วยวิธีการอื่นๆอ<br /><br /> หากต้องการใช้งาน Dialogflow คุณจำเป็นต้องสร้าง Service Account ใน Google project ที่ใช้ข้อมูลประจำตัวร่วมกัน โปรดอ่านเอกสารของ Dialogflow หากต้องการข้อมูลเพิ่มเติม"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/integrations.json b/app/javascript/dashboard/i18n/locale/th/integrations.json
index 2e645d660..8ea95cb85 100644
--- a/app/javascript/dashboard/i18n/locale/th/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/th/integrations.json
@@ -1,17 +1,40 @@
 {
   "INTEGRATION_SETTINGS": {
-    "HEADER": "Integrations",
+    "HEADER": "การเชื่อมต่อกับระบบ",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "เหตุการณ์ที่ติดตามอยู่",
+      "FORM": {
+        "CANCEL": "ยกเลิก",
+        "DESC": "Webhook จะมีการส่งข้อมูลตลอดเวลา โดยใส่ URL ที่จะรับข้อมูลให้ถูกต้อง",
+        "SUBSCRIPTIONS": {
+          "LABEL": "เหตุการณ์",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "การสนทนาที่ถูกสร้าง",
+            "CONVERSATION_STATUS_CHANGED": "เปลี่ยนสถานะการสนทนาแล้ว",
+            "CONVERSATION_UPDATED": "อัปเดตการสนทนาแล้ว",
+            "MESSAGE_CREATED": "สร้างข้อความแล้ว",
+            "MESSAGE_UPDATED": "อัปเดตข้อความแล้ว",
+            "WEBWIDGET_TRIGGERED": "Live chat widget ถูกเปิดโดยผู้ใช้งาน"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "ลิ้ง Webhook",
+          "PLACEHOLDER": "ตัวอย่าง: https://example/api/webhook",
+          "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
+        },
+        "EDIT_SUBMIT": "อัปเดต Webhook",
+        "ADD_SUBMIT": "สร้าง Webhook"
+      },
       "TITLE": "Webhook",
-      "CONFIGURE": "Configure",
-      "HEADER": "Webhook settings",
-      "HEADER_BTN_TXT": "Add new webhook",
-      "LOADING": "Fetching attached webhooks",
+      "CONFIGURE": "ตั้งค่า",
+      "HEADER": "ตั้งค่า Webhook",
+      "HEADER_BTN_TXT": "เพิ่ม Webhook ใหม่",
+      "LOADING": "กำลังดึงข้อมูล Webhook",
       "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
-      "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>",
+      "SIDEBAR_TXT": "<p><b>Webhooks</b> </p> <p>Webhooks คือ การเรียกกลับ HTTP ซึ่งสามารถระบุได้สำหรับทุกบัญชี สามารถถูกเรียกใช้งานได้จากเหตุการณ์ เช่น ข้อความที่ถูกสร้างใน Chatwoot คุณสามารถสร้างมากกว่า 1 Webhook ได้สำหรับบัญนี้ <br /><br /> สำหรับการสร้าง <b>Webhook</b> ให้คลิกที่ <b> ปุ่มเพิ่ม Webhook ใหม่ </b> คุณยังสามารถลบ Webhook ที่ใช้งานอยู่ได้โดยการคลิกปุ่มลบ</p>",
       "LIST": {
-        "404": "There are no webhooks configured for this account.",
-        "TITLE": "Manage webhooks",
+        "404": "ไม่มีการตั้งค่า Webhooks กับบัญชีนี้",
+        "TITLE": "จัดการ Webhooks",
         "TABLE_HEADER": [
           "Webhook endpoint",
           "การกระทำ"
@@ -19,67 +42,48 @@
       },
       "EDIT": {
         "BUTTON_TEXT": "เเก้ไข",
-        "TITLE": "Edit webhook",
-        "CANCEL": "ยกเลิก",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "ลิ้ง Webhook",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
-          },
-          "SUBMIT": "Edit webhook"
-        },
+        "TITLE": "แก้ไข Webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "อัปเดตการตั้งค่า Webhook สำเร็จแล้ว",
           "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
         }
       },
       "ADD": {
         "CANCEL": "ยกเลิก",
-        "TITLE": "Add new webhook",
-        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "ลิ้ง Webhook",
-            "PLACEHOLDER": "Example: https://example/api/webhook",
-            "ERROR": "กรุณากรอกลิ้งที่ถูกต้อง"
-          },
-          "SUBMIT": "Create webhook"
-        },
+        "TITLE": "เพิ่ม Webhook ใหม่",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "SUCCESS_MESSAGE": "เพิ่มการปรับแต่ง Webhook เรียบร้อยแล้ว",
           "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
         }
       },
       "DELETE": {
         "BUTTON_TEXT": "ลบ",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "SUCCESS_MESSAGE": "ลบ Webhook สำเร็จแล้ว",
           "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
         },
         "CONFIRM": {
           "TITLE": "ยืนยันการลบ",
-          "MESSAGE": "คุณต้องการที่จะลบไหม ",
+          "MESSAGE": "คุณต้องการลบ Webhook หรือไม่? (%{webhookURL})",
           "YES": "เอาเลย ",
-          "NO": "No, Keep it"
+          "NO": "ไม่"
         }
       }
     },
     "SLACK": {
       "HELP_TEXT": {
-        "TITLE": "Using Slack Integration",
-        "BODY": "<br/><p>Chatwoot will now sync all the incoming conversations into the <b><i>customer-conversations</i></b> channel inside your slack workplace.</p><p>Replying to a conversation thread in <b><i>customer-conversations</i></b> slack channel will create a response back to the customer through chatwoot.</p><p>Start the replies with <b><i>note:</i></b> to create private notes instead of replies.</p><p>If the replier on slack has an agent profile in chatwoot under the same email, the replies will be associated accordingly.</p><p>When the replier doesn't have an associated agent profile, the replies will be made from the bot profile.</p>"
+        "TITLE": "เชื่อมต่อกับ Slack",
+        "BODY": "<br/><p>Chatwoot จะเชื่อมข้อความทั้งหมดไว้ที่ช่อง <b><i>การสนทนากับลูกค้า</i></b> บน slack ของคุณ หากตอบกลับเธรดบน slack ในช่อง <b><i>การสนทนากับลูกค้า</i></b> จะมีสร้างการตอบกลับลูกค้าใน Chatwoot ด้วยเช่นเดียวกัน </p><p>การตอบกลับด้วย<b><i>โน๊ต</i></b>จะสร้างโน๊ตส่วนตัวแทนการตอบกลับเป็นข้อความ และหากผู้ตอบกลับบน slack มีโปรไฟล์พนักงานบน Chatwoot ซึ่งใช้อีเมลเดียวกัน การตอบกลับของเขาจะถูกส่งจากโปรไฟล์ที่เชื่อมไว้ใน Chatwoot </p><p>แต่หากผู้ตอบกลับไม่ได้มีโปรไฟล์พนักงานที่เชื่อมกัน การตอบกลับบน slack จะแสดงผลเป็นการตอบกลับที่มาจากโปรไฟล์บอทใน Chatwoot แทน</p>"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
-        "SUCCESS_MESSAGE": "Integration deleted successfully"
+        "SUCCESS_MESSAGE": "ลบการเชื่อมต่อแล้ว"
       }
     },
     "CONNECT": {
-      "BUTTON_TEXT": "Connect"
+      "BUTTON_TEXT": "เชื่อมต่อ"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
index e37f54ea3..fd8c6ac57 100644
--- a/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/labelsMgmt.json
@@ -1,37 +1,37 @@
 {
   "LABEL_MGMT": {
-    "HEADER": "Labels",
-    "HEADER_BTN_TXT": "Add label",
-    "LOADING": "Fetching labels",
+    "HEADER": "ป้ายกำกับ",
+    "HEADER_BTN_TXT": "เพิ่มป้ายกำกับ",
+    "LOADING": "กำลังโหลดป้ายกำกับ",
     "SEARCH_404": "ไม่มีรายการที่ตรงกับเนื้อหานี้",
-    "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>",
+    "SIDEBAR_TXT": "<p><b>ป้ายกำกับ</b><p> ป้ายกำกับช่วยให้คุณจัดกลุ่มและลำดับความสำคัญของการสนทนา คุณสามารถติดป้ายกำกับให้กับการสนทนาได้จากหน้าต่างด้านขวา <br /><br /> ป้ายกำกับผูกกับบัญชีและสามารถใช้เพื่อสร้างระบบการทำงานในบริษัทของคุณ คุณยังสามารถปรับแต่งสีของป้ายกำกับได้ซึ่งช่วยให้มองเห็นป้ายได้ง่ายขึ้น ป้ายกำกับที่สร้างขึ้นจะแสดงบนเมนูข้าง",
     "LIST": {
-      "404": "There are no labels available in this account.",
-      "TITLE": "Manage labels",
-      "DESC": "Labels let you group the conversations together.",
+      "404": "ไม่มีป้ายกำกับในบัญชีนี้",
+      "TITLE": "จัดการป้ายกำกับ",
+      "DESC": "ป้ายกำกับช่วยให้คุณจัดกลุ่มการสนทนาได้",
       "TABLE_HEADER": [
         "ชื่อ",
-        "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"
+        "LABEL": "ชื่อป้ายกำกับ",
+        "PLACEHOLDER": "ชื่อป้ายกำกับ",
+        "REQUIRED_ERROR": "โปรดใส่ชื่อป้ายกำกับ",
+        "MINIMUM_LENGTH_ERROR": "ชื่อป้ายกำกับต้องยาวอย่างน้อย 2 ตัวอักษร",
+        "VALID_ERROR": "ชื่อป้ายกำกับต้องเป็นตัวอักษรภาษาอังกฤษ ตัวเลข ขีดกลาง'-' และ ขีดล่าง'_' เท่านั้น"
       },
       "DESCRIPTION": {
-        "LABEL": "Description",
-        "PLACEHOLDER": "Label Description"
+        "LABEL": "คำอธิบาย",
+        "PLACEHOLDER": "คำอธิบายป้ายกำกับ"
       },
       "COLOR": {
-        "LABEL": "Color"
+        "LABEL": "สี"
       },
       "SHOW_ON_SIDEBAR": {
-        "LABEL": "Show label on sidebar"
+        "LABEL": "แสดงป้ายกำกับบนเมนูข้าง"
       },
       "EDIT": "เเก้ไข",
       "CREATE": "สร้าง",
@@ -39,24 +39,24 @@
       "CANCEL": "ยกเลิก"
     },
     "ADD": {
-      "TITLE": "Add label",
-      "DESC": "Labels let you group the conversations together.",
+      "TITLE": "เพิ่มป้ายกำกับ",
+      "DESC": "ป้ายกำกับช่วยให้คุณจัดกลุ่มการสนทนาได้",
       "API": {
-        "SUCCESS_MESSAGE": "Label added successfully",
+        "SUCCESS_MESSAGE": "เพิ่มป้ายกำกับสำเร็จแล้ว",
         "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
       }
     },
     "EDIT": {
-      "TITLE": "Edit label",
+      "TITLE": "แก้ไขป้ายกำกับ",
       "API": {
-        "SUCCESS_MESSAGE": "Label updated successfully",
+        "SUCCESS_MESSAGE": "อัปเดตป้ายกำกับสำเร็จแล้ว",
         "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
-        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "SUCCESS_MESSAGE": "ลบป้ายกำกับสำเร็จแล้ว",
         "ERROR_MESSAGE": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
       },
       "CONFIRM": {
diff --git a/app/javascript/dashboard/i18n/locale/th/login.json b/app/javascript/dashboard/i18n/locale/th/login.json
index 3b9165064..bafd1ccd1 100644
--- a/app/javascript/dashboard/i18n/locale/th/login.json
+++ b/app/javascript/dashboard/i18n/locale/th/login.json
@@ -3,7 +3,7 @@
     "TITLE": "Login to Chatwoot",
     "EMAIL": {
       "LABEL": "อีเมล์",
-      "PLACEHOLDER": "อีเมล เช่น: someone@example.com"
+      "PLACEHOLDER": "อีเมล เช่น someone@example.com"
     },
     "PASSWORD": {
       "LABEL": "หรัสผ่าน",
@@ -12,10 +12,10 @@
     "API": {
       "SUCCESS_MESSAGE": "เข้าสู่ระบบสำเร็จ",
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง",
-      "UNAUTH": "Username หรือ Password ไม่ถูกต้อง. กรุณาลองใหม่อีกครั้ง"
+      "UNAUTH": "ชื่อผู้ใช้งานหรือรหัสผ่านไม่ถูกต้อง โปรดลองใหม่อีกครั้ง"
     },
     "FORGOT_PASSWORD": "ลืมรหัสผ่าน?",
-    "CREATE_NEW_ACCOUNT": "สร้าง Account ใหม่",
+    "CREATE_NEW_ACCOUNT": "สร้างบัญชีใหม่",
     "SUBMIT": "เข้าสู่ระบบ"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/report.json b/app/javascript/dashboard/i18n/locale/th/report.json
index 136407d15..c059a92bd 100644
--- a/app/javascript/dashboard/i18n/locale/th/report.json
+++ b/app/javascript/dashboard/i18n/locale/th/report.json
@@ -1,396 +1,445 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
-    "LOADING_CHART": "Loading chart data...",
-    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
-    "DOWNLOAD_AGENT_REPORTS": "Download agent reports",
+    "HEADER": "การสนทนา",
+    "LOADING_CHART": "กำลังโหลดแผนภูมิข้อมูล",
+    "NO_ENOUGH_DATA": "ข้อมูลที่เราได้รับไม่เพียงพอต่อการสร้างรายงาน โปรดลองใหม่อีกครั้งในภายหน้า",
+    "DOWNLOAD_AGENT_REPORTS": "ดาวน์โหลดรายงานพนักงาน",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "การสนทนา",
-        "DESC": "( Total )"
+        "DESC": "( ทั้งหมด )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ได้รับ",
+        "DESC": "( ทั้งหมด )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ส่ง",
+        "DESC": "( ทั้งหมด )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาการตอบกลับครั้งแรก",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาการตอบกลับครั้งแรกเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาในการเสร็จสิ้นการสนทนา",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาในการเสร็จสิ้นการสนทนาเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "จำนวนความละเอียด",
+        "DESC": "( ทั้งหมด )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "7 วันที่ผ่านมา"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "30 วันที่ผ่านมา"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 เดือนที่ผ่านมา"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 เดือนที่ผ่านมา"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "ปีที่ผ่านมา"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "กำหนดช่วงระยะเวลา"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "ใช้งาน",
+      "PLACEHOLDER": "เลือกช่วงเวลา"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "จัดกลุ่มโดย",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "วัน"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "วัน"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "สัปดาห์"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "วัน"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "สัปดาห์"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "เดือน"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "วัน"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "สัปดาห์"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "เดือน"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "ปี"
       }
-    ]
+    ],
+    "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",
+    "HEADER": "ภาพรวมพนักงาน",
+    "LOADING_CHART": "กำลังโหลดแผนภูมิข้อมูล",
+    "NO_ENOUGH_DATA": "ข้อมูลที่เราได้รับไม่เพียงพอต่อการสร้างรายงาน โปรดลองใหม่อีกครั้งในภายหน้า",
+    "DOWNLOAD_AGENT_REPORTS": "ดาวน์โหลดรายงานพนักงาน",
     "FILTER_DROPDOWN_LABEL": "เลือกพนักงาน",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "การสนทนา",
-        "DESC": "( Total )"
+        "DESC": "( ทั้งหมด )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ได้รับ",
+        "DESC": "( ทั้งหมด )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ส่ง",
+        "DESC": "( ทั้งหมด )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาการตอบกลับครั้งแรก",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาการตอบกลับครั้งแรกเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาในการเสร็จสิ้นการสนทนา",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาในการเสร็จสิ้นการสนทนาเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "การสนทนาที่เสร็จสิ้น",
+        "DESC": "( ทั้งหมด )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "7 วันที่ผ่านมา"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "30 วันที่ผ่านมา"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 เดือนที่ผ่านมา"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 เดือนที่ผ่านมา"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "ปีที่ผ่านมา"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "กำหนดช่วงระยะเวลา"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "ใช้งาน",
+      "PLACEHOLDER": "เลือกช่วงเวลา"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
-    "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",
+    "HEADER": "ภาพรวมป้ายกำกับ",
+    "LOADING_CHART": "กำลังโหลดแผนภูมิข้อมูล",
+    "NO_ENOUGH_DATA": "ข้อมูลที่เราได้รับไม่เพียงพอต่อการสร้างรายงาน โปรดลองใหม่อีกครั้งในภายหน้า",
+    "DOWNLOAD_LABEL_REPORTS": "ดาวน์โหลดรายงานป้ายกำกับ",
+    "FILTER_DROPDOWN_LABEL": "เลือกป้ายกำกับ",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "การสนทนา",
-        "DESC": "( Total )"
+        "DESC": "( ทั้งหมด )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ได้รับ",
+        "DESC": "( ทั้งหมด )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ส่ง",
+        "DESC": "( ทั้งหมด )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาการตอบกลับครั้งแรก",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาการตอบกลับครั้งแรกเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาในการเสร็จสิ้นการสนทนา",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาในการเสร็จสิ้นการสนทนาเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "จำนวนความละเอียด",
+        "DESC": "( ทั้งหมด )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "7 วันที่ผ่านมา"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "30 วันที่ผ่านมา"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 เดือนที่ผ่านมา"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 เดือนที่ผ่านมา"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "ปีที่ผ่านมา"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "กำหนดช่วงระยะเวลา"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "ใช้งาน",
+      "PLACEHOLDER": "เลือกช่วงเวลา"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
-    "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",
+    "HEADER": "ภาพรวมกล่องข้อความ",
+    "LOADING_CHART": "กำลังโหลดแผนภูมิข้อมูล",
+    "NO_ENOUGH_DATA": "ข้อมูลที่เราได้รับไม่เพียงพอต่อการสร้างรายงาน โปรดลองใหม่อีกครั้งในภายหน้า",
+    "DOWNLOAD_INBOX_REPORTS": "ดาวน์โหลดรายงานกล่องข้อความ",
+    "FILTER_DROPDOWN_LABEL": "เลือกกล่องข้อความ",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "การสนทนา",
-        "DESC": "( Total )"
+        "DESC": "( ทั้งหมด )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ได้รับ",
+        "DESC": "( ทั้งหมด )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ส่ง",
+        "DESC": "( ทั้งหมด )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาการตอบกลับครั้งแรก",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาการตอบกลับครั้งแรกเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาในการเสร็จสิ้นการสนทนา",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาในการเสร็จสิ้นการสนทนาเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "จำนวนความละเอียด",
+        "DESC": "( ทั้งหมด )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "7 วันที่ผ่านมา"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "30 วันที่ผ่านมา"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 เดือนที่ผ่านมา"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 เดือนที่ผ่านมา"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "ปีที่ผ่านมา"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "กำหนดช่วงระยะเวลา"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "ใช้งาน",
+      "PLACEHOLDER": "เลือกช่วงเวลา"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
-    "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",
+    "HEADER": "ภาพรวมทีม",
+    "LOADING_CHART": "กำลังโหลดแผนภูมิข้อมูล",
+    "NO_ENOUGH_DATA": "ข้อมูลที่เราได้รับไม่เพียงพอต่อการสร้างรายงาน โปรดลองใหม่อีกครั้งในภายหน้า",
+    "DOWNLOAD_TEAM_REPORTS": "ดาวน์โหลดรายงานทีม",
+    "FILTER_DROPDOWN_LABEL": "เลือกทีม",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "การสนทนา",
-        "DESC": "( Total )"
+        "DESC": "( ทั้งหมด )"
       },
       "INCOMING_MESSAGES": {
-        "NAME": "Incoming Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ได้รับ",
+        "DESC": "( ทั้งหมด )"
       },
       "OUTGOING_MESSAGES": {
-        "NAME": "Outgoing Messages",
-        "DESC": "( Total )"
+        "NAME": "ข้อความที่ส่ง",
+        "DESC": "( ทั้งหมด )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First response time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาการตอบกลับครั้งแรก",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาการตอบกลับครั้งแรกเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_TIME": {
-        "NAME": "Resolution Time",
-        "DESC": "( Avg )"
+        "NAME": "ระยะเวลาในการจบการสนทนา",
+        "DESC": "( เฉลี่ย )",
+        "INFO_TEXT": "จำนวนการสนทนาทั้งหมดที่ใช้ในการคำนวณ:",
+        "TOOLTIP_TEXT": "ระยะเวลาในการเสร็จสิ้นการสนทนาเท่ากับ %{metricValue} (คำนวณจาก %{conversationCount} การสนทนา)"
       },
       "RESOLUTION_COUNT": {
-        "NAME": "Resolution Count",
-        "DESC": "( Total )"
+        "NAME": "จำนวนความละเอียด",
+        "DESC": "( ทั้งหมด )"
       }
     },
     "DATE_RANGE": [
       {
         "id": 0,
-        "name": "Last 7 days"
+        "name": "7 วันที่ผ่านมา"
       },
       {
         "id": 1,
-        "name": "Last 30 days"
+        "name": "30 วันที่ผ่านมา"
       },
       {
         "id": 2,
-        "name": "Last 3 months"
+        "name": "3 เดือนที่ผ่านมา"
       },
       {
         "id": 3,
-        "name": "Last 6 months"
+        "name": "6 เดือนที่ผ่านมา"
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "ปีที่ผ่านมา"
       },
       {
         "id": 5,
-        "name": "Custom date range"
+        "name": "กำหนดช่วงระยะเวลา"
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "ใช้งาน",
+      "PLACEHOLDER": "เลือกช่วงเวลา"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "รายงาน CSAT",
+    "NO_RECORDS": "ไม่มีรายงาน CSAT ที่แสดงผลได้",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "เลือกพนักงาน"
       }
     },
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
+        "CONTACT_NAME": "ผู้ติดต่อ",
+        "AGENT_NAME": "พนักงานที่ได้รับมอบหมาย",
         "RATING": "การประเมิน",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "FEEDBACK_TEXT": "คำติชม"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "การตอบกลับทั้งหมด",
+        "TOOLTIP": "จำนวนการตอบกลับทั้งหมดที่บันทึกไว้"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "คะแนนความพึงพอใจ",
+        "TOOLTIP": "จำนวนการตอบกลับเชิงบวก / จำนวนการตอบกลับทั้งหมด * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "อัตราการตอบกลับ",
+        "TOOLTIP": "จำนวนการตอบกลับทั้งหมด / จำนวนข้อความทั้งหมดที่แบบสอบถาม CSAT ส่ง * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "ภาพรวม",
+    "LIVE": "ขณะนี้",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "การสนทนาที่เปิดอยู่",
+      "LOADING_MESSAGE": "กำโหลดตัวชี้วัดการสนทนา",
+      "OPEN": "เปิด",
+      "UNATTENDED": "ไม่ได้เข้าร่วม",
+      "UNASSIGNED": "ไม่ได้รับมอบหมาย"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "การสนทนาที่พนักงานดูแล",
+      "LOADING_MESSAGE": "กำลังโหลดตัวชี้วัดพนักงาน",
+      "NO_AGENTS": "ไม่มีการสนทนาที่พนักงานดูแล",
+      "TABLE_HEADER": {
+        "AGENT": "พนักงาน",
+        "OPEN": "เปิดอยู่",
+        "UNATTENDED": "ไม่ได้เข้าร่วม",
+        "STATUS": "สถานะ"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "สถานะพนักงาน",
+      "ONLINE": "ออนไลน์",
+      "BUSY": "ไม่ว่าง",
+      "OFFLINE": "ออฟไลน์"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/setNewPassword.json b/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
index d46e4dadf..2ec30a2b3 100644
--- a/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/th/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "เปลี่ยนหรัสผ่านเเล้ว",
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
     },
+    "CAPTCHA": {
+      "ERROR": "การยืนยันหมดอายุ โปรดแก้ไขแคปช่าอีกครั้ง"
+    },
     "SUBMIT": "ส่ง"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index e72b11279..67e6b5e42 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -1,225 +1,231 @@
 {
   "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",
+    "LINK": "ตั้งค่าข้อมูลส่วนตัว",
+    "TITLE": "ตั้งค่าข้อมูลส่วนตัว",
+    "BTN_TEXT": "อัปเดตข้อมูลส่วนตัว",
+    "DELETE_AVATAR": "ลบรูป",
+    "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": "อีเมลเป็นข้อมูลระบุตัวตนของคุณ และใช้ในการเข้าสู่ระบบ"
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "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"
+        "NOTE": "คุณสามารถใช้ token นี้เชื่อมต่อกับ API ได้"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "TITLE": "เสียงแจ้งเตือน",
+        "NOTE": "เปิดใช้เสียงแจ้งเตือนในแดชบอร์ดเมื่อมีข้อความหรือบทสนทนาใหม่",
         "NONE": "ไม่มี",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "ASSIGNED": "การสนทนาที่ได้รับมอบหมาย",
+        "ALL_CONVERSATIONS": "การสนทนาทั้งหมด"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
-        "TITLE": "Email Notifications",
-        "NOTE": "Update your email notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+        "TITLE": "การแจ้งเตือนทางอีเมล",
+        "NOTE": "ตั้งค่าการแจ้งเตือนทางอีเมลของคุณที่นี่",
+        "CONVERSATION_ASSIGNMENT": "ส่งอีเมลแจ้งเตือนเมื่อมีบทสนทนาที่ฉันได้รับมอบหมาย",
+        "CONVERSATION_CREATION": "ส่งอีเมลแจ้งเตือนเมื่อมีการสร้างบทสนทนาใหม่",
+        "CONVERSATION_MENTION": "ส่งอีเมลแจ้งเตือนเมื่อฉันถูกกล่าวถึงในการสนทนา",
+        "ASSIGNED_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",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "การแจ้งเตือนแบบพุช",
+        "NOTE": "ตั้งค่าการแจ้งเตือนแบบพุชที่นี่",
+        "CONVERSATION_ASSIGNMENT": "ส่งการแจ้งเตือนแบบพุชเมื่อมีการสนทนาที่ฉันได้รับมอบหมาย",
+        "CONVERSATION_CREATION": "ส่งการแจ้งเตือนแบบพุชเมื่อมีการสนทนาใหม่",
+        "CONVERSATION_MENTION": "ส่งการแจ้งเตือนแบบพุชเมื่อฉันถูกกล่าวถึงในการสนทนา",
+        "ASSIGNED_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",
-        "PLACEHOLDER": "Please enter your 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": "Availability",
+        "LABEL": "สถานะ",
         "STATUSES_LIST": [
-          "Online",
-          "Busy",
-          "Offline"
+          "ออนไลน์",
+          "ไม่ว่าง",
+          "ออฟไลน์"
         ]
       },
       "EMAIL": {
-        "LABEL": "Your email address",
+        "LABEL": "อีเมลของคุณ",
         "ERROR": "กรุณากรอกที่อยู่อีเมล์ให้ถูกต้อง",
-        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+        "PLACEHOLDER": "โปรดกรอกอีเมลของคุณ อีเมลจะถูกแสดงขณะสนทนา"
       },
       "CURRENT_PASSWORD": {
-        "LABEL": "Current password",
-        "ERROR": "Please enter the current password",
-        "PLACEHOLDER": "Please enter the current password"
+        "LABEL": "รหัสผ่านปัจจุบัน",
+        "ERROR": "โปรดใส่รหัสผ่านปัจจุบัน",
+        "PLACEHOLDER": "โปรดใส่รหัสผ่านปัจจุบัน"
       },
       "PASSWORD": {
-        "LABEL": "New password",
-        "ERROR": "Please enter a password of length 6 or more",
-        "PLACEHOLDER": "Please enter a new password"
+        "LABEL": "รหัสผ่านใหม่",
+        "ERROR": "โปรดใส่รหัสผ่านที่มีอย่างน้อย 6 ตัวอักษร",
+        "PLACEHOLDER": "โปรดใส่รหัสผ่านใหม่"
       },
       "PASSWORD_CONFIRMATION": {
-        "LABEL": "Confirm new password",
-        "ERROR": "Confirm password should match the password",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "LABEL": "ยืนยันรหัสผ่านใหม่",
+        "ERROR": "รหัสผ่านไม่ตรงกัน",
+        "PLACEHOLDER": "โปรดใส่รหัสผ่านใหม่อีกครั้ง"
       }
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_AVAILABILITY_STATUS": "Change",
-    "CHANGE_ACCOUNTS": "Switch Account",
-    "CONTACT_SUPPORT": "Contact Support",
-    "SELECTOR_SUBTITLE": "Select an account from the following list",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
-    "LOGOUT": "Logout"
+    "CHANGE_AVAILABILITY_STATUS": "เปลี่ยน",
+    "CHANGE_ACCOUNTS": "สลับบัญชี",
+    "CONTACT_SUPPORT": "ติดต่อฝ่ายสนับสนุน",
+    "SELECTOR_SUBTITLE": "เลือกบัญชีจากรายชื่อต่อไปนี้",
+    "PROFILE_SETTINGS": "ตั้งค่าข้อมูลส่วนตัว",
+    "KEYBOARD_SHORTCUTS": "คีย์ลัด",
+    "LOGOUT": "ออกจากระบบ"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "days trial remaining.",
-    "TRAIL_BUTTON": "Buy Now",
-    "DELETED_USER": "Deleted User"
+    "TRIAL_MESSAGE": "จำนวนวันทดลองใช้ที่เหลืออยู่",
+    "TRAIL_BUTTON": "ซื้อเลย",
+    "DELETED_USER": "ผู้ใช้งานที่ถูกลบ"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copy",
-      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+      "BUTTON_TEXT": "คัดลอก",
+      "COPY_SUCCESSFUL": "คัดลอกไปยังคลิปบอร์ดเเล้ว"
+    },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "แสดงเพิ่มเติม",
+      "SHOW_LESS": "แสดงน้อยลง"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "ดาวโหลด",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "กำลังอัปโหลด"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "ส่ง"
     }
   },
-  "CONFIRM_EMAIL": "Verifying...",
+  "CONFIRM_EMAIL": "กำลังตรวจสอบ",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Add Inbox"
+      "NEW_INBOX": "เพิ่มกล่องข้อความ"
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "CURRENTLY_VIEWING_ACCOUNT": "กำลังดูอยู่:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "การสนทนา",
-    "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
-    "REPORTS": "Reports",
-    "SETTINGS": "Settings",
+    "ALL_CONVERSATIONS": "การสนทนาทั้งหมด",
+    "MENTIONED_CONVERSATIONS": "การกล่าวถึง",
+    "REPORTS": "รายงาน",
+    "SETTINGS": "ตั้งค่า",
     "CONTACTS": "ผู้ติดต่อ",
-    "HOME": "Home",
+    "HOME": "หน้าหลัก",
     "AGENTS": "พนักงาน",
     "INBOXES": "กล่องข้อความ",
-    "NOTIFICATIONS": "Notifications",
+    "NOTIFICATIONS": "การแจ้งเตือน",
     "CANNED_RESPONSES": "คำตอบสำเร็จรูป",
-    "INTEGRATIONS": "Integrations",
-    "PROFILE_SETTINGS": "Profile Settings",
-    "ACCOUNT_SETTINGS": "Account Settings",
-    "APPLICATIONS": "Applications",
-    "LABELS": "Labels",
+    "INTEGRATIONS": "การเชื่อมต่อกับระบบ",
+    "PROFILE_SETTINGS": "ตั้งค่าข้อมูลส่วนตัว",
+    "ACCOUNT_SETTINGS": "ตั้งค่าบัญชี",
+    "APPLICATIONS": "โปรแกรม",
+    "LABELS": "ป้ายกำกับ",
     "CUSTOM_ATTRIBUTES": "แอตทริบิวต์ที่กำหนดเอง",
-    "AUTOMATION": "Automation",
-    "TEAMS": "Teams",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
-    "ALL_CONTACTS": "All Contacts",
-    "TAGGED_WITH": "Tagged with",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "AUTOMATION": "เงื่อนไขอัตโนมัติ",
+    "TEAMS": "ทีม",
+    "CUSTOM_VIEWS_FOLDER": "โฟลเดอร์",
+    "CUSTOM_VIEWS_SEGMENTS": "กลุ่มตามตัวกรอง",
+    "ALL_CONTACTS": "รายชื่อผู้ติดต่อทั้งหมด",
+    "TAGGED_WITH": "ที่ติดป้าย",
+    "NEW_LABEL": "เพิ่มป้ายกำกับ",
+    "NEW_TEAM": "สร้างทีมใหม่",
+    "NEW_INBOX": "เพิ่มกล่องข้อความ",
+    "REPORTS_CONVERSATION": "การสนทนา",
     "CSAT": "CSAT",
     "CAMPAIGNS": "แคมเปญ",
-    "ONGOING": "Ongoing",
-    "ONE_OFF": "One off",
+    "ONGOING": "ต่อเนื่อง",
+    "ONE_OFF": "ครั้งเดียว",
     "REPORTS_AGENT": "พนักงาน",
-    "REPORTS_LABEL": "Labels",
+    "REPORTS_LABEL": "ป้ายกำกับ",
     "REPORTS_INBOX": "กล่องข้อความ",
-    "REPORTS_TEAM": "Team",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "REPORTS_TEAM": "ทีม",
+    "SET_AVAILABILITY_TITLE": "ตั้งสถานะเป็น...",
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "ภาพรวม"
   },
   "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",
+    "NO_ACCOUNT_WARNING": "ไม่นะ! ดูเหมือนว่าเราจะไม่เจอบัญชี Chatwoot ของคุณ โปรดสร้างบัญชีใหม่เพื่อดำเนินการต่อ",
+    "NEW_ACCOUNT": "สร้างบัญชีใหม่",
+    "SELECTOR_SUBTITLE": "สร้างบัญชีใหม่",
     "API": {
-      "SUCCESS_MESSAGE": "Account created successfully",
-      "EXIST_MESSAGE": "Account already exists",
+      "SUCCESS_MESSAGE": "สร้างบัญชีสำเร็จแล้ว",
+      "EXIST_MESSAGE": "บัญชีนี้มีผู้ใช้งานแล้ว",
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
     },
     "FORM": {
       "NAME": {
-        "LABEL": "Account Name",
-        "PLACEHOLDER": "Wayne Enterprises"
+        "LABEL": "ชื่อบัญชี",
+        "PLACEHOLDER": "ชื่อบริษัท"
       },
       "SUBMIT": "ส่ง"
     }
   },
   "KEYBOARD_SHORTCUTS": {
     "TITLE": {
-      "OPEN_CONVERSATION": "Open conversation",
-      "RESOLVE_AND_NEXT": "Resolve and move to next",
-      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
-      "RESOLVE_CONVERSATION": "Resolve Conversation",
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "ADD_ATTACHMENT": "Add Attachment",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
-      "TOGGLE_SIDEBAR": "Toggle Sidebar",
-      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
-      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
-      "GO_TO_SETTINGS": "Go to Settings",
-      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "OPEN_CONVERSATION": "เปิดดูการสนทนา",
+      "RESOLVE_AND_NEXT": "จบการสนทนานี้และเริ่มการสนทนาถัดไป",
+      "NAVIGATE_DROPDOWN": "เลือกรายการ",
+      "RESOLVE_CONVERSATION": "เสร็จสิ้นการสนทนา",
+      "GO_TO_CONVERSATION_DASHBOARD": "ไปที่หน้าการสนทนา",
+      "ADD_ATTACHMENT": "เพิ่มไฟล์แนบ",
+      "GO_TO_CONTACTS_DASHBOARD": "ไปที่หน้าผู้ติดต่อ",
+      "TOGGLE_SIDEBAR": "เปิดหรือปิดเมนูข้าง",
+      "GO_TO_REPORTS_SIDEBAR": "ไปที่แถบรายงาน",
+      "MOVE_TO_NEXT_TAB": "ไปแท็บการสนทนาถัดไป",
+      "GO_TO_SETTINGS": "ไปที่ตั้งค่า",
+      "SWITCH_CONVERSATION_STATUS": "ไปยังสถานะการสนทนาถัดไป",
+      "SWITCH_TO_PRIVATE_NOTE": "สลับเป็นโน้ตส่วนตัว",
+      "TOGGLE_RICH_CONTENT_EDITOR": "เปิดหรือปิดเครื่องมือแก้ไขริชคอนเทนท์",
+      "SWITCH_TO_REPLY": "สลับเป็นการตอบกลับ",
+      "TOGGLE_SNOOZE_DROPDOWN": "เปิดหรือปิดเมนูพักการสนทนา"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/th/signup.json b/app/javascript/dashboard/i18n/locale/th/signup.json
index 12b020f6d..2544317ba 100644
--- a/app/javascript/dashboard/i18n/locale/th/signup.json
+++ b/app/javascript/dashboard/i18n/locale/th/signup.json
@@ -1,38 +1,39 @@
 {
   "REGISTER": {
-    "TRY_WOOT": "Register an account",
-    "TITLE": "Register",
-    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "TRY_WOOT": "สร้างบัญชี",
+    "TITLE": "สร้างบัญชี",
+    "TERMS_ACCEPT": "การสมัครบ่งบอกว่าคุณได้การยอมรับ <a href=\"https://www.chatwoot.com/terms\">ข้อตกลง</a> และ <a href=\"https://www.chatwoot.com/privacy-policy\">นโยบายความเป็นส่วนตัว</a> ของเรา",
     "ACCOUNT_NAME": {
       "LABEL": "ชื่อบัญชี",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "PLACEHOLDER": "ใส่ชื่อบัญชี เช่น ชื่อบริษัทของคุณ",
+      "ERROR": "ชื่อบัญชีสั้นเกินไป"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "ชื่อเต็ม",
+      "PLACEHOLDER": "ใส่ชื่อเต็มของคุณ",
+      "ERROR": "ชื่อเต็มสั้นเกินไป"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "อีเมลบริษัท",
+      "PLACEHOLDER": "ใส่อีเมลบริษัทของคุณ",
+      "ERROR": "ไม่สามารถใช้อีเมลนี้ได้"
     },
     "PASSWORD": {
       "LABEL": "หรัสผ่าน",
       "PLACEHOLDER": "หรัสผ่าน",
-      "ERROR": "หรัสผ่านนั้นสั้นเกินไป"
+      "ERROR": "หรัสผ่านนั้นสั้นเกินไป",
+      "IS_INVALID_PASSWORD": "รหัสผ่านต้องมีอย่างน้อย 1 ตัวอักษรภาษาอังกฤษพิมพ์เล็ก, 1 ตัวอักษรภาษาอังกฤษพิมพ์ใหญ่, 1 ตัวเลข และอักขระพิเศษ 1 ตัว"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "ยืนยันหรัสผ่าน",
       "PLACEHOLDER": "ยืนยันหรัสผ่าน",
-      "ERROR": "Password doesnot match"
+      "ERROR": "รหัสผ่านไม่เหมือนกัน"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Registration Successfull",
+      "SUCCESS_MESSAGE": "ลงทะเบียนสำเร็จแล้ว",
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
     },
     "SUBMIT": "ส่ง",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "มีบัญชีอยู่แล้ว?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
index a625604fa..ce8d3e237 100644
--- a/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/th/teamsSettings.json
@@ -1,35 +1,35 @@
 {
   "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>",
+    "NEW_TEAM": "สร้างทีมใหม่",
+    "HEADER": "ทีม",
+    "SIDEBAR_TXT": "<p><b>ทีม</b></p> <p>คุณสามารถจัดกลุ่มให้กับพนักงานตามความรับผิดชอบที่พวกเขาได้รับ <br /> พนักงานหนึ่งคนสามารถเข้าร่วมได้หลายทีม มอบหมายการสนทนาให้กับทีมเมื่อต้องทำงานร่วมกัน </p>",
     "LIST": {
-      "404": "There are no teams created on this account.",
-      "EDIT_TEAM": "Edit team"
+      "404": "ยังไม่มีทีมที่ถูกสร้างในบัญชีนี้",
+      "EDIT_TEAM": "แก้ไขทีม"
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
-        "DESC": "Add a title and description to your new team."
+        "TITLE": "สร้างทีมใหม่",
+        "DESC": "เพิ่มชื่อและคำอธิบายทีม"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Add agents to team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation."
+        "BUTTON_TEXT": "เพิ่มพนักงานเข้าทีม",
+        "TITLE": "เพิ่มพนักงานเข้าทีม %{teamName}",
+        "DESC": "เพิ่มพนักงานเข้าทีมที่สร้างใหม่ของคุณ ซึ่งจะช่วยให้คุณทำงานร่วมกันเป็นทีมเพื่อตอบรับการสนทนาและรับการแจ้งเตือนจากการสนทนาเดียวกัน"
       },
       "WIZARD": [
         {
           "title": "สร้าง",
           "route": "settings_teams_new",
-          "body": "Create a new team of agents."
+          "body": "สร้างทีมใหม่สำหรับพนักงาน"
         },
         {
           "title": "เพิ่มพนักงาน",
           "route": "settings_teams_add_agents",
-          "body": "Add agents to the team."
+          "body": "เพิ่มพนักงานเข้าทีม"
         },
         {
-          "title": "Finish",
+          "title": "เสร็จสิ้น",
           "route": "settings_teams_finish",
           "body": "คุณพร้อมเเล้ว"
         }
@@ -37,89 +37,89 @@
     },
     "EDIT_FLOW": {
       "CREATE": {
-        "TITLE": "Edit your team details",
-        "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "TITLE": "แก้ไขรายละเอียดของทีม",
+        "DESC": "แก้ไขชื่อและคำอธิบายทีม",
+        "BUTTON_TEXT": "อัปเดตทีม"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Update agents in team",
-        "TITLE": "Add agents to team - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "BUTTON_TEXT": "อัพเดทพนักงานในทีม",
+        "TITLE": "เพิ่มพนักงานเข้าทีม %{teamName}",
+        "DESC": "เพิ่มพนักงานเข้าทีมที่สร้างใหม่ของคุณ พนักงานทุกคนในทีมจะได้รับการแจ้งเตือนเมื่อทีมได้รับมอบหมายให้ดูแลการสนทนา"
       },
       "WIZARD": [
         {
-          "title": "Team details",
+          "title": "รายละเอียดของทีม",
           "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "body": "เปลี่ยนชื่อ คำอธิบาย และรายละเอียดอื่นๆ"
         },
         {
-          "title": "Edit Agents",
+          "title": "เเก้ไขพนักงาน",
           "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "body": "แก้ไขพนักงานในทีมของคุณ"
         },
         {
-          "title": "Finish",
+          "title": "เสร็จสิ้น",
           "route": "settings_teams_edit_finish",
           "body": "คุณพร้อมเเล้ว"
         }
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+      "ERROR_MESSAGE": "ไม่สามารถบันทึกรายละเอียดของทีมได้ โปรดลองใหม่อีกครั้ง"
     },
     "AGENTS": {
-      "AGENT": "AGENT",
+      "AGENT": "พนักงาน",
       "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."
+      "BUTTON_TEXT": "เพิ่มพนักงาน",
+      "ADD_AGENTS": "กำลังเพิ่มพนักงานเข้าทีมของคุณ...",
+      "SELECT": "เลือก",
+      "SELECT_ALL": "เลือกพนักงานทั้งหมด",
+      "SELECTED_COUNT": "เลือก %{selected} จากพนักงานทั้งหมด %{total} คน"
     },
     "ADD": {
-      "TITLE": "Add agents to team - %{teamName}",
-      "DESC": "Add Agents to your newly created team. This lets you collaborate as a team on conversations, get notified on new events in the same conversation.",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
-      "BUTTON_TEXT": "Add agents",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "TITLE": "เพิ่มพนักงานเข้าทีม %{teamName}",
+      "DESC": "เพิ่มพนักงานเข้าทีมที่สร้างใหม่ของคุณ ซึ่งจะช่วยให้คุณทำงานร่วมกันเป็นทีมเพื่อตอบรับการสนทนาและรับการแจ้งเตือนจากการสนทนาเดียวกัน",
+      "SELECT": "เลือก",
+      "SELECT_ALL": "เลือกพนักงานทั้งหมด",
+      "SELECTED_COUNT": "เลือก %{selected} จากพนักงานทั้งหมด %{total} คน",
+      "BUTTON_TEXT": "เพิ่มพนักงาน",
+      "AGENT_VALIDATION_ERROR": "เลือกพนักงานอย่างน้อย 1 คน"
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
-      "BUTTON_TEXT": "Finish"
+      "TITLE": "ทีมของคุณพร้อมแล้ว!",
+      "MESSAGE": "ตอนนี้ทีมของคุณสามารถทำงานร่วมกันเพื่อดูแลการสนทนา ขอให้สนุกกับการทำงาน ",
+      "BUTTON_TEXT": "เสร็จสิ้น"
     },
     "DELETE": {
       "BUTTON_TEXT": "ลบ",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+        "SUCCESS_MESSAGE": "ลบทีมสำเร็จแล้ว",
+        "ERROR_MESSAGE": "ไม่สามารถลบทีมได้ โปรดลองใหม่อีกครั้ง"
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "TITLE": "คุณแน่ใจว่าต้องการลบ %{teamName} หรือไม่",
+        "PLACE_HOLDER": "โปรดพิมพ์ {teamName} เพื่อยืนยัน",
+        "MESSAGE": "การลบทีมจะยกเลิกการมอบหมายการสนทนาที่ทีมนี้รับผิดชอบไปด้วย",
         "YES": "ลบ ",
         "NO": "ยกเลิก"
       }
     },
-    "SETTINGS": "Settings",
+    "SETTINGS": "ตั้งค่า",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "อัปเดตทีม",
+      "CREATE": "สร้างทีม",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "ชื่อทีม",
+        "PLACEHOLDER": "เช่น ฝ่ายขาย ฝ่ายสนับสนุนลูกค้า"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "คำอธิบายทีม",
+        "PLACEHOLDER": "คำอธิบายสั้นๆเกี่ยวกับทีม"
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "เปิดใช้การมอบหมายงานอัตโนมัติสำหรับทีมนี้"
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "สร้างทีม"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/th/webhooks.json b/app/javascript/dashboard/i18n/locale/th/webhooks.json
index 347c96893..923819f95 100644
--- a/app/javascript/dashboard/i18n/locale/th/webhooks.json
+++ b/app/javascript/dashboard/i18n/locale/th/webhooks.json
@@ -1,5 +1,5 @@
 {
   "WEBHOOKS_SETTINGS": {
-    "HEADER": "Webhook Settings"
+    "HEADER": "ตั้งค่า Webhook"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
index 0116182ec..c22657884 100644
--- a/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/tr/advancedFilters.json
@@ -1,91 +1,91 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Görüşmeleri Filtrele",
+    "SUBTITLE": "Filtreleri aşağıya ekleyin ve görüşmeleri filtrelemek için 'Filtreleri Uygula' butonuna basın.",
+    "ADD_NEW_FILTER": "Filtre Ekle",
+    "FILTER_DELETE_ERROR": "Kaydetmek için en az bir filtre ekleyin",
+    "SUBMIT_BUTTON_LABEL": "Filtreleri uygula",
     "CANCEL_BUTTON_LABEL": "İptal Et",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Filtreleri Temizle",
+    "EMPTY_VALUE_ERROR": "Değer gereklidir",
+    "TOOLTIP_LABEL": "Görüşmeleri filtrele",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "VE",
+      "OR": "YA DA"
     },
     "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",
+      "equal_to": "Eşit",
+      "not_equal_to": "Eşit değil",
+      "contains": "İçerir",
+      "does_not_contain": "İçermez",
+      "is_present": "Şu an",
+      "is_not_present": "Şu an değil",
+      "is_greater_than": "Şundan büyük",
       "is_less_than": "Şundan daha az",
       "days_before": "x gün önce"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "Doğru",
+      "FALSE": "Yanlış"
     },
     "ATTRIBUTES": {
       "STATUS": "Durum",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Atama İsmi",
       "INBOX_NAME": "Gelen Kutusu Adı",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Takım Adı",
+      "CONVERSATION_IDENTIFIER": "Görüşme Doğrulama",
+      "CAMPAIGN_NAME": "Kampanya Adı",
       "LABELS": "Etiketler",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+      "BROWSER_LANGUAGE": "Tarayıcı Dili",
+      "COUNTRY_NAME": "Ülke Adı",
+      "REFERER_LINK": "Yönlendirme bağlantısı",
+      "CUSTOM_ATTRIBUTE_LIST": "Liste",
+      "CUSTOM_ATTRIBUTE_TEXT": "Yazı",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Sayı",
+      "CUSTOM_ATTRIBUTE_LINK": "Bağlantı",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Onay Kutusu",
       "CREATED_AT": "Oluşturma",
       "LAST_ACTIVITY": "Son Etkinlik"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Standart Filtreler",
+      "ADDITIONAL_FILTERS": "Gelişmiş Filtreler",
       "CUSTOM_ATTRIBUTES": "Özel Nitelikler"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
-        "SAVE_BUTTON": "Save filter",
+        "TITLE": "Bu filtreyi kaydetmek ister misiniz?",
+        "LABEL": "Bu filtreye isim ver",
+        "PLACEHOLDER": "Bu filtre için bir isim yazın",
+        "ERROR_MESSAGE": "İsim gereklidir",
+        "SAVE_BUTTON": "Filtreyi kaydet",
         "CANCEL_BUTTON": "İptal Et",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Klasör başarıyla oluşturuldu",
+          "ERROR_MESSAGE": "Klasör oluşturulurken hata oluştu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Segment başarıyla oluşturuldu",
+          "ERROR_MESSAGE": "Segment oluşturulurken hata oluştu"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Filtreyi sil",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Silmeyi onayla",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Filtreyi silmek istediğinizden emin misiniz ",
             "YES": "Evet, Sil",
             "NO": "Hayır, kalsın"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Klasör başarıyla silindi",
+          "ERROR_MESSAGE": "Klasör silinirken hata oluştu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Segment başarıyla silindi",
+          "ERROR_MESSAGE": "Segment silinirken hata oluştu"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
index 04847c36f..4a4e64d86 100644
--- a/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/attributesMgmt.json
@@ -1,11 +1,11 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Özel Nitelikler",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
+    "HEADER_BTN_TXT": "Nitelik Ekle",
+    "LOADING": "Özel Nitelikler getiriliyor",
     "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",
+      "TITLE": "Nitelik Ekle",
       "SUBMIT": "Yarat",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "FORM": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/automation.json b/app/javascript/dashboard/i18n/locale/tr/automation.json
index c34d39189..762c72d7d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/automation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/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": "Otomasyon",
+    "HEADER_BTN_TXT": "Otomasyon Kuralı Ekle",
+    "LOADING": "Otomasyon kuralları getiriliyor",
+    "SIDEBAR_TXT": "<p><b>Otomasyon Kuralları</b> <p>Otomasyonlar, manuel olarak yapacağınız işlemleri otomatik olarak yapmanıza yardımcı olur. Otomasyonlar ile, görüşmelere etiket ekleme ve en iyi temsilcinizi atama gibi bir çok işlemi yapabilirsiniz. Yani takımınız en iyi yapabildiği şeye odaklanır ve manuel işlemlere daha az zaman harcar.</p>",
     "ADD": {
-      "TITLE": "Add Automation Rule",
+      "TITLE": "Otomasyon Kuralı Ekle",
       "SUBMIT": "Yarat",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "FORM": {
         "NAME": {
-          "LABEL": "Rule Name",
-          "PLACEHOLDER": "Enter rule name",
-          "ERROR": "Name is required"
+          "LABEL": "Kural Adı",
+          "PLACEHOLDER": "Kural ismi yazınız",
+          "ERROR": "İsim gereklidir"
         },
         "DESC": {
           "LABEL": "Açıklama",
-          "PLACEHOLDER": "Enter rule description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "Kural açıklaması yazınız",
+          "ERROR": "Açıklama zorunludur"
         },
         "EVENT": {
-          "LABEL": "Event",
-          "PLACEHOLDER": "Please select one",
-          "ERROR": "Event is required"
+          "LABEL": "Olay",
+          "PLACEHOLDER": "Lütfen birini seçiniz",
+          "ERROR": "Olay seçilmelidir"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Koşullar"
         },
         "ACTIONS": {
           "LABEL": "Hareketler"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Koşul Ekle",
+      "ACTION_BUTTON_LABEL": "Olay Ekle",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Otomasyon kuralı başarıyla eklendi",
+        "ERROR_MESSAGE": "Otomasyon kuralı oluşturulamadı, lütfen daha sonra tekrar deneyin"
       }
     },
     "LIST": {
@@ -43,12 +43,12 @@
         "İsim",
         "Açıklama",
         "Aktif",
-        "Created on"
+        "Oluşturma"
       ],
-      "404": "No automation rules found"
+      "404": "Otomasyon kuralı bulunamadı"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "Otomasyon Kuralını Sil",
       "SUBMIT": "Sil",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "CONFIRM": {
@@ -58,24 +58,24 @@
         "NO": "Hayır, Tut"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Otomasyon kuralı başarıyla silindi",
+        "ERROR_MESSAGE": "Otomasyon kuralı silinemedi, lütfen daha sonra tekrar deneyin"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "Otomasyon Kuralını Düzenle",
       "SUBMIT": "Güncelleme",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Otomasyon kuralı başarıyla güncellendi",
+        "ERROR_MESSAGE": "Otomasyon kuralı güncellenemedi, lütfen daha sonra tekrar deneyin"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Kopyala",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Otomasyon başarıyla kopyalandı",
+        "ERROR_MESSAGE": "Otomasyon kuralı kopyalanamadı, lütfen daha sonra tekrar deneyin"
       }
     },
     "FORM": {
@@ -83,25 +83,34 @@
       "CREATE": "Yarat",
       "DELETE": "Sil",
       "CANCEL": "İptal Et",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "Olay seçimini değiştirmek tüm koşulları ve aşağıda eklenmiş etkinlikleri değiştirecektir"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+      "DELETE_MESSAGE": "Kaydetmek için en az bir koşul eklemelisiniz"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "DELETE_MESSAGE": "Kaydetmek için en az bir olay seçmelisiniz",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Mesajınızı buraya yazınız",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Takımları seçin"
     },
     "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": "Otomasyon Kuralını Etkinleştir",
+      "DEACTIVATION_TITLE": "Otomasyon Kuralını Pasifleştir",
+      "ACTIVATION_DESCRIPTION": "'{automationName}' isimli otomasyon kuralı etkinleştirilecek. Devam etmek istiyor musunuz?",
+      "DEACTIVATION_DESCRIPTION": "'{automationName}' isimli otomasyon kuralı pasifleştirilecek. Devam etmek istiyor musunuz?",
+      "ACTIVATION_SUCCESFUL": "Otomasyon Kuralı Başarıyla Etkinleştirildi",
+      "DEACTIVATION_SUCCESFUL": "Otomasyon Kuralı Başarıyla Pasifleştirildi",
+      "ACTIVATION_ERROR": "Otomasyon Kuralı Aktifleştirilemedi, Lütfen daha sonra tekrar deneyin",
+      "DEACTIVATION_ERROR": "Otomasyon Kuralı Pasifleştirilemedi, Lütfen daha sonra tekrar deneyin",
       "CONFIRMATION_LABEL": "Evet",
       "CANCEL_LABEL": "Hayır"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Ek yüklenemedi, Tekrar deneyin",
+      "LABEL_IDLE": "Dosya Yükle",
+      "LABEL_UPLOADING": "Yükleniyor ...",
+      "LABEL_UPLOADED": "Başarıyla Yüklendi",
+      "LABEL_UPLOAD_FAILED": "Yükleme Başarısız"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
index 154ca746d..38720aed1 100644
--- a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Hazır Yanıt Ekle",
     "LOADING": "Hazır Yanıtlar Getiriliyor",
     "SEARCH_404": "Bu sorgu ile eşleşen öğe yok",
-    "SIDEBAR_TXT": "<p><b>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>Hazır Yanıtlar</b> </p><p> Hazır Yanıtlar, bir sohbete hızlı bir şekilde yanıt göndermek için kullanılabilen kaydedilmiş yanıt şablonlarıdır. </p><p> Bir Hazır Yanıt oluşturmak için, <b>Hazır Yanıt Ekle</b>'yi tıklamanız yeterlidir. Ayrıca, Düzenle veya Sil düğmesini tıklayarak mevcut bir Hazır Yanıtı düzenleyebilir veya silebilirsiniz </p><p> Hazır yanıtlar, <b>Kısa Kodlar</b> yardımıyla kullanılır. Temsilciler, sohbet sırasında <b>'/'</b> ve ardından kısa kodu yazarak hazır yanıtlara erişebilir. </p>",
     "LIST": {
       "404": "Bu hesapta hazır yanıt yok.",
       "TITLE": "Hazır yanıtları yönetin",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Hazır Yanıt Ekle",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Hazır Yanıtlar, sohbete hızlı bir şekilde yanıt göndermek için kullanılabilen kaydedilmiş yanıt şablonlarıdır.",
       "CANCEL_BUTTON_TEXT": "İptal Et",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kısa kod",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "Lütfen bir kısa kod girin",
           "ERROR": "Kısa Kod gerekli"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index ace279ea7..16e380225 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Mesaj yok",
     "NO_CONTENT": "Kullanılabilir içerik yok",
     "HIDE_QUOTED_TEXT": "Alıntı Yapılan Mesajı Gizle",
-    "SHOW_QUOTED_TEXT": "Alıntı Yapılan Mesajı Göster"
+    "SHOW_QUOTED_TEXT": "Alıntı Yapılan Mesajı Göster",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
index 2db0c628a..6c5eab31d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Kişiler başarıyla kaydedildi",
     "ERROR_MESSAGE": "Bir hata oluştu, lütfen tekrar deneyin"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Silmeyi onayla",
+      "MESSAGE": "Bu notu silmek istediğinizden emin misiniz?",
+      "YES": "Evet, Sil",
+      "NO": "Hayır, kalsın"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Kişiyi Sil",
     "TITLE": "Kişiyi sil",
@@ -78,7 +86,7 @@
       "TITLE": "Silmeyi onayla",
       "MESSAGE": "Silmek istediğinize emin misiniz ?",
       "YES": "Evet, Sil",
-      "NO": "No, Keep"
+      "NO": "Hayır, Tut"
     },
     "API": {
       "SUCCESS_MESSAGE": "Kişi başarıyla silindi",
@@ -267,50 +275,50 @@
         "PLACEHOLDER": "Eg: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "Yeni öznitelik oluştur ",
         "SUCCESS": "Öznitelik başarıyla eklendi",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "ERROR": "Nitelik eklenemedi. Lütfen daha sonra tekrar deneyiniz"
       },
       "UPDATE": {
-        "SUCCESS": "Attribute updated successfully",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "SUCCESS": "Öznitelik başarıyla güncellendi",
+        "ERROR": "Nitelik güncellenemedi. Lütfen daha sonra tekrar deneyiniz"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Öznitelik başarıyla silindi",
+        "ERROR": "Nitelik silinemedi. Lütfen daha sonra tekrar deneyiniz"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Özellik ekle",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "PLACEHOLDER": "Öznitelik ara",
+        "NO_RESULT": "Nitelik bulunamadı"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Değer seçin",
+          "SEARCH_INPUT_PLACEHOLDER": "Değer arayın",
+          "NO_RESULT": "Sonuç bulunamadı"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Geçerli değer gereklidir",
+      "INVALID_URL": "Geçersiz 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.",
+    "TITLE": "Kişileri birleştir",
+    "DESCRIPTION": "Tüm nitelikler ve konuşmalar dahil olmak üzere iki profili tek bir profilde birleştirmek için kişileri birleştirin. Çakışma durumunda, Birincil ilgili kişinin nitelikleri öncelikli olacaktır.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "Birincil kişi",
+      "HELP_LABEL": "Saklanacak"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Birleştirilecek kişi",
+      "PLACEHOLDER": "Kişileri arayın",
+      "HELP_LABEL": "Silinecek"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
+      "TITLE": "Özet",
       "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>."
     },
@@ -318,12 +326,12 @@
       "ERROR": "ERROR_MESSAGE"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " Kişileri birleştir",
       "CANCEL": "İptal Et",
       "CHILD_CONTACT": {
         "ERROR": "Select a child contact to merge"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
+      "SUCCESS_MESSAGE": "Kişi başarıyla birleştirildi",
       "ERROR_MESSAGE": "Could not merge contacts, try again!"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/tr/contactFilters.json b/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
index 70b240a25..a3168db49 100644
--- a/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/tr/contactFilters.json
@@ -1,48 +1,48 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "Kişileri Filtrele",
+        "SUBTITLE": "Filtreleri aşağıya ekleyin ve kişileri filtrelemek için 'Gönder' butonuna basın.",
+        "ADD_NEW_FILTER": "Filtre Ekle",
+        "CLEAR_ALL_FILTERS": "Filtreleri Temizle",
+        "FILTER_DELETE_ERROR": "Kaydetmek için en az bir filtre ekleyin",
         "SUBMIT_BUTTON_LABEL": "Yolla",
         "CANCEL_BUTTON_LABEL": "İptal Et",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "Filtreleri Temizle",
+        "EMPTY_VALUE_ERROR": "Değer gereklidir",
+        "TOOLTIP_LABEL": "Kişileri filtrele",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "VE",
+            "OR": "YA DA"
         },
         "OPERATOR_LABELS": {
-            "equal_to": "Equal to",
-            "not_equal_to": "Not equal to",
-            "contains": "Contains",
-            "does_not_contain": "Does not contain",
-            "is_present": "Is present",
-            "is_not_present": "Is not present",
-            "is_greater_than": "Is greater than",
-            "is_lesser_than": "Is lesser than",
+            "equal_to": "Eşit",
+            "not_equal_to": "Eşit değil",
+            "contains": "İçerir",
+            "does_not_contain": "İçermez",
+            "is_present": "Şu an",
+            "is_not_present": "Şu an değil",
+            "is_greater_than": "Şundan büyük",
+            "is_lesser_than": "Şundan az",
             "days_before": "x gün önce"
         },
         "ATTRIBUTES": {
             "NAME": "İsim",
             "EMAIL": "E-Posta",
             "PHONE_NUMBER": "Telefon numarası",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "Doğrulayıcı",
             "CITY": "Şehir",
             "COUNTRY": "Ülke",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
-            "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
+            "CUSTOM_ATTRIBUTE_LIST": "Liste",
+            "CUSTOM_ATTRIBUTE_TEXT": "Yazı",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Sayı",
+            "CUSTOM_ATTRIBUTE_LINK": "Bağlantı",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Onay Kutusu",
             "CREATED_AT": "Oluşturma",
             "LAST_ACTIVITY": "Son aktivite"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Standart Filtreler",
+            "ADDITIONAL_FILTERS": "Gelişmiş Filtreler",
             "CUSTOM_ATTRIBUTES": "Özel Nitelikler"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index ec9d9774d..7d9120f8d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -10,7 +10,7 @@
     "SEARCH_MESSAGES": "Sohbetlerde ara",
     "SEARCH": {
       "TITLE": "Mesajları ara",
-      "RESULT_TITLE": "Search Results",
+      "RESULT_TITLE": "Arama Sonucu",
       "LOADING_MESSAGE": "Veriler işleniyor ...",
       "PLACEHOLDER": "Mesajları aramak için herhangi bir metin yazın",
       "NO_MATCHING_RESULTS": "Sonuç bulunamadı."
@@ -22,17 +22,17 @@
     "LOADING_CONVERSATIONS": "Loading Conversations\n",
     "CANNOT_REPLY": "Nedeniyle cevap veremezsiniz",
     "24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
+    "NOT_ASSIGNED_TO_YOU": "Bu görüşme size atanmamış. Bu konuşmayı kendinize atamak ister misiniz?",
+    "ASSIGN_TO_ME": "Bana ata",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 saat mesaj penceresi kısıtlaması",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "SELECT_A_TWEET_TO_REPLY": "Lütfen yanıtlamak için bir tweet seçin.",
     "REPLYING_TO": "Cevap veriyorsun:",
     "REMOVE_SELECTION": "Seçimi Kaldır",
     "DOWNLOAD": "İndir",
     "UPLOADING_ATTACHMENTS": "Dosyalar gönderiliyor...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "SUCCESS_DELETE_MESSAGE": "Mesaj başarıyla silindi",
+    "FAIL_DELETE_MESSSAGE": "Mesaj silinemiyor. Tekrar deneyin",
     "NO_RESPONSE": "Cevap Yok",
     "RATING_TITLE": "Rating",
     "FEEDBACK_TITLE": "Feedback",
@@ -53,17 +53,17 @@
         "TITLE": "Snooze until",
         "NEXT_REPLY": "Next reply",
         "TOMORROW": "Tomorrow",
-        "NEXT_WEEK": "Next week"
+        "NEXT_WEEK": "Sonraki hafta"
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "İmzanız",
+      "ENABLE_SIGN_TOOLTIP": "İmzayı aktif et",
+      "DISABLE_SIGN_TOOLTIP": "İmzayı pasif et",
       "MSG_INPUT": "Yeni satır için Shift + enter. Bir Hazır Yanıt seçmek için \"/\" ile başlayın.",
       "PRIVATE_MSG_INPUT": "Yeni satır için Shift + enter. Bu yalnızca Temsilciler tarafından görülebilir",
       "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "CLICK_HERE": "Güncellemek için tıklayın"
     },
     "REPLYBOX": {
       "REPLY": "Cevapla",
@@ -78,21 +78,21 @@
       "TIP_AUDIORECORDER_PERMISSION": "Mikrofon erişimine izin ver",
       "TIP_AUDIORECORDER_ERROR": "Mikrofon açılamadı",
       "ENTER_TO_SEND": "Göndermek için Enter tuşuna basın",
-      "DRAG_DROP": "Drag and drop here to attach",
+      "DRAG_DROP": "Eklemek için buraya sürükleyip bırakın",
       "START_AUDIO_RECORDING": "Ses kaydetmeye başla",
       "STOP_AUDIO_RECORDING": "Ses kaydetmeyi durdur",
       "": "",
       "EMAIL_HEAD": {
-        "ADD_BCC": "Add bcc",
+        "ADD_BCC": "Bcc ekle",
         "CC": {
           "LABEL": "CC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "Virgülle ayrılmış e-postalar",
+          "ERROR": "Lütfen geçerli bir e-posta adresi girin"
         },
         "BCC": {
           "LABEL": "BCC",
-          "PLACEHOLDER": "Emails separated by commas",
-          "ERROR": "Please enter valid email addresses"
+          "PLACEHOLDER": "Virgülle ayrılmış e-postalar",
+          "ERROR": "Lütfen geçerli bir e-posta adresi girin"
         }
       }
     },
@@ -176,22 +176,22 @@
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
     "ADD_BUTTON_TEXT": "Create attribute",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Öznitelik başarıyla güncellendi",
+      "ERROR": "Nitelik güncellenemedi. Lütfen daha sonra tekrar deneyiniz"
     },
     "ADD": {
       "TITLE": "Ekle",
       "SUCCESS": "Öznitelik başarıyla eklendi",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "ERROR": "Nitelik eklenemedi. Lütfen daha sonra tekrar deneyiniz"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Öznitelik başarıyla silindi",
+      "ERROR": "Nitelik silinemedi. Lütfen daha sonra tekrar deneyiniz"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "Özellik ekle",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "PLACEHOLDER": "Öznitelik ara",
+      "NO_RESULT": "Nitelik bulunamadı"
     }
   },
   "EMAIL_HEADER": {
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
index a4f240542..2ea4c950d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Bildirimler",
     "MARK_ALL_DONE": "Hepsini tamamlandı işaretle",
+    "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": "Bildirimler yükleniyor...",
       "404": "Bildirim yok",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index a50b3a878..658ef6eae 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Özellikleri",
       "DISPLAY_FILE_PICKER": "Widget'ta dosya seçiciyi görüntüle",
-      "DISPLAY_EMOJI_PICKER": "Widget'ta emoji seçiciyi görüntüleyin"
+      "DISPLAY_EMOJI_PICKER": "Widget'ta emoji seçiciyi görüntüleyin",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Komut Dosyası",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "SET_FIELDS": "Sohbet giriş formu alanları",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Alanlar",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Anahtar",
+        "TYPE": "Tip",
+        "REQUIRED": "Zorunlu"
+      },
       "ENABLE": {
         "LABEL": "Görüşme öncesi formu aktif et",
         "OPTIONS": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-Posta",
-        "PLACE_HOLDER": "E-Posta"
+      "LOGIN": {
+        "LABEL": "Oturum aç",
+        "PLACE_HOLDER": "Oturum aç"
       },
       "PASSWORD": {
         "LABEL": "Parola",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "E-Posta",
-        "PLACE_HOLDER": "E-Posta"
+      "LOGIN": {
+        "LABEL": "Oturum aç",
+        "PLACE_HOLDER": "Oturum aç"
       },
       "PASSWORD": {
         "LABEL": "Parola",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
index dbbd8a6cb..93946982d 100644
--- a/app/javascript/dashboard/i18n/locale/tr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Entegrasyonlar",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "İptal Et",
+        "DESC": "Web kancası etkinlikleri size Chatwoot hesabınızda neler olduğu hakkında gerçek zamanlı bilgi sağlar. Bir geri aramayı yapılandırmak için lütfen geçerli bir URL girin.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Web kancası URL'si",
+          "PLACEHOLDER": "Örnek: https://siteadi/api/webkancasi",
+          "ERROR": "Lütfen geçerli bir adres girin"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Web kancası oluştur"
+      },
       "TITLE": "Web kancası",
       "CONFIGURE": "Yapılandır",
       "HEADER": "Web kancası ayarları",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Düzenle",
         "TITLE": "Edit webhook",
-        "CANCEL": "İptal Et",
-        "DESC": "Web kancası etkinlikleri size Chatwoot hesabınızda neler olduğu hakkında gerçek zamanlı bilgi sağlar. Bir geri aramayı yapılandırmak için lütfen geçerli bir URL girin.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Web kancası URL'si",
-            "PLACEHOLDER": "Örnek: https://siteadi/api/webkancasi",
-            "ERROR": "Lütfen geçerli bir adres girin"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
         }
       },
       "ADD": {
         "CANCEL": "İptal Et",
         "TITLE": "Yeni web kancası ekle",
-        "DESC": "Web kancası etkinlikleri size Chatwoot hesabınızda neler olduğu hakkında gerçek zamanlı bilgi sağlar. Bir geri aramayı yapılandırmak için lütfen geçerli bir URL girin.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Web kancası URL'si",
-            "PLACEHOLDER": "Örnek: https://siteadi/api/webkancasi",
-            "ERROR": "Lütfen geçerli bir adres girin"
-          },
-          "SUBMIT": "Web kancası oluştur"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Web kancası başarıyla eklendi",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Silmeyi onayla",
-          "MESSAGE": "Silmek istediğinize emin misiniz ?",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Evet, Sil ",
           "NO": "Hayır, kalsın"
         }
diff --git a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
index d730141c5..86b99abca 100644
--- a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
@@ -19,9 +19,9 @@
       "NAME": {
         "LABEL": "Etiket adı",
         "PLACEHOLDER": "Etiket adı",
-        "REQUIRED_ERROR": "Label name is required",
-        "MINIMUM_LENGTH_ERROR": "Minimum length 2 is required",
-        "VALID_ERROR": "Only Alphabets, Numbers, Hyphen and Underscore are allowed"
+        "REQUIRED_ERROR": "Etiket ismi gereklidir",
+        "MINIMUM_LENGTH_ERROR": "En az 2 karakter gereklidir",
+        "VALID_ERROR": "Sadece yazılar, numaralar, tire işareti ve alt çizgi kullanabilirsiniz"
       },
       "DESCRIPTION": {
         "LABEL": "Açıklama",
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index 448f22a45..d57d444e4 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "Konuşmalar",
     "LOADING_CHART": "Grafik verileri yükleniyor...",
     "NO_ENOUGH_DATA": "Rapor oluşturmak için yeterli veri yok, Lütfen daha sonra tekrar deneyin.",
     "DOWNLOAD_AGENT_REPORTS": "Etken raporları indir",
@@ -18,12 +18,16 @@
         "DESC": "( Toplam )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "İlk yanıt süresi",
-        "DESC": "(Ort.)"
+        "NAME": "İlk Cevap Süresi",
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Çözüm Süresi",
-        "DESC": "(Ort.)"
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Çözünürlük Sayısı",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -130,12 +135,16 @@
         "DESC": "( Toplam )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "İlk yanıt süresi",
-        "DESC": "(Ort.)"
+        "NAME": "İlk Cevap Süresi",
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Çözüm Süresi",
-        "DESC": "(Ort.)"
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Çözünürlük Sayısı",
@@ -193,12 +202,16 @@
         "DESC": "( Toplam )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "İlk yanıt süresi",
-        "DESC": "(Ort.)"
+        "NAME": "İlk Cevap Süresi",
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Çözüm Süresi",
-        "DESC": "(Ort.)"
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Çözünürlük Sayısı",
@@ -256,12 +269,16 @@
         "DESC": "( Toplam )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "İlk yanıt süresi",
-        "DESC": "(Ort.)"
+        "NAME": "İlk Cevap Süresi",
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Çözüm Süresi",
-        "DESC": "(Ort.)"
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Çözünürlük Sayısı",
@@ -319,12 +336,16 @@
         "DESC": "( Toplam )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "İlk yanıt süresi",
-        "DESC": "(Ort.)"
+        "NAME": "İlk Cevap Süresi",
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Çözüm Süresi",
-        "DESC": "(Ort.)"
+        "DESC": "(Ort.)",
+        "INFO_TEXT": "Hesaplama için kullanılan toplam görüşme sayısı:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Çözünürlük Sayısı",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Önizleme",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Görüşme metrikleri yükleniyor...",
+      "OPEN": "Açık",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Atanmamış"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Temsilci metrikleri yükleniyor...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Kullanıcı",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Durum"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Çevirimiçi",
+      "BUSY": "Meşgul",
+      "OFFLINE": "Çevirimdışı"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
index 0dde2fd90..2b3c54a12 100644
--- a/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Parola başarıyla değiştirildi",
       "ERROR_MESSAGE": "Woot Sunucusuna bağlanılamadı, Lütfen daha sonra tekrar deneyin"
     },
+    "CAPTCHA": {
+      "ERROR": "Doğrulama süresi sona erdi. Lütfen captchayı tekrar çözünüz."
+    },
     "SUBMIT": "Yolla"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index 496d7e6a2..bddab7492 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Kopyala",
       "COPY_SUCCESSFUL": "Kod panoya başarıyla kopyalandı"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "İndir",
       "UPLOADING": "Yükleniyor ..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Şu an görüntülüyor:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Konuşmalar",
     "ALL_CONVERSATIONS": "Tüm Görüşmeler",
     "MENTIONED_CONVERSATIONS": "Bahsedilmeler",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Yeni etiket",
     "NEW_TEAM": "Yeni ekip",
     "NEW_INBOX": "Yeni mesaj kutusu",
-    "REPORTS_OVERVIEW": "Önizleme",
+    "REPORTS_CONVERSATION": "Konuşmalar",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Kampanyalar",
     "ONGOING": "Giden",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Gelen kutusu",
     "REPORTS_TEAM": "Ekip",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Önizleme"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/signup.json b/app/javascript/dashboard/i18n/locale/tr/signup.json
index 497b62d92..a584dfd04 100644
--- a/app/javascript/dashboard/i18n/locale/tr/signup.json
+++ b/app/javascript/dashboard/i18n/locale/tr/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Parola",
       "PLACEHOLDER": "Parola",
-      "ERROR": "Parola çok kısa"
+      "ERROR": "Parola çok kısa",
+      "IS_INVALID_PASSWORD": "Şifre en az 1 büyük harf, 1 küçük harf, 1 rakam ve 1 özel karakter içermelidir"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Parolayı Onayla",
diff --git a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
index ffa1eb7ff..e9a7694d4 100644
--- a/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/advancedFilters.json
@@ -1,91 +1,91 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "Фільтрувати Діалоги",
+    "SUBTITLE": "Додайте фільтри та натисніть \"Застосувати фільтри\" для фільтрації діалогів.",
+    "ADD_NEW_FILTER": "Додати фільтр",
+    "FILTER_DELETE_ERROR": "Ви повинні мати хоча б один фільтр для збереження",
+    "SUBMIT_BUTTON_LABEL": "Застосувати фільтри",
     "CANCEL_BUTTON_LABEL": "Скасувати",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "Скинути фільтри",
+    "EMPTY_VALUE_ERROR": "Необхідно вказати значення",
+    "TOOLTIP_LABEL": "Фільтрувати діалоги",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "ТА",
+      "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"
+      "equal_to": "Дорівнює",
+      "not_equal_to": "Не дорівнює",
+      "contains": "Містить",
+      "does_not_contain": "Не містить",
+      "is_present": "Є",
+      "is_not_present": "Немає",
+      "is_greater_than": "Більше ніж",
+      "is_less_than": "Менше ніж",
+      "days_before": "X днів до"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "Так",
+      "FALSE": "Ні"
     },
     "ATTRIBUTES": {
       "STATUS": "Статус",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "Ім'я виконавця",
       "INBOX_NAME": "Назва каналу",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Назва Команди",
+      "CONVERSATION_IDENTIFIER": "Номер діалогу",
+      "CAMPAIGN_NAME": "Назва Кампанії",
       "LABELS": "Мітки",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
-      "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
+      "BROWSER_LANGUAGE": "Мова браузера",
+      "COUNTRY_NAME": "Назва країни",
+      "REFERER_LINK": "Посилання",
+      "CUSTOM_ATTRIBUTE_LIST": "Список",
+      "CUSTOM_ATTRIBUTE_TEXT": "Текст",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Номер",
+      "CUSTOM_ATTRIBUTE_LINK": "Лінк",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "Прапорець",
+      "CREATED_AT": "Створений в",
       "LAST_ACTIVITY": "Остання активність"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Стандартні фільтри",
+      "ADDITIONAL_FILTERS": "Додаткові фільтри",
       "CUSTOM_ATTRIBUTES": "Свої атрибути"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
+        "TITLE": "Зберегти цей фільтр?",
+        "LABEL": "Назвіть цей фільтр",
+        "PLACEHOLDER": "Введіть назву цього фільтру",
         "ERROR_MESSAGE": "Назва обов'язкова",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "Зберегти фільтр",
         "CANCEL_BUTTON": "Скасувати",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "Папка успішно створена",
+          "ERROR_MESSAGE": "Помилка при створенні папки"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Сегмент успішно створено",
+          "ERROR_MESSAGE": "Помилка при створенні сегменту"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "Видалити фільтр",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "Підтвердження видалення",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "Ви впевнені, що хочете видалити фільтр ",
             "YES": "Так, видалити",
             "NO": "Ні, залиште"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Папка успішно видалена",
+          "ERROR_MESSAGE": "Помилка під час видалення папки"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Сегмент успішно видалено",
+          "ERROR_MESSAGE": "Помилка при видаленні сегменту"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
index 50d798150..47badb632 100644
--- a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Агенти",
     "HEADER_BTN_TXT": "Додати агента",
     "LOADING": "Отримання списку агентів",
-    "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>",
+    "SIDEBAR_TXT": "<p><b>Агенти</b></p> <p> <b>Агент</b> є членом вашої служби підтримки клієнтів. </p><p> Агенти зможуть переглядати повідомлення ваших користувачів і відповідати на них. У списку відображаються всі агенти, які зараз є у вашому обліковому записі. </p><p> Натисніть <b>Додати агента</b>, щоб додати нового агента. Агент, якого ви додаєте, отримає електронний лист із посиланням для підтвердження та активації свого облікового запису, після чого він зможе отримати доступ до Chatwoot і відповідати на повідомлення. </p><p> Доступ до функцій Chatwoot заснований на наступних ролях. </p><p> <b>Агент</b> - Агенти з цією роллю мають доступ лише до папок \"Вхідні\", звітів і розмов. Вони можуть призначати розмови іншим агентам або собі та завершувати розмови.</p><p> <b>Адміністратор</b> - адміністратор матиме доступ до всіх функцій Chatwoot, увімкнених для вашого облікового запису, включаючи налаштування, а також усі звичайні привілеї агентів.</p>",
     "AGENT_TYPES": {
       "ADMINISTRATOR": "Адміністратор",
       "AGENT": "Агент"
@@ -55,7 +55,7 @@
         "TITLE": "Підтвердження видалення",
         "MESSAGE": "Справді бажаєте видалити ",
         "YES": "Так, видалити ",
-        "NO": "No, Keep "
+        "NO": "Ні, залишити "
       }
     },
     "EDIT": {
@@ -90,12 +90,12 @@
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No results found."
+      "NO_RESULTS": "Результатів не знайдено."
     },
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Нiчого",
       "TITLE": {
-        "AGENT": "Select agent",
+        "AGENT": "Виберіть агента",
         "TEAM": "Виберіть команду"
       },
       "SEARCH": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
index 4841f29cc..2ee9c79a6 100644
--- a/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/attributesMgmt.json
@@ -1,22 +1,22 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "Свої атрибути",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
-    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "HEADER_BTN_TXT": "Додати свій атрибут",
+    "LOADING": "Отримання користувацьких атрибутів",
+    "SIDEBAR_TXT": "<p><b>Користувацькі Атрибути</b> <p>Користувацький атрибут відстежує факти про ваших контактів/розмову — наприклад, план підписки або коли вони замовили перший товар і т. д. <br /><br />Для створення Користувацького атрибуту, просто натисніть на <b>Додати Користувацький атрибут.</b> Ви також можете редагувати або видаляти існуючі користувацькі атрибути, натиснувши на кнопку Редагувати або Видалити.</p>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "Додати свій атрибут",
       "SUBMIT": "Створити",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "FORM": {
         "NAME": {
           "LABEL": "Ім'я для відображення",
-          "PLACEHOLDER": "Enter custom attribute display name",
+          "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",
-            "ERROR": "Must have at least one value"
+            "LABEL": "Список значень",
+            "PLACEHOLDER": "Будь ласка, введіть значення і натисніть клавішу Enter",
+            "ERROR": "Має мати принаймні одне значення"
           }
         },
         "KEY": {
           "LABEL": "Ключ",
-          "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "PLACEHOLDER": "Введіть ключ користувацького атрибуту",
+          "ERROR": "Потрібен ключ",
+          "IN_VALID": "Невірний ключ"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "SUCCESS_MESSAGE": "Користувацький атрибут успішно додано",
+        "ERROR_MESSAGE": "Не вдалося створити користувацький атрибут, будь ласка спробуйте пізніше"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "Користувацький атрибут успішно видалено.",
+        "ERROR_MESSAGE": "Не вдалося видалити користувацький атрибут. Повторіть спробу."
       },
       "CONFIRM": {
         "TITLE": "Ви дійсно бажаєте видалити - %{attributeName}",
         "PLACE_HOLDER": "Будь ласка, введіть {attributeName} щоб підтвердити",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "MESSAGE": "Ця дія видалить користувацький атрибут",
         "YES": "Видалити ",
         "NO": "Скасувати"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Custom Attribute",
+      "TITLE": "Редагувати користувацький атрибут",
       "UPDATE_BUTTON_TEXT": "Оновити",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "LABEL": "Список значень",
+          "PLACEHOLDER": "Будь ласка, введіть значення і натисніть клавішу Enter"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "Користувацький атрибут успішно оновлено",
+        "ERROR_MESSAGE": "Виникла помилка при оновленні користувацького атрибуту, будь ласка, спробуйте ще раз"
       }
     },
     "TABS": {
@@ -91,8 +91,8 @@
         "DELETE": "Видалити"
       },
       "EMPTY_RESULT": {
-        "404": "There are no custom attributes created",
-        "NOT_FOUND": "There are no custom attributes configured"
+        "404": "Не створено жодного користувацького атрибуту",
+        "NOT_FOUND": "Немає налаштованих власних атрибутів"
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/automation.json b/app/javascript/dashboard/i18n/locale/uk/automation.json
index 8f0698c4d..8eefb6202 100644
--- a/app/javascript/dashboard/i18n/locale/uk/automation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/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,25 +83,34 @@
       "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"
+      "DELETE_MESSAGE": "Ви повинні мати принаймні одну умову для збереження"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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": "Не вдалося завантажити вкладення, будь ласка, спробуйте ще раз",
+      "LABEL_IDLE": "Завантажити вкладення",
+      "LABEL_UPLOADING": "Завантажується...",
+      "LABEL_UPLOADED": "Успішно завантажено",
+      "LABEL_UPLOAD_FAILED": "Не вдалося завантажити"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/campaign.json b/app/javascript/dashboard/i18n/locale/uk/campaign.json
index b45715778..97b10545d 100644
--- a/app/javascript/dashboard/i18n/locale/uk/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/uk/campaign.json
@@ -1,31 +1,31 @@
 {
   "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": "Розсилки",
+    "SIDEBAR_TXT": "Проактивні повідомлення дозволяють клієнту надсилати вихідні повідомлення своїм контактам, що призведе до більшої кількості розмов. Натисніть <b>Додати розсилку</b> для створення нової розсилки. Ви також можете редагувати або видаляти існуючу розсилку, натиснувши кнопку Редагувати або Видалити.",
     "HEADER_BTN_TXT": {
-      "ONE_OFF": "Create a one off campaign",
-      "ONGOING": "Create a ongoing campaign"
+      "ONE_OFF": "Створіть одноразову розсилку",
+      "ONGOING": "Створіть постійну розсилку"
     },
     "ADD": {
-      "TITLE": "Create a campaign",
-      "DESC": "Proactive messages allow the customer to send outbound messages to their contacts which would trigger more conversations.",
+      "TITLE": "Створити кампанію",
+      "DESC": "Проактивні повідомлення дозволяють клієнту надсилати вихідні повідомлення своїм контактам, що призведе до більшої кількості розмов.",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "CREATE_BUTTON_TEXT": "Створити",
       "FORM": {
         "TITLE": {
-          "LABEL": "Title",
-          "PLACEHOLDER": "Please enter the title of campaign",
-          "ERROR": "Title is required"
+          "LABEL": "Назва",
+          "PLACEHOLDER": "Будь ласка, введіть назву кампанії",
+          "ERROR": "Необхідно вказати назву"
         },
         "SCHEDULED_AT": {
-          "LABEL": "Scheduled time",
-          "PLACEHOLDER": "Please select the time",
-          "CONFIRM": "Confirm",
-          "ERROR": "Scheduled time is required"
+          "LABEL": "Запланований час",
+          "PLACEHOLDER": "Будь ласка, виберіть час",
+          "CONFIRM": "Підтвердити",
+          "ERROR": "Запланований час обов'язковий"
         },
         "AUDIENCE": {
-          "LABEL": "Audience",
-          "PLACEHOLDER": "Select the customer labels",
+          "LABEL": "Аудиторія",
+          "PLACEHOLDER": "Оберіть мітки клієнта",
           "ERROR": "Потрібна аудиторія"
         },
         "INBOX": {
@@ -84,8 +84,8 @@
       }
     },
     "LIST": {
-      "LOADING_MESSAGE": "Завантаження кампаній...",
-      "404": "Не створено жодної кампанії, створені для цього каналу.",
+      "LOADING_MESSAGE": "Завантаження розсилки...",
+      "404": "Не створено жодної розсилки, для цього джерела.",
       "TABLE_HEADER": {
         "TITLE": "Назва",
         "MESSAGE": "Текст повідомлення",
@@ -113,13 +113,13 @@
       }
     },
     "ONE_OFF": {
-      "HEADER": "Одна з попередніх кампаній",
-      "404": "Жодної кампанії не створено",
+      "HEADER": "Одноразова розсилка",
+      "404": "Жодної розсилки не створено",
       "INBOXES_NOT_FOUND": "Створіть канал для відправки SMS та почніть додавати розсилки"
     },
     "ONGOING": {
-      "HEADER": "Поточні кампанії",
-      "404": "Жодної постійної кампанії не створено",
+      "HEADER": "Поточні розсилки",
+      "404": "Жодної постійної розсилки не створено",
       "INBOXES_NOT_FOUND": "Будь ласка створіть канал та почніть додавати розсилку"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
index b45c565f9..295594e5b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
@@ -4,7 +4,7 @@
     "HEADER_BTN_TXT": "Додати швидку відповідь",
     "LOADING": "Отримання швидких відповідей",
     "SEARCH_404": "Немає елементів, що відповідають запиту",
-    "SIDEBAR_TXT": "<p><b>Canned Responses</b> </p><p> Canned Responses are saved reply templates which can be used to quickly send out a reply to a conversation. </p><p> For creating a Canned Response, just click on the <b>Add Canned Response</b>. You can also edit or delete an existing Canned Response by clicking on the Edit or Delete button </p><p> Canned responses are used with the help of <b>Short Codes</b>. Agents can access canned responses while on a chat by typing <b>'/'</b> followed by the short code. </p>",
+    "SIDEBAR_TXT": "<p><b>Швидкі відповіді</b> </p><p> Швидкі відповіді - це збережені шаблони відповідей, які можуть бути використані для швидкого надсилання відповіді на розмову. </p><p> Для створення швидкої відповіді, просто натисніть на <b>Додати Швидку відповідь</b>. Ви також можете редагувати або видаляти існуючу Швидку відповідь, натиснувши на кнопку Редагувати або Видалити </p><p> Швидкі відповіді використовуються за допомогою <b>короткий код</b>. Агенти можуть отримувати доступ до кодів під час чату, ввівши <b>'/'</b> з коротким кодом. </p>",
     "LIST": {
       "404": "В цьому обліковому записі немає швидких відповідей.",
       "TITLE": "Керування швидкими вдіповідями",
@@ -17,12 +17,12 @@
     },
     "ADD": {
       "TITLE": "Додати швидку відповідь",
-      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation.",
+      "DESC": "Швидкі відповіді - це шаблони відповідей на які їх можна швидко надіслати у діалог.",
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Короткий код",
-          "PLACEHOLDER": "Please enter a short code",
+          "PLACEHOLDER": "Будь ласка, введіть короткий код",
           "ERROR": "Необхідно вказати короткий код"
         },
         "CONTENT": {
diff --git a/app/javascript/dashboard/i18n/locale/uk/chatlist.json b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
index b8249ea1e..5cda7a47e 100644
--- a/app/javascript/dashboard/i18n/locale/uk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
@@ -7,7 +7,7 @@
       "404": "В цій групі немає активних бесід."
     },
     "TAB_HEADING": "Бесіди",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Згадування",
     "SEARCH": {
       "INPUT": "Пошук людей, чатів та збережених відповідей.."
     },
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "Отримано електронною поштою",
     "VIEW_TWEET_IN_TWITTER": "Переглянути твіт у Twitter",
     "REPLY_TO_TWEET": "Відповісти на цей твіт",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Перейти до історії Instagram",
     "SENT": "Успішно надіслано",
     "NO_MESSAGES": "Немає повідомлень",
     "NO_CONTENT": "Немає вмісту",
     "HIDE_QUOTED_TEXT": "Приховати цитований текст",
-    "SHOW_QUOTED_TEXT": "Показати цитований текст"
+    "SHOW_QUOTED_TEXT": "Показати цитований текст",
+    "MESSAGE_READ": "Прочитано"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index daa9318e2..39a4fa96f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -59,21 +59,29 @@
   },
   "IMPORT_CONTACTS": {
     "BUTTON_LABEL": "Імпорт",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "TITLE": "Імпорт контактів",
+    "DESC": "Імпортувати контакти через файл CSV.",
+    "DOWNLOAD_LABEL": "Завантажити зразок csv.",
     "FORM": {
-      "LABEL": "CSV File",
+      "LABEL": "Файл CSV",
       "SUBMIT": "Імпорт",
       "CANCEL": "Скасувати"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "SUCCESS_MESSAGE": "Контакт успішно збережено",
     "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Підтвердження видалення",
+      "MESSAGE": "Ви дійсно бажаєте видалити цю нотатку?",
+      "YES": "Так, видалити ",
+      "NO": "Ні, залиште"
+    }
+  },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "Видалити контакт",
+    "TITLE": "Видалити контакт",
+    "DESC": "Видалити деталі контакту",
     "CONFIRM": {
       "TITLE": "Підтвердження видалення",
       "MESSAGE": "Справді бажаєте видалити ",
@@ -81,8 +89,8 @@
       "NO": "Ні, залишити"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "Кампанію успішно видалено",
+      "ERROR_MESSAGE": "Не вдалося видалити контакт. Будь ласка, спробуйте ще раз пізніше."
     }
   },
   "CONTACT_FORM": {
@@ -90,70 +98,70 @@
       "SUBMIT": "Додати",
       "CANCEL": "Скасувати",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "Аватар Контакту"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
+        "PLACEHOLDER": "Введіть повне ім'я контакту",
         "LABEL": "Повне ім`я"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "Введіть опис контакту",
+        "LABEL": "Опис"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
+        "PLACEHOLDER": "Введіть адресу електронної пошти контакту",
         "LABEL": "Адреса електронної пошти",
-        "DUPLICATE": "This email address is in use for another contact."
+        "DUPLICATE": "Ця електронна адреса вже використовується для іншого контакту."
       },
       "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."
+        "PLACEHOLDER": "Введіть номер телефону контакту",
+        "LABEL": "Номер телефону",
+        "HELP": "Номер телефону має бути в форматі E.164; наприклад: +1415555555 [+][код країни][код міста][локальний номер телефону]",
+        "ERROR": "Номер телефону повинен бути пустим, або у форматі E.164",
+        "DUPLICATE": "Цей номер телефону використовується для іншого контакту."
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
+        "PLACEHOLDER": "Введіть місце розташування контакту",
         "LABEL": "Місцезнаходження"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "Введіть назву компанії",
+        "LABEL": "Назва компанії"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
+          "PLACEHOLDER": "Введіть ім'я користувача Facebook",
           "LABEL": "Facebook"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
+          "PLACEHOLDER": "Введіть ім'я користувача Twitter",
           "LABEL": "Twitter"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
+          "PLACEHOLDER": "Введіть ім'я користувача LinkedIn",
           "LABEL": "LinkedIn"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
+          "PLACEHOLDER": "Введіть ім'я користувача Github",
           "LABEL": "Github"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "SUCCESS_MESSAGE": "Контакт успішно збережено",
     "ERROR_MESSAGE": "Сталася помилка, будь ласка, спробуйте ще раз"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
-    "TITLE": "New conversation",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "BUTTON_LABEL": "Розпочати розмову",
+    "TITLE": "Новий діалог",
+    "DESC": "Розпочніть нову бесіду, надіславши нове повідомлення.",
+    "NO_INBOX": "Не вдалося знайти поштову скриньку, щоб розпочати нову розмову з цим контактом.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "Для"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "Вхідні",
+        "ERROR": "Оберіть канал"
       },
       "SUBJECT": {
         "LABEL": "Тема",
@@ -177,9 +185,9 @@
     "FIELDS": "Поля контактів",
     "SEARCH_BUTTON": "Пошук",
     "SEARCH_INPUT_PLACEHOLDER": "Пошук контактів",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS": "Фільтр",
+    "FILTER_CONTACTS_SAVE": "Зберегти фільтр",
+    "FILTER_CONTACTS_DELETE": "Видалити фільтр",
     "LIST": {
       "LOADING_MESSAGE": "Завантаження контактів...",
       "404": "Немає контактів, які відповідають вашому пошуку 🔍",
@@ -264,67 +272,67 @@
       },
       "VALUE": {
         "LABEL": "Значення атрибуту",
-        "PLACEHOLDER": "Eg: 11901 "
+        "PLACEHOLDER": "Наприклад: 11901 "
       },
       "ADD": {
-        "TITLE": "Create new attribute ",
+        "TITLE": "Створити новий атрибут ",
         "SUCCESS": "Атрибут додано успішно",
-        "ERROR": "Unable to add attribute. Please try again later"
+        "ERROR": "Неможливо додати атрибут. Будь ласка, спробуйте ще раз пізніше"
       },
       "UPDATE": {
         "SUCCESS": "Атрибут успішно оновлено",
-        "ERROR": "Unable to update attribute. Please try again later"
+        "ERROR": "Не вдалося оновити атрибут. Будь ласка, спробуйте ще раз пізніше"
       },
       "DELETE": {
-        "SUCCESS": "Attribute deleted successfully",
-        "ERROR": "Unable to delete attribute. Please try again later"
+        "SUCCESS": "Атрибут успішно видалено",
+        "ERROR": "Неможливо видалити атрибут. Будь ласка, спробуйте ще раз пізніше"
       },
       "ATTRIBUTE_SELECT": {
         "TITLE": "Додати атрибут",
-        "PLACEHOLDER": "Search attributes",
-        "NO_RESULT": "No attributes found"
+        "PLACEHOLDER": "Атрибути пошуку",
+        "NO_RESULT": "Атрибути не знайдено"
       },
       "ATTRIBUTE_TYPE": {
         "LIST": {
-          "PLACEHOLDER": "Select value",
-          "SEARCH_INPUT_PLACEHOLDER": "Search value",
-          "NO_RESULT": "No result found"
+          "PLACEHOLDER": "Виберіть значення",
+          "SEARCH_INPUT_PLACEHOLDER": "Значення запиту",
+          "NO_RESULT": "Результатів немає"
         }
       }
     },
     "VALIDATIONS": {
-      "REQUIRED": "Valid value is required",
-      "INVALID_URL": "Invalid URL"
+      "REQUIRED": "Потрібне коректне значення",
+      "INVALID_URL": "Недопустимий URL"
     }
   },
   "MERGE_CONTACTS": {
-    "TITLE": "Merge contacts",
-    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "TITLE": "Об'єднати контакти",
+    "DESCRIPTION": "Об'єднати контакти, щоб об'єднати два профілі в один, включаючи всі атрибути та розмови. У разі конфлікту, атрибути первинних контактів будуть переважати.",
     "PRIMARY": {
-      "TITLE": "Primary contact",
-      "HELP_LABEL": "To be kept"
+      "TITLE": "Основний контакт",
+      "HELP_LABEL": "Утримуватися"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "Контакт для об'єднання",
+      "PLACEHOLDER": "Пошук контакту",
+      "HELP_LABEL": "Буде видалено"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "TITLE": "Коротка інформація",
+      "DELETE_WARNING": "Контакт <strong>%{childContactName}</strong> буде видалено.",
+      "ATTRIBUTE_WARNING": "Контактні дані <strong>%{childContactName}</strong> буде скопійовано до <strong>%{primaryContactName}</strong>."
     },
     "SEARCH": {
       "ERROR": "ERROR_MESSAGE"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
+      "SUBMIT": " Об'єднати контакти",
       "CANCEL": "Скасувати",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "Виберіть дочірній контакт для об'єднання"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "Контакт успішно об'єднано",
+      "ERROR_MESSAGE": "Не вдалося об'єднати контакти, спробуйте ще раз!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
index 3ee11de7a..2c14a5bd3 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contactFilters.json
@@ -1,48 +1,48 @@
 {
     "CONTACTS_FILTER": {
-        "TITLE": "Filter Contacts",
-        "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
-        "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "TITLE": "Фільтр Контактів",
+        "SUBTITLE": "Додайте фільтри нижче та натисніть «Відправити», для фільтрації контактів.",
+        "ADD_NEW_FILTER": "Додати фільтр",
+        "CLEAR_ALL_FILTERS": "Очистити всі фільтри",
+        "FILTER_DELETE_ERROR": "Ви повинні мати хоча б один фільтр для збереження",
         "SUBMIT_BUTTON_LABEL": "Додати",
         "CANCEL_BUTTON_LABEL": "Скасувати",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
-        "TOOLTIP_LABEL": "Filter contacts",
+        "CLEAR_BUTTON_LABEL": "Скинути фільтри",
+        "EMPTY_VALUE_ERROR": "Необхідно вказати значення",
+        "TOOLTIP_LABEL": "Фільтрувати контакти",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "ТА",
+            "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"
+            "equal_to": "Дорівнює",
+            "not_equal_to": "Не дорівнює",
+            "contains": "Містить",
+            "does_not_contain": "Не містить",
+            "is_present": "Є",
+            "is_not_present": "Немає",
+            "is_greater_than": "Більше ніж",
+            "is_lesser_than": "Менше ніж",
+            "days_before": "X днів до"
         },
         "ATTRIBUTES": {
             "NAME": "Ім'я",
             "EMAIL": "Email",
             "PHONE_NUMBER": "Номер телефону",
-            "IDENTIFIER": "Identifier",
+            "IDENTIFIER": "Ідентифікатор",
             "CITY": "Місто",
             "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",
+            "CUSTOM_ATTRIBUTE_LIST": "Список",
+            "CUSTOM_ATTRIBUTE_TEXT": "Текст",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Номер",
+            "CUSTOM_ATTRIBUTE_LINK": "Лінк",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "Прапорець",
+            "CREATED_AT": "Створений в",
             "LAST_ACTIVITY": "Остання активність"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "Стандартні фільтри",
+            "ADDITIONAL_FILTERS": "Додаткові фільтри",
             "CUSTOM_ATTRIBUTES": "Свої атрибути"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index ab4c5de5d..6713ad050 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -1,41 +1,41 @@
 {
   "CONVERSATION": {
     "404": "Будь ласка, виберіть бесіду з лівої панелі",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "Користувач не верифікований",
     "NO_MESSAGE_1": "Ой! Схоже, у вашій поштовій скринці немає ніяких повідомлень.",
     "NO_MESSAGE_2": " щоб надіслати повідомлення на вашу сторінку!",
     "NO_INBOX_1": "Галас! Схоже, ви ще не додали скриньк.",
     "NO_INBOX_2": " для початку",
     "NO_INBOX_AGENT": "Ой! Схоже, ви не маєте доступу до скриньки \"Вхідні\". Будь ласка, зверніться до адміністратора",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH_MESSAGES": "Пошук повідомлень у розмовах",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "Пошук повідомлень",
+      "RESULT_TITLE": "Результати пошуку",
+      "LOADING_MESSAGE": "Триває збір даних...",
+      "PLACEHOLDER": "Введіть текст для пошуку повідомлень",
+      "NO_MATCHING_RESULTS": "Результатів не знайдено."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
+    "UNREAD_MESSAGES": "Непрочитані повідомлення",
+    "UNREAD_MESSAGE": "Непрочитане повідомлення",
     "CLICK_HERE": "Натисніть тут",
     "LOADING_INBOXES": "Завантаження скриньок",
     "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?",
+    "CANNOT_REPLY": "Ви не можете відповісти через",
+    "24_HOURS_WINDOW": "24-годинне обмеження на повідомлення",
+    "NOT_ASSIGNED_TO_YOU": "Ця розмова не призначена на вас. Ви бажаєте призначити цю розмову на себе?",
     "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",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Ви можете відповісти на цю розмову тільки за допомогою шаблонного повідомлення через",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24-годинне обмеження на повідомлення",
+    "SELECT_A_TWEET_TO_REPLY": "Будь ласка, виберіть твіт для відповіді.",
+    "REPLYING_TO": "Ви відповідаєте:",
+    "REMOVE_SELECTION": "Видалити вибране",
     "DOWNLOAD": "Звантажити",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
-    "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "UPLOADING_ATTACHMENTS": "Завантаження вкладень...",
+    "SUCCESS_DELETE_MESSAGE": "Повідомлення успішно видалено",
+    "FAIL_DELETE_MESSSAGE": "Не вдалося видалити повідомлення! Спробуйте ще раз",
+    "NO_RESPONSE": "Немає відповіді",
+    "RATING_TITLE": "Оцінка",
+    "FEEDBACK_TITLE": "Зворотній зв'язок",
     "HEADER": {
       "RESOLVE_ACTION": "Вирішити",
       "REOPEN_ACTION": "Відкрити знову",
@@ -43,27 +43,27 @@
       "OPEN": "Ще",
       "CLOSE": "Закрити",
       "DETAILS": "подробиці",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "Відкладено до завтра",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Відкладено до наступного тижня",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Відкладено до наступної відповіді"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Позначити як \"В очікуванні\"",
       "SNOOZE": {
-        "TITLE": "Snooze until",
+        "TITLE": "Відкласти до",
         "NEXT_REPLY": "Наступна відповідь",
         "TOMORROW": "Завтра",
         "NEXT_WEEK": "Наступного тижня"
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "Підпис повідомлення",
+      "ENABLE_SIGN_TOOLTIP": "Увімкнути підпис",
+      "DISABLE_SIGN_TOOLTIP": "Вимкнути підпис",
       "MSG_INPUT": "Shift + Enter для нового рядка. Для вибору швидкої відповіді, уведіть '/'.",
       "PRIVATE_MSG_INPUT": "Shift + Enter для нового рядка. Видиме лише для співробітників",
-      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Не налаштовано підпис повідомлення, будь ласка, налаштуйте його в налаштуваннях профілю.",
+      "CLICK_HERE": "Натисніть тут для оновлення"
     },
     "REPLYBOX": {
       "REPLY": "Відповісти",
@@ -74,13 +74,13 @@
       "TIP_FORMAT_ICON": "Показати текстовий редактор",
       "TIP_EMOJI_ICON": "Показати емодзі",
       "TIP_ATTACH_ICON": "Прикріпити файли",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "TIP_AUDIORECORDER_ICON": "Записати аудіо",
+      "TIP_AUDIORECORDER_PERMISSION": "Надати доступ до аудіо",
+      "TIP_AUDIORECORDER_ERROR": "Не вдалося відкрити аудіо",
       "ENTER_TO_SEND": "Enter для надсилання",
       "DRAG_DROP": "Перетягніть сюди, щоб прикріпити",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "START_AUDIO_RECORDING": "Почати аудіозапис",
+      "STOP_AUDIO_RECORDING": "Зупинити аудіозапис",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Додати bcc",
@@ -104,8 +104,8 @@
     "MESSAGE_ERROR": "Не вдалося надіслати повідомлення, будь ласка, повторіть спробу пізніше",
     "SENT_BY": "Надіслав:",
     "BOT": "Бот",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Не вдалося надіслати повідомлення! Повторіть спробу",
+    "TRY_AGAIN": "повторити",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Виберіть агента",
       "REMOVE": "Видалити",
@@ -143,7 +143,7 @@
     },
     "TEAM_MEMBERS": {
       "TITLE": "Запросити членів команди",
-      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
+      "DESCRIPTION": "Оскільки Ви готуєтеся поговорити зі своїм клієнтом, запросіть ваших партнерів по команді, щоб допомогти вам. Ви можете запросити ваших товаришів по команді, додавши їх адреси електронної пошти до списку співробітників.",
       "NEW_LINK": "Натисніть тут, щоб запросити учасника"
     },
     "INBOXES": {
@@ -169,36 +169,36 @@
       "CONVERSATION_ACTIONS": "Дії при бесіді",
       "CONVERSATION_LABELS": "Мітки бесіди",
       "CONVERSATION_INFO": "Інформація про бесіду",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONTACT_ATTRIBUTES": "Атрибути контакту",
       "PREVIOUS_CONVERSATION": "Попередні бесіди"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Створити атрибут",
     "UPDATE": {
       "SUCCESS": "Атрибут успішно оновлено",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "ERROR": "Не вдалося оновити атрибут. Будь ласка, спробуйте ще раз пізніше"
     },
     "ADD": {
       "TITLE": "Додати",
       "SUCCESS": "Атрибут додано успішно",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "ERROR": "Неможливо додати атрибут. Будь ласка, спробуйте ще раз пізніше"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Атрибут успішно видалено",
+      "ERROR": "Неможливо видалити атрибут. Будь ласка, спробуйте ще раз пізніше"
     },
     "ATTRIBUTE_SELECT": {
       "TITLE": "Додати атрибут",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "PLACEHOLDER": "Атрибути пошуку",
+      "NO_RESULT": "Атрибути не знайдено"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
-    "TO": "To",
-    "BCC": "Bcc",
-    "CC": "Cc",
-    "SUBJECT": "Subject"
+    "FROM": "Від",
+    "TO": "Для",
+    "BCC": "Прихована копія",
+    "CC": "Копія",
+    "SUBJECT": "Тема"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
index d7d2efc2a..b7c8acc35 100644
--- a/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/csatMgmt.json
@@ -1,6 +1,6 @@
 {
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "Оцініть ваш діалог",
+    "PLACEHOLDER": "Розкажіть нам більше..."
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index e451a8c93..88307062a 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -2,7 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Налаштування облікового запису",
     "SUBMIT": "Оновити налаштування",
-    "BACK": "Back",
+    "BACK": "Назад",
     "UPDATE": {
       "ERROR": "Не вдалося оновити налаштування, спробуйте ще раз!",
       "SUCCESS": "Налаштування облікового запису успішно оновлено"
@@ -14,8 +14,8 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
-        "NOTE": "This ID is required if you are building an API based integration"
+        "TITLE": "ID акаунту",
+        "NOTE": "Цей ID необхідний, якщо ви створюєте інтеграцію з API"
       },
       "NAME": {
         "LABEL": "Назва облікового запису",
@@ -28,105 +28,113 @@
         "ERROR": ""
       },
       "DOMAIN": {
-        "LABEL": "Incoming Email Domain",
-        "PLACEHOLDER": "The domain where you will receive the emails",
+        "LABEL": "Домен вхідної пошти",
+        "PLACEHOLDER": "Домен, на який ви будете отримувати електронні листи",
         "ERROR": ""
       },
       "SUPPORT_EMAIL": {
-        "LABEL": "Support Email",
-        "PLACEHOLDER": "Your company's support email",
+        "LABEL": "Email підтримки",
+        "PLACEHOLDER": "Email підтримки вашої компанії",
         "ERROR": ""
       },
       "AUTO_RESOLVE_DURATION": {
-        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "LABEL": "Кількість днів після того, як заявка повинна автоматично буде закрита, якщо немає активності",
         "PLACEHOLDER": "30",
-        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+        "ERROR": "Будь ласка, введіть допустиму тривалість автозакртиття (мінімум 1 день і максимум 999 днів)"
       },
       "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."
+        "INBOUND_EMAIL_ENABLED": "Продовження діалогу з е-поштою активоване для вашого облікового запису.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "Тепер ви можете отримувати електронні листи на власний домен."
       }
     },
-    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
-    "LEARN_MORE": "Learn more"
+    "UPDATE_CHATWOOT": "Доступне оновлення %{latestChatwootVersion} для Chatwoot. Будь ласка, оновіть вашу копію.",
+    "LEARN_MORE": "Детальніше"
   },
   "FORMS": {
     "MULTISELECT": {
-      "ENTER_TO_SELECT": "Press enter to select",
-      "ENTER_TO_REMOVE": "Press enter to remove",
-      "SELECT_ONE": "Select one"
+      "ENTER_TO_SELECT": "Натисніть Enter, щоб обрати",
+      "ENTER_TO_REMOVE": "Натисніть Enter, щоб видалити",
+      "SELECT_ONE": "Виберіть"
     }
   },
   "NOTIFICATIONS_PAGE": {
-    "HEADER": "Notifications",
-    "MARK_ALL_DONE": "Mark All Done",
+    "HEADER": "Сповіщення",
+    "MARK_ALL_DONE": "Позначити все готове",
+    "DELETE_TITLE": "видалено",
+    "UNREAD_NOTIFICATION": {
+      "TITLE": "Непрочитані сповіщення",
+      "ALL_NOTIFICATIONS": "Переглянути всі сповіщення",
+      "LOADING_UNREAD_MESSAGE": "Завантаження непрочитаних сповіщень...",
+      "EMPTY_MESSAGE": "У вас немає непрочитаних сповіщень"
+    },
     "LIST": {
-      "LOADING_MESSAGE": "Loading notifications...",
-      "404": "No Notifications",
+      "LOADING_MESSAGE": "Завантаження сповіщень...",
+      "404": "Немає сповіщень",
       "TABLE_HEADER": [
         "Ім'я",
-        "Phone Number",
+        "Номер телефону",
         "Бесіди",
-        "Last Contacted"
+        "Останній контакт"
       ]
     },
     "TYPE_LABEL": {
-      "conversation_creation": "New conversation",
-      "conversation_assignment": "Conversation Assigned",
-      "assigned_conversation_new_message": "New Message",
-      "conversation_mention": "Mention"
+      "conversation_creation": "Новий діалог",
+      "conversation_assignment": "Діалог призначений",
+      "assigned_conversation_new_message": "Нове повідомлення",
+      "conversation_mention": "Відмітка"
     }
   },
   "NETWORK": {
     "NOTIFICATION": {
-      "TEXT": "Disconnected from Chatwoot"
+      "TEXT": "Відключено від Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Оновити"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Шукати чи перейти до",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Загальні",
       "REPORTS": "Звіти",
       "CONVERSATION": "Діалог",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CHANGE_ASSIGNEE": "Змінити виконавця",
+      "CHANGE_TEAM": "Змінити команду",
+      "ADD_LABEL": "Додати мітку до діалогу",
+      "REMOVE_LABEL": "Видалити мітку з діалогу",
       "SETTINGS": "Налаштування"
     },
     "COMMANDS": {
       "GO_TO_CONVERSATION_DASHBOARD": "Перейти до панелі керування бесід",
       "GO_TO_CONTACTS_DASHBOARD": "Перейти до панелі керування контактами",
-      "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
-      "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
-      "GO_TO_LABEL_REPORTS": "Go to Label Reports",
-      "GO_TO_INBOX_REPORTS": "Go to Inbox Reports",
-      "GO_TO_TEAM_REPORTS": "Go to Team Reports",
-      "GO_TO_SETTINGS_AGENTS": "Go to Agent Settings",
-      "GO_TO_SETTINGS_TEAMS": "Go to Team Settings",
-      "GO_TO_SETTINGS_INBOXES": "Go to Inbox Settings",
-      "GO_TO_SETTINGS_LABELS": "Go to Label Settings",
-      "GO_TO_SETTINGS_CANNED_RESPONSES": "Go to Canned Response Settings",
-      "GO_TO_SETTINGS_APPLICATIONS": "Go to Application Settings",
-      "GO_TO_SETTINGS_ACCOUNT": "Go to Account Settings",
-      "GO_TO_SETTINGS_PROFILE": "Go to Profile Settings",
-      "GO_TO_NOTIFICATIONS": "Go to Notifications",
-      "ADD_LABELS_TO_CONVERSATION": "Add label to the conversation",
-      "ASSIGN_AN_AGENT": "Assign an agent",
-      "ASSIGN_A_TEAM": "Assign a team",
-      "MUTE_CONVERSATION": "Mute conversation",
-      "UNMUTE_CONVERSATION": "Unmute conversation",
-      "REMOVE_LABEL_FROM_CONVERSATION": "Remove label from the conversation",
-      "REOPEN_CONVERSATION": "Reopen conversation",
-      "RESOLVE_CONVERSATION": "Resolve conversation",
-      "SEND_TRANSCRIPT": "Send an email transcript",
-      "SNOOZE_CONVERSATION": "Snooze Conversation",
-      "UNTIL_NEXT_REPLY": "Until next reply",
-      "UNTIL_NEXT_WEEK": "Until next week",
-      "UNTIL_TOMORROW": "Until tomorrow"
+      "GO_TO_REPORTS_OVERVIEW": "До Звітів",
+      "GO_TO_CONVERSATION_REPORTS": "Перейти до Звітів про розмову",
+      "GO_TO_AGENT_REPORTS": "Перейти до звітів Співробітника",
+      "GO_TO_LABEL_REPORTS": "Перейти до Звітів з Мітками",
+      "GO_TO_INBOX_REPORTS": "Перейти до Вхідних Звітів",
+      "GO_TO_TEAM_REPORTS": "Перейти до Командних Звітів",
+      "GO_TO_SETTINGS_AGENTS": "Перейдіть до налаштувань Співробітника",
+      "GO_TO_SETTINGS_TEAMS": "Перейти до Налаштування команди",
+      "GO_TO_SETTINGS_INBOXES": "Перейти до Налаштування вхідних повідомлень",
+      "GO_TO_SETTINGS_LABELS": "Перейти до Налаштування Міток",
+      "GO_TO_SETTINGS_CANNED_RESPONSES": "До налаштувань швидкої відповіді",
+      "GO_TO_SETTINGS_APPLICATIONS": "Перейти до Налаштування додатку",
+      "GO_TO_SETTINGS_ACCOUNT": "Перейти до Налаштування облікового запису",
+      "GO_TO_SETTINGS_PROFILE": "Перейти до Налаштування профілю",
+      "GO_TO_NOTIFICATIONS": "Перейти до сповіщень",
+      "ADD_LABELS_TO_CONVERSATION": "Додати мітку до діалогу",
+      "ASSIGN_AN_AGENT": "Призначити агента",
+      "ASSIGN_A_TEAM": "Призначити команду",
+      "MUTE_CONVERSATION": "Вимкнути звук для розмови",
+      "UNMUTE_CONVERSATION": "Увімкнути звук для розмови",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Видалити мітку з діалогу",
+      "REOPEN_CONVERSATION": "Повторно відкрити розмову",
+      "RESOLVE_CONVERSATION": "Закрити розмову",
+      "SEND_TRANSCRIPT": "Надіслати історію розмови на електронну пошту",
+      "SNOOZE_CONVERSATION": "Відкласти розмову",
+      "UNTIL_NEXT_REPLY": "До наступної відповіді",
+      "UNTIL_NEXT_WEEK": "До наступного тижня",
+      "UNTIL_TOMORROW": "До завтра"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index ed10601a3..a8e1d1afc 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Вхідні",
-    "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>",
+    "SIDEBAR_TXT": "<p><b>Джерела</b></p> <p> Коли ви підключаєте веб-сайт або сторінку у Facebook до Chatwoot, вони називаються <b>Джерелом</b>. Ви можете мати необмежену кількість джерел у своєму обліковому записі Chatwoot. </p><p> Натисніть <b>Додати папку \"Джерело\"</b>, щоб підключити веб-сайт або сторінку Facebook. </p><p> На інформаційній панелі ви можете переглядати всі бесіди з усіх своїх поштових скриньок в одному місці та відповідати на них на вкладці \"Розмови\". </p><p> Ви також можете переглянути розмови, специфічні для папки \"Джерела\", клацнувши назву папки \"Джерело\" на лівій панелі інформаційної панелі. </p>",
     "LIST": {
       "404": "В цього облікового запису немає скриньк."
     },
@@ -9,17 +9,17 @@
       {
         "title": "Оберіть канал",
         "route": "settings_inbox_new",
-        "body": "Choose the provider you want to integrate with Chatwoot."
+        "body": "Виберіть постачальника, якого ви хочете інтегрувати з Chatwoot."
       },
       {
         "title": "Створити вхідну скриньку",
         "route": "settings_inboxes_page_channel",
-        "body": "Authenticate your account and create an inbox."
+        "body": "Увійдіть до свого облікового запису і створіть \"Джерело\"."
       },
       {
         "title": "Додати агентів",
         "route": "settings_inboxes_add_agents",
-        "body": "Add agents to the created inbox."
+        "body": "Додати агентів до створеного \"Джерела\"."
       },
       {
         "title": "Вуаля!",
@@ -29,27 +29,27 @@
     ],
     "ADD": {
       "CHANNEL_NAME": {
-        "LABEL": "Inbox Name",
-        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+        "LABEL": "Назва Джерела",
+        "PLACEHOLDER": "Введіть назву свого Джерела (наприклад: Acme Inc)"
       },
       "WEBSITE_NAME": {
         "LABEL": "Назва сайту",
         "PLACEHOLDER": "Введіть назву свого сайту (наприклад: 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"
+        "HELP": "PS: Після авторизації ми отримаємо доступ лише до ваших повідомлень на сторінці. Особисті повідомлення недоступні Chatwoot.",
+        "CHOOSE_PAGE": "Вибрати сторінку",
+        "CHOOSE_PLACEHOLDER": "Виберіть сторінку зі списку",
+        "INBOX_NAME": "Назва Джерела",
+        "ADD_NAME": "Додайте назву Джерела",
+        "PICK_NAME": "Виберіть ім'я Джерела",
+        "PICK_A_VALUE": "Виберіть значення"
       },
       "TWITTER": {
         "HELP": "Щоб додати свій профіль у Twitter як канал, вам потрібно авторизувати свій профіль у Twitter, натиснувши кнопку \"Увійти через Twitter\" ",
         "ERROR_MESSAGE": "Помилка підключення до Twitter, будь ласка, спробуйте ще раз",
         "TWEETS": {
-          "ENABLE": "Create conversations from mentioned Tweets"
+          "ENABLE": "Створити розмову зі згаданих твітів"
         }
       },
       "WEBSITE_CHANNEL": {
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Увімкнути вітання каналу",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Відправляйте вітальне повідомлення користувачам, коли вони розпочинають розмову.",
           "ENABLED": "Увімкнено",
           "DISABLED": "Вимкнено"
         },
@@ -136,35 +136,35 @@
         }
       },
       "SMS": {
-        "TITLE": "SMS Channel",
-        "DESC": "Start supporting your customers via SMS.",
+        "TITLE": "SMS-канал",
+        "DESC": "Розпочніть підтримувати ваших клієнтів через SMS.",
         "PROVIDERS": {
           "LABEL": "API Provider",
           "TWILIO": "Twilio",
           "BANDWIDTH": "Bandwidth"
         },
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+          "ERROR_MESSAGE": "Ми не змогли зберегти SMS-канал"
         },
         "BANDWIDTH": {
           "ACCOUNT_ID": {
-            "LABEL": "Account ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "LABEL": "ID акаунту",
+            "PLACEHOLDER": "Будь ласка, введіть ваш Ідентифікатор облікового запису Bandwidth",
             "ERROR": "Це поле є обов'язковим"
           },
           "API_KEY": {
-            "LABEL": "API Key",
-            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "LABEL": "API ключ",
+            "PLACEHOLDER": "Будь ласка, введіть ваш API ключ Bandwidth",
             "ERROR": "Це поле є обов'язковим"
           },
           "API_SECRET": {
-            "LABEL": "API Secret",
-            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "LABEL": "Секретний Ключ API",
+            "PLACEHOLDER": "Будь ласка, введіть ваш секретний ключ API Bandwidth",
             "ERROR": "Це поле є обов'язковим"
           },
           "APPLICATION_ID": {
-            "LABEL": "Application ID",
-            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "LABEL": "ID додатку",
+            "PLACEHOLDER": "Будь ласка, введіть ваш ID додатка Bandwidth",
             "ERROR": "Це поле є обов'язковим"
           },
           "INBOX_NAME": {
@@ -177,13 +177,13 @@
             "PLACEHOLDER": "Будь ласка, введіть номер телефону, з якого будуть надсилатися повідомлення.",
             "ERROR": "Номер телефону повинен починатися з символу `+'."
           },
-          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "SUBMIT_BUTTON": "Створити Bandwidth канал",
           "API": {
-            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+            "ERROR_MESSAGE": "Ми не змогли авторизувати облікові дані Bandwidth, будь ласка, спробуйте ще раз"
           },
           "API_CALLBACK": {
             "TITLE": "Callback URL",
-            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+            "SUBTITLE": "Ви повинні налаштувати URL зворотнього виклику у Bandwidth з URL-адресою, згаданим тут."
           }
         }
       },
@@ -250,76 +250,76 @@
         },
         "SUBMIT_BUTTON": "Створити Канал E-mail",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the email channel"
+          "ERROR_MESSAGE": "Ми не змогли зберегти email канал"
         },
-        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+        "FINISH_MESSAGE": "Почніть перенаправляти листи до наступної адреси електронної пошти."
       },
       "LINE_CHANNEL": {
-        "TITLE": "LINE Channel",
-        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "TITLE": "LINE Канал",
+        "DESC": "Інтегруйте канал LINE і почніть підтримувати клієнтів.",
         "CHANNEL_NAME": {
           "LABEL": "Назва каналу",
           "PLACEHOLDER": "Будь ласка, введіть назву каналу",
           "ERROR": "Це поле є обов'язковим"
         },
         "LINE_CHANNEL_ID": {
-          "LABEL": "LINE Channel ID",
-          "PLACEHOLDER": "LINE Channel ID"
+          "LABEL": "Ідентифікатор LINE Каналу",
+          "PLACEHOLDER": "Ідентифікатор LINE Каналу"
         },
         "LINE_CHANNEL_SECRET": {
-          "LABEL": "LINE Channel Secret",
-          "PLACEHOLDER": "LINE Channel Secret"
+          "LABEL": "Секретний ключ LINE каналу",
+          "PLACEHOLDER": "Секретний ключ LINE каналу"
         },
         "LINE_CHANNEL_TOKEN": {
-          "LABEL": "LINE Channel Token",
-          "PLACEHOLDER": "LINE Channel Token"
+          "LABEL": "Токен каналу LINE",
+          "PLACEHOLDER": "Токен каналу LINE"
         },
-        "SUBMIT_BUTTON": "Create LINE Channel",
+        "SUBMIT_BUTTON": "Створити LINE канал",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+          "ERROR_MESSAGE": "Ми не змогли зберегти канал LINE"
         },
         "API_CALLBACK": {
           "TITLE": "Callback URL",
-          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+          "SUBTITLE": "Необхідно налаштувати URL вебхука у додатку LINE за допомогою URL, згаданого тут."
         }
       },
       "TELEGRAM_CHANNEL": {
-        "TITLE": "Telegram Channel",
-        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "TITLE": "Канал Telegram",
+        "DESC": "Інтегруйте з Telegram каналом і починайте підтримувати клієнтів.",
         "BOT_TOKEN": {
           "LABEL": "Bot Token",
-          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "SUBTITLE": "Налаштуйте токен бота, який ви отримали з Telegram BotFather.",
           "PLACEHOLDER": "Bot Token"
         },
-        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "SUBMIT_BUTTON": "Створити канал Telegram",
         "API": {
-          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+          "ERROR_MESSAGE": "Ми не змогли зберегти Telegram канал"
         }
       },
       "AUTH": {
-        "TITLE": "Choose a channel",
-        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+        "TITLE": "Оберіть канал",
+        "DESC": "Chatwoot підтримує віджет live-Chat, сторінку Facebook, профіль Twitter, WhatsApp, Email і т. п., як канали. Якщо ви хочете створити користувацький канал, ви можете створити його за допомогою каналу API. Виберіть один канал з параметрів нижче, щоб продовжити."
       },
       "AGENTS": {
         "TITLE": "Агенти",
-        "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"
+        "DESC": "Тут Ви можете додавати агентів для керування нещодавно створеним джерелом. Тільки ці обрані агенти матимуть доступ до Вашої папки \"Вхідні\". Агенти, які не входять до цього джерела, не зможуть побачити або відповісти на повідомлення у цій папці \"Вхідні\", під час входу. <br> <b>PS:</b> Як адміністратор, якщо вам потрібен доступ до всіх джерел, ви повинні додати себе як агент до всіх \"Вхідні\", що створюєте.",
+        "VALIDATION_ERROR": "Додайте як мінімум одного агента до вашого нового Джерела",
+        "PICK_AGENTS": "Вибрати агентів для джерела"
       },
       "DETAILS": {
         "TITLE": "Деталі скриньки Вхідні",
-        "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."
+        "DESC": "З випадаючого списку виберіть сторінку Facebook, яку ви хочете підключитися до Chatwoot. Ви також можете надати довільне ім'я для вашого джерела для кращої ідентифікації."
       },
       "FINISH": {
         "TITLE": "Успіх!",
-        "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 :)"
+        "DESC": "Ви успішно закінчили інтеграцію вашої сторінки у Facebook з Chatwoot. Наступного разу, коли з’явиться клієнтська сторінка, розмова автоматично з'явиться у вашій поштовій скриньці.<br>Ми також надаємо вам сценарій роботи віджетів, який можна легко додати на ваш сайт. Як тільки це буде опубліковане на вашому сайті, клієнти можуть надсилати вам повідомлення прямо з вашого сайту без допомоги будь-якого зовнішнього інструменту, і розмова з'явиться тут, на Chatwoot.<br>Круто, так? Ну, ми дійсно намагаємося бути :)"
       }
     },
     "DETAILS": {
       "LOADING_FB": "Автентифікація через Facebook...",
-      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "ERROR_FB_AUTH": "Щось пішло не так. Будь ласка, оновіть сторінку...",
       "CREATING_CHANNEL": "Створення скриньки Вхідні...",
-      "TITLE": "Configure Inbox Details",
+      "TITLE": "Налаштувати подробиці Джерела",
       "DESC": ""
     },
     "AGENTS": {
@@ -328,16 +328,16 @@
     },
     "FINISH": {
       "TITLE": "Ваша поштова скринька готова!",
-      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "MESSAGE": "Ви тепер можете взаємодіяти з вашими клієнтами через ваш новий канал. Щасливої підтримки ",
       "BUTTON_TEXT": "Давай туди",
-      "MORE_SETTINGS": "More settings",
+      "MORE_SETTINGS": "Додаткові налаштування",
       "WEBSITE_SUCCESS": "Ви успішно завершили створення каналу Веб-сайт. Скопіюйте наведений нижче код і вставте його на ваш сайт. Наступного разу коли клієнт скористається онлайн чатом, розмова автоматично з'явиться в вашій скриньці Вхідні."
     },
     "REAUTH": "Повторна авторизація",
     "VIEW": "Вигляд",
     "EDIT": {
       "API": {
-        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "SUCCESS_MESSAGE": "Налаштування вхідних повідомлень успішно оновлені",
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Автопризначення успішно оновлено",
         "ERROR_MESSAGE": "Не вдалося оновити колір віджету. Будь ласка, спробуйте ще раз."
       },
@@ -362,53 +362,54 @@
         "DISABLED": "Вимкнено"
       },
       "ENABLE_HMAC": {
-        "LABEL": "Enable"
+        "LABEL": "Увімкнено"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
-      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "AVATAR_DELETE_BUTTON_TEXT": "Видалити аватар",
       "CONFIRM": {
         "TITLE": "Підтвердження видалення",
         "MESSAGE": "Справді бажаєте видалити ",
-        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "PLACE_HOLDER": "Будь ласка, введіть {inboxName} для підтвердження",
         "YES": "Так, видалити ",
-        "NO": "No, Keep "
+        "NO": "Ні, залишити "
       },
       "API": {
         "SUCCESS_MESSAGE": "Скриньку успішно видалено",
         "ERROR_MESSAGE": "Не вдалося видалити скриньку \"Вхідні\". Будь ласка, спробуйте ще раз.",
-        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
-        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+        "AVATAR_SUCCESS_MESSAGE": "Аватар для джерела повідомлень успішно видалено",
+        "AVATAR_ERROR_MESSAGE": "Не вдалося видалити аватар \"Джерела\". Будь ласка, спробуйте ще раз пізніше."
       }
     },
     "TABS": {
       "SETTINGS": "Налаштування",
-      "COLLABORATORS": "Collaborators",
-      "CONFIGURATION": "Configuration",
-      "CAMPAIGN": "Campaigns",
-      "PRE_CHAT_FORM": "Pre Chat Form",
-      "BUSINESS_HOURS": "Business Hours"
+      "COLLABORATORS": "Співавтори",
+      "CONFIGURATION": "Конфігурація",
+      "CAMPAIGN": "Розсилка",
+      "PRE_CHAT_FORM": "Форма, що показується перед стартом діалогу",
+      "BUSINESS_HOURS": "Робочий час"
     },
     "SETTINGS": "Налаштування",
     "FEATURES": {
-      "LABEL": "Features",
-      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget"
+      "LABEL": "Особливості",
+      "DISPLAY_FILE_PICKER": "Показувати вибір файлу на віджеті",
+      "DISPLAY_EMOJI_PICKER": "Відображати емодзі на віджеті",
+      "ALLOW_END_CONVERSATION": "Дозволити користувачам завершити розмову з віджета"
     },
     "SETTINGS_POPUP": {
-      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_HEADING": "Скрипт месенджера",
       "MESSENGER_SUB_HEAD": "Добавте кнопку на сторінки вашого сайту",
       "INBOX_AGENTS": "Агенти",
       "INBOX_AGENTS_SUB_TEXT": "Додати або вилучити агентів з скриньки Вхідні",
       "UPDATE": "Оновити",
-      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
-      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "ENABLE_EMAIL_COLLECT_BOX": "Включити збір електронної пошти",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Увімкнути або вимкнути ящик збору повідомлень в новій розмові",
       "AUTO_ASSIGNMENT": "Увімкнути автопризначення",
-      "ENABLE_CSAT": "Enable CSAT",
+      "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.",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Увімкнути безперервність розмови через електронну пошту",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Розмови продовжуватимуться через електронну пошту, якщо доступна контактна адреса.",
       "INBOX_UPDATE_TITLE": "Налаштування каналу",
       "INBOX_UPDATE_SUB_TEXT": "Оновіть параметри каналу",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Увімкнення або вимкнення автоматичного призначення нових розмов до агентів, доданих до цього каналу.",
@@ -420,8 +421,8 @@
       "INBOX_IDENTIFIER_SUB_TEXT": "Використовуйте токен `inbox_identifier`, показаний тут для аутентифікації ваших API клієнтів.",
       "FORWARD_EMAIL_TITLE": "Переслати на ел. пошту",
       "FORWARD_EMAIL_SUB_TEXT": "Почніть перенаправляти листи до наступної адреси електронної пошти.",
-      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
-      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Дозволити повідомлення після закінчення розмови",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Дозволити кінцевим користувачам надсилати повідомлення навіть після закриття розмови."
     },
     "FACEBOOK_REAUTHORIZE": {
       "TITLE": "Повторна авторизація",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Попередні форми чату дозволяють зберегти інформацію про користувача, перш ніж вони почнуть розмову з вами.",
+      "SET_FIELDS": "Поля, що відображаються перед початком діалогу",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Поля",
+        "LABEL": "Мітка",
+        "PLACE_HOLDER": "Мітка-заповнювач",
+        "KEY": "Ключ",
+        "TYPE": "Тип",
+        "REQUIRED": "Обов'язково"
+      },
       "ENABLE": {
         "LABEL": "Увімкнути форму попереднього чату",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Попереднє повідомлення чату",
+        "LABEL": "Повідомлення, що відображається перед початком діалогу",
         "PLACEHOLDER": "Це повідомлення буде видимим для користувачів разом з формою"
       },
       "REQUIRE_EMAIL": {
@@ -463,70 +473,73 @@
         "VALIDATION_ERROR": "Час початку має бути менше часу закриття.",
         "CHOOSE": "Обрати"
       },
-      "ALL_DAY": "All-Day"
+      "ALL_DAY": "Увесь день"
     },
     "IMAP": {
       "TITLE": "IMAP",
-      "SUBTITLE": "Set your IMAP details",
-      "UPDATE": "Update IMAP settings",
-      "TOGGLE_AVAILABILITY": "Enable IMAP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling IMAP will help the user to recieve email",
+      "SUBTITLE": "Встановити параметри IMAP",
+      "NOTE_TEXT": "Для увімкнення SMTP, будь ласка, налаштуйте IMAP.",
+      "UPDATE": "Оновити налаштування IMAP",
+      "TOGGLE_AVAILABILITY": "Увімкнути налаштування IMAP для цієї папки Вхідні",
+      "TOGGLE_HELP": "Увімкнення IMAP допоможе користувачу отримувати електронну пошту",
       "EDIT": {
-        "SUCCESS_MESSAGE": "IMAP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update IMAP settings"
+        "SUCCESS_MESSAGE": "Налаштування IMAP успішно оновлено",
+        "ERROR_MESSAGE": "Не вдалося оновити налаштування IMAP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: imap.gmail.com)"
+        "LABEL": "Адреса",
+        "PLACE_HOLDER": "Адреса (наприклад: imap.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Порт",
+        "PLACE_HOLDER": "Порт"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Увійти",
+        "PLACE_HOLDER": "Увійти"
       },
       "PASSWORD": {
         "LABEL": "Пароль",
         "PLACE_HOLDER": "Пароль"
       },
-      "ENABLE_SSL": "Enable SSL"
+      "ENABLE_SSL": "Увімкнути SSL"
     },
     "SMTP": {
       "TITLE": "SMTP",
-      "SUBTITLE": "Set your SMTP details",
-      "UPDATE": "Update SMTP settings",
-      "TOGGLE_AVAILABILITY": "Enable SMTP configuration for this inbox",
-      "TOGGLE_HELP": "Enabling SMTP will help the user to send email",
+      "SUBTITLE": "Встановити параметри SMTP",
+      "UPDATE": "Оновити налаштування SMTP",
+      "TOGGLE_AVAILABILITY": "Увімкнути SMTP конфігурацію для вхідних повідомлень",
+      "TOGGLE_HELP": "Включення SMTP допоможе користувачеві надіслати email повідомлення",
       "EDIT": {
-        "SUCCESS_MESSAGE": "SMTP settings updated successfully",
-        "ERROR_MESSAGE": "Unable to update SMTP settings"
+        "SUCCESS_MESSAGE": "Налаштування SMTP успішно оновлено",
+        "ERROR_MESSAGE": "Неможливо оновити налаштування SMTP"
       },
       "ADDRESS": {
-        "LABEL": "Address",
-        "PLACE_HOLDER": "Address (Eg: smtp.gmail.com)"
+        "LABEL": "Адреса",
+        "PLACE_HOLDER": "Адреса (наприклад: smtp.gmail.com)"
       },
       "PORT": {
-        "LABEL": "Port",
-        "PLACE_HOLDER": "Port"
+        "LABEL": "Порт",
+        "PLACE_HOLDER": "Порт"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "Увійти",
+        "PLACE_HOLDER": "Увійти"
       },
       "PASSWORD": {
         "LABEL": "Пароль",
         "PLACE_HOLDER": "Пароль"
       },
       "DOMAIN": {
-        "LABEL": "Domain",
-        "PLACE_HOLDER": "Domain"
+        "LABEL": "Домен",
+        "PLACE_HOLDER": "Домен"
       },
-      "ENCRYPTION": "Encryption",
+      "ENCRYPTION": "Шифрування",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Режим підтвердження Open SSL",
+      "AUTH_MECHANISM": "Автентифікація"
+    },
+    "NOTE": "Замітка: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrationApps.json b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
index 600c76240..3c8fd2f7a 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrationApps.json
@@ -24,13 +24,13 @@
       },
       "CANCEL_BUTTON_TEXT": "Скасувати",
       "API": {
-        "SUCCESS_MESSAGE": "Hook deleted successfully",
+        "SUCCESS_MESSAGE": "Хук успішно видалено",
         "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
       }
     },
     "LIST": {
-      "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "FETCHING": "Отримання інтеграційних хуків",
+      "INBOX": "Вхідні",
       "DELETE": {
         "BUTTON_TEXT": "Видалити"
       }
@@ -38,14 +38,14 @@
     "ADD": {
       "FORM": {
         "INBOX": {
-          "LABEL": "Select Inbox",
-          "PLACEHOLDER": "Select Inbox"
+          "LABEL": "Вибрати \"Вхідний\" канал",
+          "PLACEHOLDER": "Виділити \"Вхідні\""
         },
         "SUBMIT": "Створити",
         "CANCEL": "Скасувати"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Integration hook added successfully",
+        "SUCCESS_MESSAGE": "Хук інтеграції успішно додано",
         "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
       }
     },
@@ -56,7 +56,7 @@
       "BUTTON_TEXT": "Від'єднатись"
     },
     "SIDEBAR_DESCRIPTION": {
-      "DIALOGFLOW": "Dialogflow is a natural language understanding platform that makes it easy to design and integrate a conversational user interface into your mobile app, web application, device, bot, interactive voice response system, and so on. <br /> <br /> Dialogflow integration with %{installationName} allows you to configure a Dialogflow bot with your inboxes which lets the bot handle the queries initially and hand them over to an agent when needed. Dialogflow can be used to qualifying the leads, reduce the workload of agents by providing frequently asked questions etc. <br /> <br /> To add Dialogflow, you need to create a Service Account in your Google project console and share the credentials. Please refer to the Dialogflow docs for more information."
+      "DIALOGFLOW": "Dialogflow - це платформа природного розуміння мови, що дозволяє легко розробляти та інтегрувати розмовний інтерфейс користувача у ваш мобільний додаток, веб-додаток, пристрій, бот, інтерактивна система голосової відповіді тощо. <br /> <br /> Dialogflow інтеграція з %{installationName} дозволяє вам налаштувати бота Dialogflow потоку вашими папками \"Вхідні\", що дозволяє боту обробляти запити спочатку, і передавати їх агенту по необхідності. Dialogflow може бути використаний для кваліфікації лідів, зменшення навантаження агентів, надаючи часті запитання та ін. <br /> <br /> Щоб додати Dialogflow, потрібно створити обліковий запис служби в консолі проекту Google і надати доступ до облікових даних. Будь-ласка, зверніться до документації Dialogflow для отримання додаткової інформації."
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index e2d3ac7cd..099e5aafe 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Інтеграції",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Події з підпискою",
+      "FORM": {
+        "CANCEL": "Скасувати",
+        "DESC": "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Будь ласка, введіть дійсний URL для налаштування зворотного виклику.",
+        "SUBSCRIPTIONS": {
+          "LABEL": "Події",
+          "EVENTS": {
+            "CONVERSATION_CREATED": "Розмову створено",
+            "CONVERSATION_STATUS_CHANGED": "Статус розмови змінено",
+            "CONVERSATION_UPDATED": "Розмову оновлено",
+            "MESSAGE_CREATED": "Повідомлення створено",
+            "MESSAGE_UPDATED": "Повідомлення оновлено",
+            "WEBWIDGET_TRIGGERED": "Віджет онлайн чату відкрий користувачем"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "URL вебхука",
+          "PLACEHOLDER": "Наприклад: https://example/api/webhook",
+          "ERROR": "Будь ласка, введіть правильний URL"
+        },
+        "EDIT_SUBMIT": "Оновити вебхук",
+        "ADD_SUBMIT": "Створити вебхук"
+      },
       "TITLE": "Веб-хук",
       "CONFIGURE": "Настроїти",
       "HEADER": "Налаштування вебхука",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Редагувати",
         "TITLE": "Редагувати вебхук",
-        "CANCEL": "Скасувати",
-        "DESC": "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Будь ласка, введіть дійсний URL для налаштування зворотного виклику.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL вебхука",
-            "PLACEHOLDER": "Наприклад: https://example/api/webhook",
-            "ERROR": "Будь ласка, введіть правильний URL"
-          },
-          "SUBMIT": "Редагувати вебхук"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "URL вебхуку успішно оновлено",
+          "SUCCESS_MESSAGE": "Налаштування вебхуків успішно оновлено",
           "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
         }
       },
       "ADD": {
         "CANCEL": "Скасувати",
         "TITLE": "Додати новий вебхук",
-        "DESC": "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Будь ласка, введіть дійсний URL для налаштування зворотного виклику.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "URL вебхука",
-            "PLACEHOLDER": "Наприклад: https://example/api/webhook",
-            "ERROR": "Будь ласка, введіть правильний URL"
-          },
-          "SUBMIT": "Створити вебхук"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Вебхук успішно додано",
+          "SUCCESS_MESSAGE": "Налаштування вебхуків успішно додано",
           "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Підтвердження видалення",
-          "MESSAGE": "Справді бажаєте видалити ",
+          "MESSAGE": "Ви впевнені, що хочете видалити webhook? (%{webhookURL})",
           "YES": "Так, видалити ",
           "NO": "Ні, залиште"
         }
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index e75cc1c11..e95f0b228 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Огляд",
+    "HEADER": "Бесіди",
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
     "DOWNLOAD_AGENT_REPORTS": "Завантажити звіти агентів",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Час першої відповіді",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час першої відповіді %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Час до вирішення",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час рішення %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Кількість вирішень",
@@ -57,61 +61,62 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Підтвердити",
+      "PLACEHOLDER": "Виберіть діапазон дат"
     },
-    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
+    "GROUP_BY_FILTER_DROPDOWN_LABEL": "Групувати за",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "День"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "День"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Тиждень"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "День"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Тиждень"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Місяць"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "День"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Тиждень"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Місяць"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Рік"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Робочий час"
   },
   "AGENT_REPORTS": {
-    "HEADER": "Agents Overview",
+    "HEADER": "Огляд Агентів",
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
     "DOWNLOAD_AGENT_REPORTS": "Завантажити звіти агентів",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Час першої відповіді",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час першої відповіді %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Час до вирішення",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час рішення %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Кількість вирішень",
@@ -169,16 +178,16 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Підтвердити",
+      "PLACEHOLDER": "Виберіть діапазон дат"
     }
   },
   "LABEL_REPORTS": {
-    "HEADER": "Labels Overview",
+    "HEADER": "Огляд міток",
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
-    "DOWNLOAD_LABEL_REPORTS": "Download label reports",
-    "FILTER_DROPDOWN_LABEL": "Select Label",
+    "DOWNLOAD_LABEL_REPORTS": "Завантажити звіти по міткам",
+    "FILTER_DROPDOWN_LABEL": "Виберіть Мітку",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Бесіди",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Час першої відповіді",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість розмов, що використовуються для обчислень:",
+        "TOOLTIP_TEXT": "Час першої відповіді %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Час до вирішення",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час рішення %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Кількість вирішень",
@@ -232,16 +245,16 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Підтвердити",
+      "PLACEHOLDER": "Виберіть діапазон дат"
     }
   },
   "INBOX_REPORTS": {
-    "HEADER": "Inbox Overview",
+    "HEADER": "Огляд вхідних повідомлень",
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
-    "DOWNLOAD_INBOX_REPORTS": "Download inbox reports",
-    "FILTER_DROPDOWN_LABEL": "Select Inbox",
+    "DOWNLOAD_INBOX_REPORTS": "Завантажити звіти вхідних повідомлень",
+    "FILTER_DROPDOWN_LABEL": "Вибрати \"Вхідний\" канал",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Бесіди",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Час першої відповіді",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час першої відповіді %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Час до вирішення",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час рішення %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Кількість вирішень",
@@ -295,16 +312,16 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Прийняти",
+      "PLACEHOLDER": "Виберіть діапазон дат"
     }
   },
   "TEAM_REPORTS": {
-    "HEADER": "Team Overview",
+    "HEADER": "Огляд команди",
     "LOADING_CHART": "Завантаження даних діаграми...",
     "NO_ENOUGH_DATA": "Ми не отримали достатньо даних для генерації звіту. Будь ласка, спробуйте ще раз пізніше.",
-    "DOWNLOAD_TEAM_REPORTS": "Download team reports",
-    "FILTER_DROPDOWN_LABEL": "Select Team",
+    "DOWNLOAD_TEAM_REPORTS": "Завантажити звіти команд",
+    "FILTER_DROPDOWN_LABEL": "Оберіть команду",
     "METRICS": {
       "CONVERSATIONS": {
         "NAME": "Бесіди",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "Час першої відповіді",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час першої відповіді %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Час до вирішення",
-        "DESC": "( Середнє )"
+        "DESC": "( Середнє )",
+        "INFO_TEXT": "Загальна кількість бесід, що використовуються для обчислення:",
+        "TOOLTIP_TEXT": "Час рішення %{metricValue} (на основі %{conversationCount} розмов)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Кількість вирішень",
@@ -358,39 +379,67 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
-      "PLACEHOLDER": "Select date range"
+      "CONFIRM": "Прийняти",
+      "PLACEHOLDER": "Виберіть діапазон дат"
     }
   },
   "CSAT_REPORTS": {
-    "HEADER": "CSAT Reports",
-    "NO_RECORDS": "There are no CSAT survey responses available.",
+    "HEADER": "Звіти CSAT",
+    "NO_RECORDS": "Немає доступних відповідей для опитувань CSAT.",
     "FILTERS": {
       "AGENTS": {
-        "PLACEHOLDER": "Choose Agents"
+        "PLACEHOLDER": "Виберіть Агентів"
       }
     },
     "TABLE": {
       "HEADER": {
-        "CONTACT_NAME": "Contact",
-        "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
-        "FEEDBACK_TEXT": "Feedback comment"
+        "CONTACT_NAME": "Контакт",
+        "AGENT_NAME": "Призначений агент",
+        "RATING": "Оцінка",
+        "FEEDBACK_TEXT": "Відгук"
       }
     },
     "METRIC": {
       "TOTAL_RESPONSES": {
-        "LABEL": "Total responses",
-        "TOOLTIP": "Total number of responses collected"
+        "LABEL": "Всього відповідей",
+        "TOOLTIP": "Загальна кількість зібраних відповідей"
       },
       "SATISFACTION_SCORE": {
-        "LABEL": "Satisfaction score",
-        "TOOLTIP": "Total number of positive responses / Total number of responses * 100"
+        "LABEL": "Оцінка задоволеності",
+        "TOOLTIP": "Загальна кількість позитивних відповідей / Загальна кількість відповідей * 100"
       },
       "RESPONSE_RATE": {
-        "LABEL": "Response rate",
-        "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
+        "LABEL": "Показник відповідей",
+        "TOOLTIP": "Загальна кількість відповідей / Загальна кількість повідомлень опитування CSAT відправлено * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Огляд",
+    "LIVE": "Онлайн",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Відкрити розмову",
+      "LOADING_MESSAGE": "Завантаження метрик розмови...",
+      "OPEN": "Відкриті",
+      "UNATTENDED": "Не зв'язаний",
+      "UNASSIGNED": "Непризначені"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Розмови агентів",
+      "LOADING_MESSAGE": "Завантаження метрик агента...",
+      "NO_AGENTS": "Немає розмов, пов'язаних з агентом",
+      "TABLE_HEADER": {
+        "AGENT": "Агент",
+        "OPEN": "ВІДКРИТИ",
+        "UNATTENDED": "Не зв'язаний",
+        "STATUS": "Статус"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Статус агента",
+      "ONLINE": "Онлайн",
+      "BUSY": "Зайнятий",
+      "OFFLINE": "Не в мережі"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json b/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
index a1e56e856..62572c4d2 100644
--- a/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/uk/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Пароль успішно змінено",
       "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
     },
+    "CAPTCHA": {
+      "ERROR": "Верифікація закінчилася. Будь ласка, пройдіть captcha ще раз."
+    },
     "SUBMIT": "Додати"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index b8122d243..ddcd2fad8 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -3,11 +3,11 @@
     "LINK": "Налаштування облікового запису",
     "TITLE": "Налаштування облікового запису",
     "BTN_TEXT": "Оновити обліковий запис",
-    "DELETE_AVATAR": "Delete Avatar",
-    "AVATAR_DELETE_SUCCESS": "Avatar has been deleted successfully",
-    "AVATAR_DELETE_FAILED": "There is an error while deleting avatar, please try again",
-    "UPDATE_SUCCESS": "Your profile has been updated successfully",
-    "PASSWORD_UPDATE_SUCCESS": "Your password has been changed successfully",
+    "DELETE_AVATAR": "Видалити аватар",
+    "AVATAR_DELETE_SUCCESS": "Аватар був успішно видалений",
+    "AVATAR_DELETE_FAILED": "Виникла помилка під час видалення аватару, будь ласка, спробуйте ще раз",
+    "UPDATE_SUCCESS": "Ваш профіль було успішно оновлено",
+    "PASSWORD_UPDATE_SUCCESS": "Ваш пароль було успішно змінено",
     "AFTER_EMAIL_CHANGED": "Ваш обліковий запис було успішно оновлено. Будь ласка, увійдіть знову, оскільки ваші дані були змінені",
     "FORM": {
       "AVATAR": "Зображення облікового запису",
@@ -20,60 +20,60 @@
         "NOTE": "Ваша електронна адреса - це ваша ідентифікація і використовується для входу."
       },
       "MESSAGE_SIGNATURE_SECTION": {
-        "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
-        "BTN_TEXT": "Save message signature",
-        "API_ERROR": "Couldn't save signature! Try again",
-        "API_SUCCESS": "Signature saved successfully"
+        "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": "Оновлення вашого пароля призведе до скидання ваших записів про вхід на інших пристроях.",
-        "BTN_TEXT": "Change password"
+        "BTN_TEXT": "Змінити пароль"
       },
       "ACCESS_TOKEN": {
         "TITLE": "Ключ доступу",
         "NOTE": "Цей ключ можна використовувати, якщо ви створюєте API-інтеграцію"
       },
       "AUDIO_NOTIFICATIONS_SECTION": {
-        "TITLE": "Audio Notifications",
-        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "TITLE": "Звукові сповіщення",
+        "NOTE": "Увімкніть звукові сповіщення в інформаційній панелі для нових повідомлень і розмов.",
         "NONE": "Нiчого",
-        "ASSIGNED": "Assigned Conversations",
-        "ALL_CONVERSATIONS": "All Conversations"
+        "ASSIGNED": "Призначені розмови",
+        "ALL_CONVERSATIONS": "Всі розмови"
       },
       "EMAIL_NOTIFICATIONS_SECTION": {
         "TITLE": "Сповіщення електронною поштою",
         "NOTE": "Тут оновлюються налаштування повідомлень електронною поштою",
         "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"
+        "CONVERSATION_MENTION": "Надсилати сповіщення електронною поштою, коли вас згадують в розмові",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати сповіщення при створенні нового повідомлення у призначеній розмові"
       },
       "API": {
         "UPDATE_SUCCESS": "Налаштування сповіщень для вашого акаунту оновлено успішно",
         "UPDATE_ERROR": "Виникла помилка під час оновлення налаштувань, будь ласка, спробуйте ще раз"
       },
       "PUSH_NOTIFICATIONS_SECTION": {
-        "TITLE": "Push Notifications",
-        "NOTE": "Update your push notification preferences here",
-        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
-        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
-        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
-        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
-        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
-        "REQUEST_PUSH": "Enable push notifications"
+        "TITLE": "Push-сповіщення",
+        "NOTE": "Оновіть ваші налаштування push-сповіщень тут",
+        "CONVERSATION_ASSIGNMENT": "Надсилати push-повідомлення, коли мені призначено розмову",
+        "CONVERSATION_CREATION": "Надсилати push-повідомлення, коли створюється нова розмова",
+        "CONVERSATION_MENTION": "Надсилати push-повідомлення, коли вас згадують в розмові",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Надсилати push-повідомлення, коли нове повідомлення створюється в призначеній розмові",
+        "HAS_ENABLED_PUSH": "Ви увімкнули push для цього браузера.",
+        "REQUEST_PUSH": "Увімкнути push-сповіщення"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Зображення облікового запису"
       },
       "NAME": {
-        "LABEL": "Your full name",
+        "LABEL": "Ваше повне ім'я",
         "ERROR": "Будь ласка, введіть своє повне ім'я",
         "PLACEHOLDER": "Будь ласка, введіть своє повне ім'я"
       },
@@ -101,21 +101,21 @@
         "PLACEHOLDER": "Будь ласка, введіть поточний пароль"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "Новий пароль",
         "ERROR": "Будь ласка, введіть пароль довжиною 6 або більше символів",
         "PLACEHOLDER": "Будь ласка, введіть новий пароль"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "Підвердіть новий пароль",
         "ERROR": "Підтвердження пароля має відповідати паролю",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "Будь ласка, введіть новий пароль ще раз"
       }
     }
   },
   "SIDEBAR_ITEMS": {
     "CHANGE_AVAILABILITY_STATUS": "Змінити",
     "CHANGE_ACCOUNTS": "Змінити обліковий запис",
-    "CONTACT_SUPPORT": "Contact Support",
+    "CONTACT_SUPPORT": "Звернутися зі службою підтримки",
     "SELECTOR_SUBTITLE": "Виберіть обліковий запис із наступного списку",
     "PROFILE_SETTINGS": "Налаштування облікового запису",
     "KEYBOARD_SHORTCUTS": "Комбінації клавіш",
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Копіювати",
       "COPY_SUCCESSFUL": "Код скопійований в буфер обміну"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Показати більше",
+      "SHOW_LESS": "Показати менше"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Звантажити",
       "UPLOADING": "Завантажується..."
@@ -146,10 +150,11 @@
     }
   },
   "SIDEBAR": {
-    "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "CURRENTLY_VIEWING_ACCOUNT": "Зараз переглядається:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Бесіди",
-    "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "ALL_CONVERSATIONS": "Всі розмови",
+    "MENTIONED_CONVERSATIONS": "Згадування",
     "REPORTS": "Звіти",
     "SETTINGS": "Налаштування",
     "CONTACTS": "Контакти",
@@ -164,26 +169,27 @@
     "APPLICATIONS": "Додатки",
     "LABELS": "Мітки",
     "CUSTOM_ATTRIBUTES": "Свої атрибути",
-    "AUTOMATION": "Automation",
+    "AUTOMATION": "Автоматизація",
     "TEAMS": "Команди",
-    "CUSTOM_VIEWS_FOLDER": "Folders",
-    "CUSTOM_VIEWS_SEGMENTS": "Segments",
+    "CUSTOM_VIEWS_FOLDER": "Папки",
+    "CUSTOM_VIEWS_SEGMENTS": "Сегменти",
     "ALL_CONTACTS": "Усі контакти",
     "TAGGED_WITH": "З тегами",
-    "NEW_LABEL": "New label",
-    "NEW_TEAM": "New team",
-    "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Огляд",
+    "NEW_LABEL": "Нова мітка",
+    "NEW_TEAM": "Нова команда",
+    "NEW_INBOX": "Нове джерело",
+    "REPORTS_CONVERSATION": "Бесіди",
     "CSAT": "CSAT",
-    "CAMPAIGNS": "Маркетингові кампанії",
+    "CAMPAIGNS": "Розсилки",
     "ONGOING": "У процесі",
     "ONE_OFF": "Один з",
     "REPORTS_AGENT": "Агенти",
     "REPORTS_LABEL": "Мітки",
     "REPORTS_INBOX": "Канал",
     "REPORTS_TEAM": "Команда",
-    "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "SET_AVAILABILITY_TITLE": "Позначити себе як",
+    "BETA": "Бета-версія",
+    "REPORTS_OVERVIEW": "Огляд"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Ми не змогли знайти жодного облікового запису Chatwoot. Будь ласка, створіть новий обліковий запис, щоб продовжити.",
@@ -216,10 +222,10 @@
       "MOVE_TO_NEXT_TAB": "Перейти до наступної вкладки в списку бесід",
       "GO_TO_SETTINGS": "Перейти до налаштувань",
       "SWITCH_CONVERSATION_STATUS": "Перейти до статусу наступної розмови",
-      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
-      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
-      "SWITCH_TO_REPLY": "Switch to Reply",
-      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+      "SWITCH_TO_PRIVATE_NOTE": "Перейти до приватних заміток",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Перемкнути редагування Rich Content",
+      "SWITCH_TO_REPLY": "Перейти до відповіді",
+      "TOGGLE_SNOOZE_DROPDOWN": "Перемкнути випадаючий список відкладення"
     },
     "KEYS": {
       "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
diff --git a/app/javascript/dashboard/i18n/locale/uk/signup.json b/app/javascript/dashboard/i18n/locale/uk/signup.json
index 5ce1e88fd..dff1f7875 100644
--- a/app/javascript/dashboard/i18n/locale/uk/signup.json
+++ b/app/javascript/dashboard/i18n/locale/uk/signup.json
@@ -5,23 +5,24 @@
     "TERMS_ACCEPT": "Зареєструвавшись, ви погоджуєтеся з нашими <a href=\"https://www.chatwoot.com/terms\">Умовами Користування</a> та <a href=\"https://www.chatwoot.com/privacy-policy\">Політикою конфіденційності</a>",
     "ACCOUNT_NAME": {
       "LABEL": "Назва облікового запису",
-      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
-      "ERROR": "Account name is too short"
+      "PLACEHOLDER": "Введіть ім'я облікового запису; наприклад: Wayne Enterprises",
+      "ERROR": "Ім'я аккаунту закоротке"
     },
     "FULL_NAME": {
-      "LABEL": "Full name",
-      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
-      "ERROR": "Full name is too short"
+      "LABEL": "Повне ім'я",
+      "PLACEHOLDER": "Введіть ваше повне ім'я. наприклад: Bruce Wayne",
+      "ERROR": "Повне ім’я занадто коротке"
     },
     "EMAIL": {
-      "LABEL": "Work email",
-      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
-      "ERROR": "Email address is invalid"
+      "LABEL": "Робоча електронна пошта",
+      "PLACEHOLDER": "Введіть робочу адресу електронної пошти; наприклад: bruce@wayne.enterprises",
+      "ERROR": "Адреса електронної пошти недійсна"
     },
     "PASSWORD": {
       "LABEL": "Пароль",
       "PLACEHOLDER": "Пароль",
-      "ERROR": "Пароль занадто короткий"
+      "ERROR": "Пароль занадто короткий",
+      "IS_INVALID_PASSWORD": "Пароль повинен містити принаймні 1 велику літеру, хоча б 1 малу літеру, 1 цифру та 1 спеціальний символ"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Підтвердження пароля",
@@ -33,6 +34,6 @@
       "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
     },
     "SUBMIT": "Додати",
-    "HAVE_AN_ACCOUNT": "Already have an account?"
+    "HAVE_AN_ACCOUNT": "Вже маєте обліковий запис?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
index ba61d63e4..887eb4914 100644
--- a/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/teamsSettings.json
@@ -2,7 +2,7 @@
   "TEAMS_SETTINGS": {
     "NEW_TEAM": "Створити нову команду",
     "HEADER": "Команди",
-    "SIDEBAR_TXT": "<p><b>Teams</b></p> <p>Teams let you organize your agents into groups based on their responsibilities. <br /> An agent can be part of multiple teams. You can assign conversations to a team when you are working collaboratively. </p>",
+    "SIDEBAR_TXT": "<p><b>Команди</b></p> <p>команд дозволяють організовувати своїх агентів в групи на основі їх обов'язків. <br /> агент може бути частиною кількох команд. Ви можете призначити розмови команді, коли працюєте спільно. </p>",
     "LIST": {
       "404": "В цьому обліковому запису не створено жодної команди.",
       "EDIT_TEAM": "Редагувати команду"
@@ -37,25 +37,25 @@
     },
     "EDIT_FLOW": {
       "CREATE": {
-        "TITLE": "Edit your team details",
-        "DESC": "Edit title and description to your team.",
-        "BUTTON_TEXT": "Update team"
+        "TITLE": "Редагувати деталі вашої команди",
+        "DESC": "Редагуйте назву та опис вашої команди.",
+        "BUTTON_TEXT": "Оновити команду"
       },
       "AGENTS": {
-        "BUTTON_TEXT": "Update agents in team",
+        "BUTTON_TEXT": "Оновити агентів у команді",
         "TITLE": "Додати агентів до команди - %{teamName}",
-        "DESC": "Add Agents to your newly created team. All the added agents will be notified when a conversation is assigned to this team."
+        "DESC": "Додати агентів до щойно створеної команди. Всі додані агенти будуть повідомлені, коли буде присвоєна розмова в цій команді."
       },
       "WIZARD": [
         {
-          "title": "Team details",
+          "title": "Інформація про команду",
           "route": "settings_teams_edit",
-          "body": "Change name, description and other details."
+          "body": "Змінити ім'я, опис та інші деталі."
         },
         {
-          "title": "Edit Agents",
+          "title": "Редагувати агентів",
           "route": "settings_teams_edit_members",
-          "body": "Edit agents in your team."
+          "body": "Редагувати агентів у вашій команді."
         },
         {
           "title": "Закінчити",
@@ -65,61 +65,61 @@
       ]
     },
     "TEAM_FORM": {
-      "ERROR_MESSAGE": "Couldn't save the team details. Try again."
+      "ERROR_MESSAGE": "Не вдалося зберегти деталі команди. Повторіть спробу."
     },
     "AGENTS": {
-      "AGENT": "AGENT",
+      "AGENT": "АГЕНТ",
       "EMAIL": "ПОШТА",
       "BUTTON_TEXT": "Додати агентів",
-      "ADD_AGENTS": "Adding Agents to your Team...",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected."
+      "ADD_AGENTS": "Додавання агентів до команди...",
+      "SELECT": "вибрати",
+      "SELECT_ALL": "вибрати всіх агентів",
+      "SELECTED_COUNT": "%{selected} з %{total} агентів вибрано."
     },
     "ADD": {
       "TITLE": "Додати агентів до команди - %{teamName}",
       "DESC": "Додати співробітників до новоствореної команди. Це дозволить вам співпрацювати як команда в розмовах, отримувати повідомлення про нові події в тій самій розмові.",
-      "SELECT": "select",
-      "SELECT_ALL": "select all agents",
-      "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
+      "SELECT": "вибрати",
+      "SELECT_ALL": "вибрати всіх агентів",
+      "SELECTED_COUNT": "%{selected} з %{total} агентів вибрано.",
       "BUTTON_TEXT": "Додати агентів",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Виберіть принаймні одного агента."
     },
     "FINISH": {
-      "TITLE": "Your team is ready!",
-      "MESSAGE": "You can now collaborate as a team on conversations. Happy supporting ",
+      "TITLE": "Ваша команда готова!",
+      "MESSAGE": "Тепер ви можете співпрацювати як команда у розмовах. Вдалої вам підтримки ",
       "BUTTON_TEXT": "Закінчити"
     },
     "DELETE": {
       "BUTTON_TEXT": "Видалити",
       "API": {
-        "SUCCESS_MESSAGE": "Team deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the team. Try again."
+        "SUCCESS_MESSAGE": "Команда успішно видалена.",
+        "ERROR_MESSAGE": "Не вдалося видалити команду. Повторіть спробу."
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{teamName}",
-        "PLACE_HOLDER": "Please type {teamName} to confirm",
-        "MESSAGE": "Deleting the team will remove the team assignment from the conversations assigned to this team.",
+        "TITLE": "Ви впевнені, що бажаєте видалити - %{teamName}",
+        "PLACE_HOLDER": "Будь ласка, введіть {teamName} щоб підтвердити",
+        "MESSAGE": "Видалення команди призведе до видалення призначення команди з розмов.",
         "YES": "Видалити ",
         "NO": "Скасувати"
       }
     },
     "SETTINGS": "Налаштування",
     "FORM": {
-      "UPDATE": "Update team",
-      "CREATE": "Create team",
+      "UPDATE": "Оновити команду",
+      "CREATE": "Створити команду",
       "NAME": {
-        "LABEL": "Team name",
-        "PLACEHOLDER": "Example: Sales, Customer Support"
+        "LABEL": "Назва команди",
+        "PLACEHOLDER": "Приклад: продажі, Підтримка клієнтів"
       },
       "DESCRIPTION": {
-        "LABEL": "Team Description",
-        "PLACEHOLDER": "Short description about this team."
+        "LABEL": "Опис команди",
+        "PLACEHOLDER": "Короткий опис цієї команди."
       },
       "AUTO_ASSIGN": {
-        "LABEL": "Allow auto assign for this team."
+        "LABEL": "Дозволити автоматичне призначити для цієї команди."
       },
-      "SUBMIT_CREATE": "Create team"
+      "SUBMIT_CREATE": "Створити команду"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
new file mode 100644
index 000000000..46a573c42
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
new file mode 100644
index 000000000..0f965c717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
new file mode 100644
index 000000000..ff4904c34
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
@@ -0,0 +1,99 @@
+{
+  "ATTRIBUTES_MGMT": {
+    "HEADER": "Custom Attributes",
+    "HEADER_BTN_TXT": "Add Custom Attribute",
+    "LOADING": "Fetching custom attributes",
+    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "ADD": {
+      "TITLE": "Add Custom Attribute",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Display Name",
+          "PLACEHOLDER": "Enter custom attribute display name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter custom attribute description",
+          "ERROR": "Description is required"
+        },
+        "MODEL": {
+          "LABEL": "Applies to",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Model is required"
+        },
+        "TYPE": {
+          "LABEL": "Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Type is required",
+          "LIST": {
+            "LABEL": "List Values",
+            "PLACEHOLDER": "Please enter value and press enter key",
+            "ERROR": "Must have at least one value"
+          }
+        },
+        "KEY": {
+          "LABEL": "Key",
+          "PLACEHOLDER": "Enter custom attribute key",
+          "ERROR": "Key is required",
+          "IN_VALID": "Invalid key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
+        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{attributeName}",
+        "PLACE_HOLDER": "Please type {attributeName} to confirm",
+        "MESSAGE": "Deleting will remove the custom attribute",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Custom Attribute",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "TYPE": {
+        "LIST": {
+          "LABEL": "List Values",
+          "PLACEHOLDER": "Please enter values and press enter key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+      }
+    },
+    "TABS": {
+      "HEADER": "Custom Attributes",
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Type",
+        "Key"
+      ],
+      "BUTTONS": {
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "EMPTY_RESULT": {
+        "404": "There are no custom attributes created",
+        "NOT_FOUND": "There are no custom attributes configured"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/automation.json b/app/javascript/dashboard/i18n/locale/ur/automation.json
new file mode 100644
index 000000000..5d291814e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/automation.json
@@ -0,0 +1,116 @@
+{
+  "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"
+    },
+    "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": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/campaign.json b/app/javascript/dashboard/i18n/locale/ur/campaign.json
new file mode 100644
index 000000000..bbcc463ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json
new file mode 100644
index 000000000..9c14f5a52
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/chatlist.json b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
new file mode 100644
index 000000000..e3d637b71
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
@@ -0,0 +1,87 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "Fetching conversations",
+    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
+    "EOF": "All conversations loaded 🎉",
+    "LIST": {
+      "404": "There are no active conversations in this group."
+    },
+    "TAB_HEADING": "Conversations",
+    "MENTION_HEADING": "Mentions",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "FILTER_ALL": "All",
+    "STATUS_TABS": [
+      {
+        "NAME": "Open",
+        "KEY": "openCount"
+      },
+      {
+        "NAME": "Resolved",
+        "KEY": "allConvCount"
+      }
+    ],
+    "ASSIGNEE_TYPE_TABS": [
+      {
+        "NAME": "Mine",
+        "KEY": "me",
+        "COUNT_KEY": "mineCount"
+      },
+      {
+        "NAME": "Unassigned",
+        "KEY": "unassigned",
+        "COUNT_KEY": "unAssignedCount"
+      },
+      {
+        "NAME": "All",
+        "KEY": "all",
+        "COUNT_KEY": "allCount"
+      }
+    ],
+    "CHAT_STATUS_FILTER_ITEMS": {
+      "open": {
+        "TEXT": "Open"
+      },
+      "resolved": {
+        "TEXT": "Resolved"
+      },
+      "pending": {
+        "TEXT": "Pending"
+      },
+      "snoozed": {
+        "TEXT": "Snoozed"
+      }
+    },
+    "ATTACHMENTS": {
+      "image": {
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "CONTENT": "has shared a url"
+      }
+    },
+    "RECEIVED_VIA_EMAIL": "Received via email",
+    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
+    "REPLY_TO_TWEET": "Reply to this tweet",
+    "LINK_TO_STORY": "Go to instagram story",
+    "SENT": "Sent 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/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
new file mode 100644
index 000000000..2257b4573
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -0,0 +1,338 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "Email Address",
+    "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "CONVERSATION_TITLE": "Conversation Details",
+    "VIEW_PROFILE": "View Profile",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "IP_ADDRESS": "IP Address",
+    "NEW_MESSAGE": "New message",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
+      },
+      "LABEL_SELECT": {
+        "TITLE": "Add Labels",
+        "PLACEHOLDER": "Search labels",
+        "NO_RESULT": "No labels found"
+      }
+    },
+    "MERGE_CONTACT": "Merge contact",
+    "CONTACT_ACTIONS": "Contact actions",
+    "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "Send Transcript",
+    "EDIT_LABEL": "Edit",
+    "SIDEBAR_SECTIONS": {
+      "CUSTOM_ATTRIBUTES": "Custom Attributes",
+      "CONTACT_LABELS": "Contact Labels",
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+    }
+  },
+  "EDIT_CONTACT": {
+    "BUTTON_LABEL": "Edit Contact",
+    "TITLE": "Edit contact",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "IMPORT_CONTACTS": {
+    "BUTTON_LABEL": "Import",
+    "TITLE": "Import Contacts",
+    "DESC": "Import contacts through a CSV file.",
+    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "FORM": {
+      "LABEL": "CSV File",
+      "SUBMIT": "Import",
+      "CANCEL": "Cancel"
+    },
+    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "DELETE_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."
+      },
+      "PHONE_NUMBER": {
+        "PLACEHOLDER": "Enter the phone number of the contact",
+        "LABEL": "Phone Number",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Phone number should be either empty or of E.164 format",
+        "DUPLICATE": "This phone number is in use for another contact."
+      },
+      "LOCATION": {
+        "PLACEHOLDER": "Enter the location of the contact",
+        "LABEL": "Location"
+      },
+      "COMPANY_NAME": {
+        "PLACEHOLDER": "Enter the company name",
+        "LABEL": "Company Name"
+      },
+      "SOCIAL_PROFILES": {
+        "FACEBOOK": {
+          "PLACEHOLDER": "Enter the Facebook username",
+          "LABEL": "Facebook"
+        },
+        "TWITTER": {
+          "PLACEHOLDER": "Enter the Twitter username",
+          "LABEL": "Twitter"
+        },
+        "LINKEDIN": {
+          "PLACEHOLDER": "Enter the LinkedIn username",
+          "LABEL": "LinkedIn"
+        },
+        "GITHUB": {
+          "PLACEHOLDER": "Enter the Github username",
+          "LABEL": "Github"
+        }
+      }
+    },
+    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "NEW_CONVERSATION": {
+    "BUTTON_LABEL": "Start conversation",
+    "TITLE": "New conversation",
+    "DESC": "Start a new conversation by sending a new message.",
+    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "FORM": {
+      "TO": {
+        "LABEL": "To"
+      },
+      "INBOX": {
+        "LABEL": "Inbox",
+        "ERROR": "Select an inbox"
+      },
+      "SUBJECT": {
+        "LABEL": "Subject",
+        "PLACEHOLDER": "Subject",
+        "ERROR": "Subject can't be empty"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Write your message here",
+        "ERROR": "Message can't be empty"
+      },
+      "SUBMIT": "Send message",
+      "CANCEL": "Cancel",
+      "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
+      "ERROR_MESSAGE": "Couldn't send! try again"
+    }
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "FIELDS": "Contact fields",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "NO_CONTACTS": "There are no available contacts",
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
+    }
+  },
+  "CONTACT_PROFILE": {
+    "BACK_BUTTON": "Contacts",
+    "LOADING": "Loading contact profile..."
+  },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "FETCHING_NOTES": "Fetching notes...",
+    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "HEADER": {
+      "TITLE": "Notes"
+    },
+    "LIST": {
+      "LABEL": "added a note"
+    },
+    "ADD": {
+      "BUTTON": "Add",
+      "PLACEHOLDER": "Add a note",
+      "TITLE": "Shift + Enter to create a note"
+    },
+    "CONTENT_HEADER": {
+      "DELETE": "Delete note"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Add attributes",
+    "BUTTON": "Add custom attribute",
+    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "ACTIONS": {
+      "COPY": "Copy attribute",
+      "DELETE": "Delete attribute",
+      "EDIT": "Edit attribute"
+    },
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      },
+      "ADD": {
+        "TITLE": "Create new attribute ",
+        "SUCCESS": "Attribute added successfully",
+        "ERROR": "Unable to add attribute. Please try again later"
+      },
+      "UPDATE": {
+        "SUCCESS": "Attribute updated successfully",
+        "ERROR": "Unable to update attribute. Please try again later"
+      },
+      "DELETE": {
+        "SUCCESS": "Attribute deleted successfully",
+        "ERROR": "Unable to delete attribute. Please try again later"
+      },
+      "ATTRIBUTE_SELECT": {
+        "TITLE": "Add attributes",
+        "PLACEHOLDER": "Search attributes",
+        "NO_RESULT": "No attributes found"
+      },
+      "ATTRIBUTE_TYPE": {
+        "LIST": {
+          "PLACEHOLDER": "Select value",
+          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "NO_RESULT": "No result found"
+        }
+      }
+    },
+    "VALIDATIONS": {
+      "REQUIRED": "Valid value is required",
+      "INVALID_URL": "Invalid URL"
+    }
+  },
+  "MERGE_CONTACTS": {
+    "TITLE": "Merge contacts",
+    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "PRIMARY": {
+      "TITLE": "Primary contact",
+      "HELP_LABEL": "To be kept"
+    },
+    "CHILD": {
+      "TITLE": "Contact to merge",
+      "PLACEHOLDER": "Search for a contact",
+      "HELP_LABEL": "To be deleted"
+    },
+    "SUMMARY": {
+      "TITLE": "Summary",
+      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+    },
+    "SEARCH": {
+      "ERROR": "ERROR_MESSAGE"
+    },
+    "FORM": {
+      "SUBMIT": " Merge contacts",
+      "CANCEL": "Cancel",
+      "CHILD_CONTACT": {
+        "ERROR": "Select a child contact to merge"
+      },
+      "SUCCESS_MESSAGE": "Contact merged successfully",
+      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/contactFilters.json b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
new file mode 100644
index 000000000..bd58ccf3e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
@@ -0,0 +1,49 @@
+{
+    "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"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
new file mode 100644
index 000000000..ac25a5aed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -0,0 +1,204 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "RESULT_TITLE": "Search Results",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "No results found."
+    },
+    "UNREAD_MESSAGES": "Unread Messages",
+    "UNREAD_MESSAGE": "Unread Message",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
+    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "Download",
+    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
+    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "NO_RESPONSE": "No response",
+    "RATING_TITLE": "Rating",
+    "FEEDBACK_TITLE": "Feedback",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN_ACTION": "Open",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+    },
+    "RESOLVE_DROPDOWN": {
+      "MARK_PENDING": "Mark as pending",
+      "SNOOZE": {
+        "TITLE": "Snooze until",
+        "NEXT_REPLY": "Next reply",
+        "TOMORROW": "Tomorrow",
+        "NEXT_WEEK": "Next week"
+      }
+    },
+    "FOOTER": {
+      "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",
+      "ENTER_TO_SEND": "Enter to send",
+      "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"
+        }
+      }
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
+    "ASSIGNMENT": {
+      "SELECT_AGENT": "Select Agent",
+      "REMOVE": "Remove",
+      "ASSIGN": "Assign"
+    },
+    "CONTEXT_MENU": {
+      "COPY": "Copy",
+      "DELETE": "Delete"
+    }
+  },
+  "EMAIL_TRANSCRIPT": {
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "Submit",
+    "CANCEL": "Cancel",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "FORM": {
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "EMAIL": {
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
+      }
+    }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    },
+    "ACCORDION": {
+      "CONTACT_DETAILS": "Contact Details",
+      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONVERSATION_LABELS": "Conversation Labels",
+      "CONVERSATION_INFO": "Conversation Information",
+      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "PREVIOUS_CONVERSATION": "Previous Conversations"
+    }
+  },
+  "CONVERSATION_CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Create attribute",
+    "UPDATE": {
+      "SUCCESS": "Attribute updated successfully",
+      "ERROR": "Unable to update attribute. Please try again later"
+    },
+    "ADD": {
+      "TITLE": "Add",
+      "SUCCESS": "Attribute added successfully",
+      "ERROR": "Unable to add attribute. Please try again later"
+    },
+    "DELETE": {
+      "SUCCESS": "Attribute deleted successfully",
+      "ERROR": "Unable to delete attribute. Please try again later"
+    },
+    "ATTRIBUTE_SELECT": {
+      "TITLE": "Add attributes",
+      "PLACEHOLDER": "Search attributes",
+      "NO_RESULT": "No attributes found"
+    }
+  },
+  "EMAIL_HEADER": {
+    "FROM": "From",
+    "TO": "To",
+    "BCC": "Bcc",
+    "CC": "Cc",
+    "SUBJECT": "Subject"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/csatMgmt.json b/app/javascript/dashboard/i18n/locale/ur/csatMgmt.json
new file mode 100644
index 000000000..d7d2efc2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/csatMgmt.json
@@ -0,0 +1,6 @@
+{
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "PLACEHOLDER": "Tell us more..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
new file mode 100644
index 000000000..5a0c4f7d7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -0,0 +1,140 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Account settings",
+    "SUBMIT": "Update settings",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Could not update settings, try again!",
+      "SUCCESS": "Successfully updated account settings"
+    },
+    "FORM": {
+      "ERROR": "Please fix form errors",
+      "GENERAL_SECTION": {
+        "TITLE": "General settings",
+        "NOTE": ""
+      },
+      "ACCOUNT_ID": {
+        "TITLE": "Account ID",
+        "NOTE": "This ID is required if you are building an API based integration"
+      },
+      "NAME": {
+        "LABEL": "Account name",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": "Please enter a valid account name"
+      },
+      "LANGUAGE": {
+        "LABEL": "Site language (Beta)",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Incoming Email Domain",
+        "PLACEHOLDER": "The domain where you will receive the emails",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+      },
+      "FEATURES": {
+        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+      }
+    },
+    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
+    "LEARN_MORE": "Learn more"
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "Notifications",
+    "MARK_ALL_DONE": "Mark All Done",
+    "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",
+      "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"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
new file mode 100644
index 000000000..bda8ea1ef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -0,0 +1,545 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inboxes",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "LIST": {
+      "404": "There are no inboxes attached to this account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Choose Channel",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Create Inbox",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Add Agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "You are all set to go!"
+      }
+    ],
+    "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
+      "FB": {
+        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
+        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PLACEHOLDER": "Select a page from the list",
+        "INBOX_NAME": "Inbox Name",
+        "ADD_NAME": "Add a name for your inbox",
+        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_A_VALUE": "Pick a value"
+      },
+      "TWITTER": {
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "TWEETS": {
+          "ENABLE": "Create conversations from mentioned Tweets"
+        }
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Website channel",
+        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Enter your Webhook URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Website Domain",
+          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Welcome Heading",
+          "PLACEHOLDER": "Hi there !"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget Color",
+          "PLACEHOLDER": "Update the widget color used in widget"
+        },
+        "SUBMIT_BUTTON": "Create inbox"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/WhatsApp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Account SID",
+          "PLACEHOLDER": "Please enter your Twilio Account SID",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Please enter your Twilio Auth Token",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter a inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+        }
+      },
+      "SMS": {
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
+      },
+      "WHATSAPP": {
+        "TITLE": "WhatsApp Channel",
+        "DESC": "Start supporting your customers via WhatsApp.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "360_DIALOG": "360Dialog"
+        },
+        "INBOX_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_KEY": {
+          "LABEL": "API key",
+          "SUBTITLE": "Configure the WhatsApp API key.",
+          "PLACEHOLDER": "API key",
+          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
+          "ERROR": "Please enter a valid value."
+        },
+        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+        }
+      },
+      "API_CHANNEL": {
+        "TITLE": "API Channel",
+        "DESC": "Integrate with API channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "PLACEHOLDER": "Webhook URL"
+        },
+        "SUBMIT_BUTTON": "Create API Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the api channel"
+        }
+      },
+      "EMAIL_CHANNEL": {
+        "TITLE": "Email Channel",
+        "DESC": "Integrate you email inbox.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email",
+          "SUBTITLE": "Email where your customers sends you support tickets",
+          "PLACEHOLDER": "Email"
+        },
+        "SUBMIT_BUTTON": "Create Email Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the email channel"
+        },
+        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+      },
+      "LINE_CHANNEL": {
+        "TITLE": "LINE Channel",
+        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "LINE_CHANNEL_ID": {
+          "LABEL": "LINE Channel ID",
+          "PLACEHOLDER": "LINE Channel ID"
+        },
+        "LINE_CHANNEL_SECRET": {
+          "LABEL": "LINE Channel Secret",
+          "PLACEHOLDER": "LINE Channel Secret"
+        },
+        "LINE_CHANNEL_TOKEN": {
+          "LABEL": "LINE Channel Token",
+          "PLACEHOLDER": "LINE Channel Token"
+        },
+        "SUBMIT_BUTTON": "Create LINE Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+        }
+      },
+      "TELEGRAM_CHANNEL": {
+        "TITLE": "Telegram Channel",
+        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "BOT_TOKEN": {
+          "LABEL": "Bot Token",
+          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "PLACEHOLDER": "Bot Token"
+        },
+        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Choose a channel",
+        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+      },
+      "AGENTS": {
+        "TITLE": "Agents",
+        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
+        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "PICK_AGENTS": "Pick agents for the inbox"
+      },
+      "DETAILS": {
+        "TITLE": "Inbox Details",
+        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+      },
+      "FINISH": {
+        "TITLE": "Nailed It!",
+        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Authenticating you with Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Creating your Inbox...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Inbox..."
+    },
+    "FINISH": {
+      "TITLE": "Your Inbox is ready!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "BUTTON_TEXT": "Take me there",
+      "MORE_SETTINGS": "More settings",
+      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+    },
+    "REAUTH": "Reauthorize",
+    "VIEW": "View",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
+        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CSAT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_HMAC": {
+        "LABEL": "Enable"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later.",
+        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
+        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+      }
+    },
+    "TABS": {
+      "SETTINGS": "Settings",
+      "COLLABORATORS": "Collaborators",
+      "CONFIGURATION": "Configuration",
+      "CAMPAIGN": "Campaigns",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
+    },
+    "SETTINGS": "Settings",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
+      "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",
+      "UPDATE": "Update",
+      "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
+      "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "ENABLE_CSAT": "Enable CSAT",
+      "ENABLE_CSAT_SUB_TEXT": "Enable/Disable CSAT(Customer satisfaction) survey after resolving a conversation",
+      "ENABLE_CONTINUITY_VIA_EMAIL": "Enable conversation continuity via email",
+      "ENABLE_CONTINUITY_VIA_EMAIL_SUB_TEXT": "Conversations will continue over email if the contact email address is available.",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
+      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
+      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
+      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
+      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "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"
+    },
+    "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: "
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrationApps.json b/app/javascript/dashboard/i18n/locale/ur/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
new file mode 100644
index 000000000..774514a9d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -0,0 +1,89 @@
+{
+  "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"
+          }
+        },
+        "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>"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json
new file mode 100644
index 000000000..db12fa32a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/login.json b/app/javascript/dashboard/i18n/locale/ur/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Login to Chatwoot",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Email eg: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
+    },
+    "FORGOT_PASSWORD": "Forgot your password?",
+    "CREATE_NEW_ACCOUNT": "Create new account",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
new file mode 100644
index 000000000..566099afe
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -0,0 +1,445 @@
+{
+  "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",
+    "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.",
+    "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"
+    },
+    "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"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/resetPassword.json b/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
new file mode 100644
index 000000000..ec2d94744
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
new file mode 100644
index 000000000..00a18d8ed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -0,0 +1,236 @@
+{
+  "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."
+      },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices.",
+        "BTN_TEXT": "Change password"
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "NONE": "None",
+        "ASSIGNED": "Assigned Conversations",
+        "ALL_CONVERSATIONS": "All Conversations"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Email Notifications",
+        "NOTE": "Update your email notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Push Notifications",
+        "NOTE": "Update your push notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your full name",
+        "ERROR": "Please enter a valid full name",
+        "PLACEHOLDER": "Please enter your full name"
+      },
+      "DISPLAY_NAME": {
+        "LABEL": "Display name",
+        "ERROR": "Please enter a valid display name",
+        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          "Online",
+          "Busy",
+          "Offline"
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Your email address",
+        "ERROR": "Please enter a valid email address",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
+      "PASSWORD": {
+        "LABEL": "New password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your new password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "CONTACT_SUPPORT": "Contact Support",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now",
+    "DELETED_USER": "Deleted User"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "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",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "CONTACTS": "Contacts",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "NOTIFICATIONS": "Notifications",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
+    "LABELS": "Labels",
+    "CUSTOM_ATTRIBUTES": "Custom Attributes",
+    "AUTOMATION": "Automation",
+    "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
+    "ALL_CONTACTS": "All Contacts",
+    "TAGGED_WITH": "Tagged with",
+    "NEW_LABEL": "New label",
+    "NEW_TEAM": "New team",
+    "NEW_INBOX": "New inbox",
+    "REPORTS_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"
+  },
+  "CREATE_ACCOUNT": {
+    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NEW_ACCOUNT": "New Account",
+    "SELECTOR_SUBTITLE": "Create a new account",
+    "API": {
+      "SUCCESS_MESSAGE": "Account created successfully",
+      "EXIST_MESSAGE": "Account already exists",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Account Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "Submit"
+    }
+  },
+  "KEYBOARD_SHORTCUTS": {
+    "TITLE": {
+      "OPEN_CONVERSATION": "Open conversation",
+      "RESOLVE_AND_NEXT": "Resolve and move to next",
+      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
+      "RESOLVE_CONVERSATION": "Resolve Conversation",
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "ADD_ATTACHMENT": "Add Attachment",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "TOGGLE_SIDEBAR": "Toggle Sidebar",
+      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
+      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
+      "GO_TO_SETTINGS": "Go to Settings",
+      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
+      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
+      "SWITCH_TO_REPLY": "Switch to Reply",
+      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+    },
+    "KEYS": {
+      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
+      "ALT_OR_OPTION_KEY": "Alt / ⌥",
+      "FORWARD_SLASH_KEY": "/"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/signup.json b/app/javascript/dashboard/i18n/locale/ur/signup.json
new file mode 100644
index 000000000..8dd5c0d4e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/signup.json
@@ -0,0 +1,39 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Register an account",
+    "TITLE": "Register",
+    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Account name",
+      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
+      "ERROR": "Account name is too short"
+    },
+    "FULL_NAME": {
+      "LABEL": "Full name",
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Work email",
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Email address is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short",
+      "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": "Submit",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json
new file mode 100644
index 000000000..f9ecaaaae
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur/webhooks.json b/app/javascript/dashboard/i18n/locale/ur/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
index 010d24ffc..c3763b79b 100644
--- a/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/vi/advancedFilters.json
@@ -25,8 +25,8 @@
       "days_before": "Is x days before"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "Đúng",
+      "FALSE": "Sai"
     },
     "ATTRIBUTES": {
       "STATUS": "Trạng thái",
diff --git a/app/javascript/dashboard/i18n/locale/vi/automation.json b/app/javascript/dashboard/i18n/locale/vi/automation.json
index b4a15035b..ac127a1b8 100644
--- a/app/javascript/dashboard/i18n/locale/vi/automation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "Bạn cần có ít nhất một điều kiện để lưu"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "Bạn cần có ít nhất một hành động để lưu"
+      "DELETE_MESSAGE": "Bạn cần có ít nhất một hành động để lưu",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Activate Automation Rule",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "Có",
       "CANCEL_LABEL": "Không"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "Đang tải lên...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
index d5bcae48a..376ad5608 100644
--- a/app/javascript/dashboard/i18n/locale/vi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "Không có tin nhắn",
     "NO_CONTENT": "Không có nội dung",
     "HIDE_QUOTED_TEXT": "Ẩn văn bản được trích dẫn",
-    "SHOW_QUOTED_TEXT": "Hiện Văn bản được trích dẫn"
+    "SHOW_QUOTED_TEXT": "Hiện Văn bản được trích dẫn",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
index dc2702b95..1b11235b0 100644
--- a/app/javascript/dashboard/i18n/locale/vi/contact.json
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "Liên hệ được lưu thành công",
     "ERROR_MESSAGE": "Đã có lỗi, vui lòng thử lại"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "Xác nhận xoá",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "Không, Giữ"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "Xoá liên lạc",
     "TITLE": "Xoá liên lạc",
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
index 394234587..6d3f8f6ec 100644
--- a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Thông báo",
     "MARK_ALL_DONE": "Đánh dấu tất cả đã xong",
+    "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": "Đang tải thông báo...",
       "404": "Không có thông báo",
@@ -101,6 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Đi tới Trang tổng quan cuộc trò chuyện",
       "GO_TO_CONTACTS_DASHBOARD": "Đi tới Trang tổng quan liên hệ",
       "GO_TO_REPORTS_OVERVIEW": "Đi đến Tổng quan Báo cáo",
+      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
       "GO_TO_AGENT_REPORTS": "Đi đến Báo cáo Đại lý",
       "GO_TO_LABEL_REPORTS": "Đi đến Báo cáo Nhãn",
       "GO_TO_INBOX_REPORTS": "Đi đến Báo cáo Hộp thư đến",
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 771ce5eed..93d9fb2e3 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Các tính năng",
       "DISPLAY_FILE_PICKER": "Hiển thị bộ chọn tệp trên tiện ích con",
-      "DISPLAY_EMOJI_PICKER": "Hiển thị bộ chọn biểu tượng cảm xúc trên tiện ích con"
+      "DISPLAY_EMOJI_PICKER": "Hiển thị bộ chọn biểu tượng cảm xúc trên tiện ích con",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Tập lệnh Messenger",
@@ -431,6 +432,15 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Biểu mẫu trước khi trò chuyện cho phép bạn nắm bắt thông tin người dùng trước khi họ bắt đầu cuộc trò chuyện với bạn.",
+      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS_HEADER": {
+        "FIELDS": "Fields",
+        "LABEL": "Label",
+        "PLACE_HOLDER": "Placeholder",
+        "KEY": "Khoá",
+        "TYPE": "Loại",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Bật biểu mẫu trước khi trò chuyện",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Tin nhắn trước khi trò chuyện",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "Tin nhắn này sẽ hiện cho những người dùng cùng với biểu mẫu"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Đặt chi tiết IMAP",
+      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
       "UPDATE": "Cập nhật chi tiết IMAP",
       "TOGGLE_AVAILABILITY": "Kích hoạt cấu hình IMAP cho hộp thư đến này",
       "TOGGLE_HELP": "Kích hoạt IMAP sẽ giúp cho người dùng nhận được email",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Thư điện tử",
-        "PLACE_HOLDER": "Thư điện tử"
+      "LOGIN": {
+        "LABEL": "Đăng nhập",
+        "PLACE_HOLDER": "Đăng nhập"
       },
       "PASSWORD": {
         "LABEL": "Mật khẩu",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Thư điện tử",
-        "PLACE_HOLDER": "Thư điện tử"
+      "LOGIN": {
+        "LABEL": "Đăng nhập",
+        "PLACE_HOLDER": "Đăng nhập"
       },
       "PASSWORD": {
         "LABEL": "Mật khẩu",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Mã hoá",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Mở Chế độ xác minh SSL"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Mở Chế độ xác minh SSL",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
index 81250e91d..97af1e32b 100644
--- a/app/javascript/dashboard/i18n/locale/vi/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Tích hợp",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "Huỷ",
+        "DESC": "Webhook events cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản Chatwoot của bạn. Vui lòng nhập một URL hợp lệ để định cấu hình một cuộc gọi lại.",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Ví dụ: https://example/api/webhook",
+          "ERROR": "Vui lòng nhập một URL hợp lệ"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "Tạo webhook"
+      },
       "TITLE": "Webhook",
       "CONFIGURE": "Cấu hình",
       "HEADER": "Cài đặt Webhook",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "Chỉnh sửa",
         "TITLE": "Sửa webhook",
-        "CANCEL": "Huỷ",
-        "DESC": "Webhook events cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản Chatwoot của bạn. Vui lòng nhập một URL hợp lệ để định cấu hình một cuộc gọi lại.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Ví dụ: https://example/api/webhook",
-            "ERROR": "Vui lòng nhập một URL hợp lệ"
-          },
-          "SUBMIT": "Sửa webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL cập nhật thành công",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
         }
       },
       "ADD": {
         "CANCEL": "Xoá",
         "TITLE": "Thêm mới webhook",
-        "DESC": "Webhook events cung cấp cho bạn thông tin thời gian thực về những gì đang xảy ra trong tài khoản Chatwoot của bạn. Vui lòng nhập một URL hợp lệ để định cấu hình một cuộc gọi lại.",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook URL",
-            "PLACEHOLDER": "Ví dụ: https://example/api/webhook",
-            "ERROR": "Vui lòng nhập một URL hợp lệ"
-          },
-          "SUBMIT": "Tạo webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook đã được thêm thành công",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Xác Nhận Xoá",
-          "MESSAGE": "Bạn có chắc muốn xoá? ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "Có, Xoá ",
           "NO": "Không, Giữ"
         }
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index ec66bc843..a33e0c94a 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Tổng quan",
+    "HEADER": "Các cuộc hội thoại",
     "LOADING_CHART": "Đang tải các biểu đồ dữ liệu...",
     "NO_ENOUGH_DATA": "Chúng tôi không nhận được đủ điểm dữ liệu để tạo báo cáo, Vui lòng thử lại sau.",
     "DOWNLOAD_AGENT_REPORTS": "Tải xuống báo cáo đại lý",
@@ -18,12 +18,16 @@
         "DESC": "( Tổng cộng )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Thời gian phản hồi đầu tiên",
-        "DESC": "( Trung bình )"
+        "NAME": "First Response Time",
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Thời gian giải quyết",
-        "DESC": "( Trung bình )"
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Số lượng giải quyết",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Năm"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Giờ làm việc"
   },
   "AGENT_REPORTS": {
     "HEADER": "Tổng quan đại lý",
@@ -130,12 +135,16 @@
         "DESC": "( Tổng cộng )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Thời gian phản hồi đầu tiên",
-        "DESC": "( Trung bình )"
+        "NAME": "First Response Time",
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Thời gian giải quyết",
-        "DESC": "( Trung bình )"
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Số lượng giải quyết",
@@ -193,12 +202,16 @@
         "DESC": "( Tổng cộng )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Thời gian phản hồi đầu tiên",
-        "DESC": "( Trung bình )"
+        "NAME": "First Response Time",
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Thời gian giải quyết",
-        "DESC": "( Trung bình )"
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Số lượng giải quyết",
@@ -256,12 +269,16 @@
         "DESC": "( Tổng cộng )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Thời gian phản hồi đầu tiên",
-        "DESC": "( Trung bình )"
+        "NAME": "First Response Time",
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Thời gian giải quyết",
-        "DESC": "( Trung bình )"
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Số lượng giải quyết",
@@ -319,12 +336,16 @@
         "DESC": "( Tổng cộng )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "Thời gian phản hồi đầu tiên",
-        "DESC": "( Trung bình )"
+        "NAME": "First Response Time",
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Thời gian giải quyết",
-        "DESC": "( Trung bình )"
+        "DESC": "( Trung bình )",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Số lượng giải quyết",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Tổng số phản hồi / Tổng số tin nhắn khảo sát CSAT đã gửi * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "Tổng quan",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "Mở",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "Chưa được phân công"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "Nhà cung cấp",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "Trạng thái"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "Trực Tuyến",
+      "BUSY": "Bận",
+      "OFFLINE": "Không Trực Tuyến"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
index 23ad19b54..6f697ac07 100644
--- a/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "Đổi mật khẩu thành công",
       "ERROR_MESSAGE": "Không thể kết nối với Máy chủ Woot, Vui lòng thử lại sau"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "Gửi"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index 3f139e770..cdc85623d 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "Sao Chép",
       "COPY_SUCCESSFUL": "Đã sao chép mã thành công"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Tải xuống",
       "UPLOADING": "Đang tải lên..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "Cuộc trò chuyện",
     "ALL_CONVERSATIONS": "Tất cả cuộc trò chuyện",
     "MENTIONED_CONVERSATIONS": "Nhắn đến",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "Nhãn mới",
     "NEW_TEAM": "Nhóm mới",
     "NEW_INBOX": "Hộp thư đến mới",
-    "REPORTS_OVERVIEW": "Tổng quan",
+    "REPORTS_CONVERSATION": "Các cuộc hội thoại",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Chiến dịch",
     "ONGOING": "Đang diễn ra",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Hộp thư đến",
     "REPORTS_TEAM": "Nhóm",
     "SET_AVAILABILITY_TITLE": "Đặt chính mình như",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Tổng quan"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ồ ồ! Chúng tôi không thể tìm thấy bất kỳ tài khoản Chatwoot nào. Vui lòng tạo một tài khoản mới để tiếp tục.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/signup.json b/app/javascript/dashboard/i18n/locale/vi/signup.json
index a3e4828c0..fcb43d716 100644
--- a/app/javascript/dashboard/i18n/locale/vi/signup.json
+++ b/app/javascript/dashboard/i18n/locale/vi/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "Mật khẩu",
       "PLACEHOLDER": "Mật khẩu",
-      "ERROR": "Mật khẩu quá ngắn"
+      "ERROR": "Mật khẩu quá ngắn",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Xác nhận mật khẩu",
diff --git a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
index a1e7fe008..1914823fb 100644
--- a/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "chọn tất cả đại lý",
       "SELECTED_COUNT": "%{selected} trên %{total} đại lý được chọn.",
       "BUTTON_TEXT": "Thêm các nhà cung cấp",
-      "AGENT_VALIDATION_ERROR": "Chọn ít nhất một đại lý."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Nhóm của bạn đã sẵn sàng!",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
index 98da304c9..39c814191 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
@@ -57,7 +57,7 @@
         "TITLE": "Do you want to save this filter?",
         "LABEL": "Name this filter",
         "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
+        "ERROR_MESSAGE": "名字必填",
         "SAVE_BUTTON": "Save filter",
         "CANCEL_BUTTON": "取消",
         "API_FOLDERS": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
index 222a940d7..b1d468b67 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
@@ -1,18 +1,18 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "自定义属性",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
+    "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>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "添加自定义属性",
       "SUBMIT": "创建",
       "CANCEL_BUTTON_TEXT": "取消",
       "FORM": {
         "NAME": {
-          "LABEL": "Display Name",
-          "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Name is required"
+          "LABEL": "展示名",
+          "PLACEHOLDER": "输入自定义属性展示名称",
+          "ERROR": "名字必填"
         },
         "DESC": {
           "LABEL": "描述信息",
@@ -20,12 +20,12 @@
           "ERROR": "Description is required"
         },
         "MODEL": {
-          "LABEL": "Applies to",
-          "PLACEHOLDER": "Please select one",
+          "LABEL": "应用到",
+          "PLACEHOLDER": "请选择一个",
           "ERROR": "Model is required"
         },
         "TYPE": {
-          "LABEL": "Type",
+          "LABEL": "类型",
           "PLACEHOLDER": "请选择一个类型",
           "ERROR": "Type is required",
           "LIST": {
@@ -35,10 +35,10 @@
           }
         },
         "KEY": {
-          "LABEL": "Key",
+          "LABEL": "键",
           "PLACEHOLDER": "Enter custom attribute key",
-          "ERROR": "Key is required",
-          "IN_VALID": "Invalid key"
+          "ERROR": "键是必需的",
+          "IN_VALID": "无效键"
         }
       },
       "API": {
@@ -77,7 +77,7 @@
     "TABS": {
       "HEADER": "自定义属性",
       "CONVERSATION": "Conversation",
-      "CONTACT": "Contact"
+      "CONTACT": "联系人"
     },
     "LIST": {
       "TABLE_HEADER": [
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index 96ed4339b..cbb17c275 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -12,7 +12,7 @@
         "NAME": {
           "LABEL": "Rule Name",
           "PLACEHOLDER": "Enter rule name",
-          "ERROR": "Name is required"
+          "ERROR": "名字必填"
         },
         "DESC": {
           "LABEL": "描述信息",
@@ -21,7 +21,7 @@
         },
         "EVENT": {
           "LABEL": "Event",
-          "PLACEHOLDER": "Please select one",
+          "PLACEHOLDER": "请选择一个",
           "ERROR": "Event is required"
         },
         "CONDITIONS": {
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "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": "上传中...",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index ab6529418..76beb060a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -7,7 +7,7 @@
       "404": "没有有效的对话在这个群组里面"
     },
     "TAB_HEADING": "会话",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "提及",
     "SEARCH": {
       "INPUT": "搜索人、聊天室、保存回复"
     },
@@ -76,11 +76,12 @@
     "RECEIVED_VIA_EMAIL": "通过电子邮件接收",
     "VIEW_TWEET_IN_TWITTER": "在 Twitter 中查看 tweet",
     "REPLY_TO_TWEET": "回复此推文",
-    "LINK_TO_STORY": "Go to instagram story",
-    "SENT": "Sent successfully",
+    "LINK_TO_STORY": "查看 Instagram 故事",
+    "SENT": "发送成功",
     "NO_MESSAGES": "没有信息",
     "NO_CONTENT": "没有可用的内容",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text"
+    "HIDE_QUOTED_TEXT": "隐藏引用文字",
+    "SHOW_QUOTED_TEXT": "显示引用文字",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 22b61ed97..8976fdfff 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "公司",
     "LOCATION": "位置",
     "CONVERSATION_TITLE": "对话详情",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "查看资料",
     "BROWSER": "浏览器",
     "OS": "操作系统",
     "INITIATED_FROM": "启动自：",
@@ -33,8 +33,8 @@
         "NO_RESULT": "未找到标签"
       }
     },
-    "MERGE_CONTACT": "Merge contact",
-    "CONTACT_ACTIONS": "Contact actions",
+    "MERGE_CONTACT": "合并联系人",
+    "CONTACT_ACTIONS": "联系人操作",
     "MUTE_CONTACT": "开始会话",
     "UNMUTE_CONTACT": "取消静音",
     "MUTED_SUCCESS": "此对话被静音6小时",
@@ -58,22 +58,30 @@
     "DESC": "添加联系人的基本信息。"
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "导入",
+    "TITLE": "导入联系人",
+    "DESC": "通过 CSV 文件导入联系人",
+    "DOWNLOAD_LABEL": "下载示例 CSV.",
     "FORM": {
-      "LABEL": "CSV File",
-      "SUBMIT": "Import",
+      "LABEL": "CSV 文件",
+      "SUBMIT": "导入",
       "CANCEL": "取消"
     },
     "SUCCESS_MESSAGE": "Contacts saved successfully",
     "ERROR_MESSAGE": "出现错误，请重试"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "确认删除",
+      "MESSAGE": "您确定要删除此笔记吗？",
+      "YES": "是的，删除",
+      "NO": "否，保留它"
+    }
+  },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "删除联系人",
+    "TITLE": "删除联系人",
+    "DESC": "删除联系人详情",
     "CONFIRM": {
       "TITLE": "确认删除",
       "MESSAGE": "您确定要删除吗？ ",
@@ -81,7 +89,7 @@
       "NO": "不，保留"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
+      "SUCCESS_MESSAGE": "联系人删除成功",
       "ERROR_MESSAGE": "Could not delete contact. Please try again later."
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 8bb7c29d4..151434225 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "消息通知",
     "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",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 268f7e59b..8af6a47a9 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "Display file picker on the widget",
-      "DISPLAY_EMOJI_PICKER": "Display emoji 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 脚本",
@@ -431,6 +432,15 @@
     },
     "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": "键",
+        "TYPE": "类型",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Enable pre chat form",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "登录",
+        "PLACE_HOLDER": "登录"
       },
       "PASSWORD": {
         "LABEL": "密码",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "登录",
+        "PLACE_HOLDER": "登录"
       },
       "PASSWORD": {
         "LABEL": "密码",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
index b3779e431..cb3c63e18 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "集成方式",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "取消",
+        "DESC": "Webhook 事件为您提供了有关Chatwoot 帐户中发生的事情的实时信息。请输入一个有效的URL来配置回调。",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook 网址",
+          "PLACEHOLDER": "例如：https://example/api/webhook",
+          "ERROR": "请输入一个有效的 URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "创建 webhook"
+      },
       "TITLE": "回调接口地址",
       "CONFIGURE": "配置",
       "HEADER": "Webhook设置",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "编辑",
         "TITLE": "Edit webhook",
-        "CANCEL": "取消",
-        "DESC": "Webhook 事件为您提供了有关Chatwoot 帐户中发生的事情的实时信息。请输入一个有效的URL来配置回调。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook 网址",
-            "PLACEHOLDER": "例如：https://example/api/webhook",
-            "ERROR": "请输入一个有效的 URL"
-          },
-          "SUBMIT": "Edit webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
         }
       },
       "ADD": {
         "CANCEL": "取消操作",
         "TITLE": "添加新的 webhook",
-        "DESC": "Webhook 事件为您提供了有关Chatwoot 帐户中发生的事情的实时信息。请输入一个有效的URL来配置回调。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook 网址",
-            "PLACEHOLDER": "例如：https://example/api/webhook",
-            "ERROR": "请输入一个有效的 URL"
-          },
-          "SUBMIT": "创建 webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook 添加成功",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "确认删除",
-          "MESSAGE": "您确定要删除吗？ ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "是，删除 ",
           "NO": "否，保留它"
         }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index cf308c0bc..faf200994 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "Overview",
+    "HEADER": "会话",
     "LOADING_CHART": "正在载入图表数据...",
     "NO_ENOUGH_DATA": "我们没有收到足够的数据点来生成报告，请稍后再试。",
     "DOWNLOAD_AGENT_REPORTS": "下载客服报表",
@@ -19,11 +19,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "首次响应时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "Business Hours"
   },
   "AGENT_REPORTS": {
     "HEADER": "Agents Overview",
@@ -131,11 +136,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "首次响应时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -194,11 +203,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "首次响应时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -257,11 +270,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "首次响应时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -320,11 +337,15 @@
       },
       "FIRST_RESPONSE_TIME": {
         "NAME": "首次响应时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解决时间",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "用于计算的对话总数：",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解决的数量",
@@ -392,5 +413,33 @@
         "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": "打开",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "未分配的"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "客服",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "状态"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "在线的",
+      "BUSY": "忙碌中",
+      "OFFLINE": "离线的"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json b/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
index f2e9b2296..d479388e7 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "成功修改密码",
       "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "提交"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 620511722..76890f01b 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "复制",
       "COPY_SUCCESSFUL": "代码复制到剪贴板成功"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "下载",
       "UPLOADING": "上传中..."
@@ -147,9 +151,10 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "会话",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "提及",
     "REPORTS": "报告",
     "SETTINGS": "设置",
     "CONTACTS": "Contacts",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "Overview",
+    "REPORTS_CONVERSATION": "会话",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "Inbox",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "Overview"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
index 05f1d8705..7405e3a4d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "密码",
       "PLACEHOLDER": "密码",
-      "ERROR": "密码太短了"
+      "ERROR": "密码太短了",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "请确认密码",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
index 9224cf649..41cb99476 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "select all agents",
       "SELECTED_COUNT": "%{selected} out of %{total} agents selected.",
       "BUTTON_TEXT": "添加客服代理",
-      "AGENT_VALIDATION_ERROR": "Select atleaset one agent."
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "Your team is ready!",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
index 0b6fe264d..c21bb3524 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/automation.json
@@ -89,7 +89,9 @@
       "DELETE_MESSAGE": "You need to have atleast one condition to save"
     },
     "ACTION": {
-      "DELETE_MESSAGE": "You need to have atleast one action to save"
+      "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",
@@ -102,6 +104,13 @@
       "DEACTIVATION_ERROR": "Could not Deactivate Automation, Please try again later",
       "CONFIRMATION_LABEL": "是",
       "CANCEL_LABEL": "否"
+    },
+    "ATTACHMENT": {
+      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
+      "LABEL_IDLE": "Upload Attachment",
+      "LABEL_UPLOADING": "上傳中",
+      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
index 6ce60b925..0d91b98cd 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
@@ -81,6 +81,7 @@
     "NO_MESSAGES": "沒有訊息",
     "NO_CONTENT": "沒有可用內容",
     "HIDE_QUOTED_TEXT": "隱藏引用文字",
-    "SHOW_QUOTED_TEXT": "顯示引用文字"
+    "SHOW_QUOTED_TEXT": "顯示引用文字",
+    "MESSAGE_READ": "Read"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 06eb54e89..9eb56300e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -70,6 +70,14 @@
     "SUCCESS_MESSAGE": "聯絡人儲存成功",
     "ERROR_MESSAGE": "出現錯誤，請重試"
   },
+  "DELETE_NOTE": {
+    "CONFIRM": {
+      "TITLE": "確認刪除",
+      "MESSAGE": "Are you want sure to delete this note?",
+      "YES": "Yes, Delete it",
+      "NO": "否，保留它"
+    }
+  },
   "DELETE_CONTACT": {
     "BUTTON_LABEL": "刪除聯絡人",
     "TITLE": "刪除聯絡人",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
index 9cc655582..320de4f04 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/generalSettings.json
@@ -60,6 +60,13 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "通知",
     "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": "載入更多通知...",
       "404": "沒有通知",
@@ -101,6 +108,7 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 4a58ef21e..99d36a2d8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -394,7 +394,8 @@
     "FEATURES": {
       "LABEL": "Features",
       "DISPLAY_FILE_PICKER": "在小工具上顯示檔案選擇器",
-      "DISPLAY_EMOJI_PICKER": "在小工具上顯示 emoji 選擇器"
+      "DISPLAY_EMOJI_PICKER": "在小工具上顯示 emoji 選擇器",
+      "ALLOW_END_CONVERSATION": "Allow users to end conversation from the widget"
     },
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger 脚本",
@@ -431,6 +432,15 @@
     },
     "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": "類別",
+        "REQUIRED": "Required"
+      },
       "ENABLE": {
         "LABEL": "Enable pre chat form",
         "OPTIONS": {
@@ -439,7 +449,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre Chat Message",
+        "LABEL": "Pre chat message",
         "PLACEHOLDER": "This message would be visible to the users along with the form"
       },
       "REQUIRE_EMAIL": {
@@ -468,6 +478,7 @@
     "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",
@@ -483,9 +494,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "登入",
+        "PLACE_HOLDER": "登入"
       },
       "PASSWORD": {
         "LABEL": "密碼",
@@ -511,9 +522,9 @@
         "LABEL": "Port",
         "PLACE_HOLDER": "Port"
       },
-      "EMAIL": {
-        "LABEL": "Email",
-        "PLACE_HOLDER": "Email"
+      "LOGIN": {
+        "LABEL": "登入",
+        "PLACE_HOLDER": "登入"
       },
       "PASSWORD": {
         "LABEL": "密碼",
@@ -526,7 +537,9 @@
       "ENCRYPTION": "Encryption",
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
-      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode"
-    }
+      "OPEN_SSL_VERIFY_MODE": "Open SSL Verify Mode",
+      "AUTH_MECHANISM": "Authentication"
+    },
+    "NOTE": "Note: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
index 6575057a5..58a506f51 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/integrations.json
@@ -2,6 +2,29 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "整合方式",
     "WEBHOOK": {
+      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "FORM": {
+        "CANCEL": "取消",
+        "DESC": "Webhook 事件為您提供了有關 Chatwoot 帳戶中發生的事情的即時資訊。請輸入一個有效的URL來配置回呼。",
+        "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"
+          }
+        },
+        "END_POINT": {
+          "LABEL": "Webhook 網址",
+          "PLACEHOLDER": "例如：https://example/api/webhook",
+          "ERROR": "請輸入一個有效的 URL"
+        },
+        "EDIT_SUBMIT": "Update webhook",
+        "ADD_SUBMIT": "建立 webhook"
+      },
       "TITLE": "回呼接口位址",
       "CONFIGURE": "配置",
       "HEADER": "Webhook 設定",
@@ -20,35 +43,16 @@
       "EDIT": {
         "BUTTON_TEXT": "編輯",
         "TITLE": "編輯 Webhook",
-        "CANCEL": "取消",
-        "DESC": "Webhook 事件為您提供了有關 Chatwoot 帳戶中發生的事情的即時資訊。請輸入一個有效的URL來配置回呼。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook 網址",
-            "PLACEHOLDER": "例如：https://example/api/webhook",
-            "ERROR": "請輸入一個有效的 URL"
-          },
-          "SUBMIT": "編輯 Webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook URL updated successfully",
+          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
           "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
         }
       },
       "ADD": {
         "CANCEL": "取消操作",
         "TITLE": "建立新的 webhook",
-        "DESC": "Webhook 事件為您提供了有關 Chatwoot 帳戶中發生的事情的即時資訊。請輸入一個有效的URL來配置回呼。",
-        "FORM": {
-          "END_POINT": {
-            "LABEL": "Webhook 網址",
-            "PLACEHOLDER": "例如：https://example/api/webhook",
-            "ERROR": "請輸入一個有效的 URL"
-          },
-          "SUBMIT": "建立 webhook"
-        },
         "API": {
-          "SUCCESS_MESSAGE": "Webhook 新增成功",
+          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
           "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
         }
       },
@@ -60,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "確認刪除",
-          "MESSAGE": "您確定要刪除吗？ ",
+          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
           "YES": "是，刪除 ",
           "NO": "否，保留它"
         }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index 215ed7c9b..b31bdebda 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -1,6 +1,6 @@
 {
   "REPORT": {
-    "HEADER": "總覽",
+    "HEADER": "對話",
     "LOADING_CHART": "正在載入图表數據...",
     "NO_ENOUGH_DATA": "我們没有收到足夠的數據來生成報表，請稍後再試。",
     "DOWNLOAD_AGENT_REPORTS": "下載客服報告",
@@ -18,12 +18,16 @@
         "DESC": "(總計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "首次回覆時間",
-        "DESC": "( 平均)"
+        "NAME": "First Response Time",
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解決時間",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解決的數量",
@@ -108,7 +112,8 @@
         "id": 4,
         "groupBy": "Year"
       }
-    ]
+    ],
+    "BUSINESS_HOURS": "服務時間"
   },
   "AGENT_REPORTS": {
     "HEADER": "客服總覽",
@@ -130,12 +135,16 @@
         "DESC": "(總計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "首次回覆時間",
-        "DESC": "( 平均)"
+        "NAME": "First Response Time",
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解決時間",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解決的數量",
@@ -193,12 +202,16 @@
         "DESC": "(總計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "首次回覆時間",
-        "DESC": "( 平均)"
+        "NAME": "First Response Time",
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解決時間",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解決的數量",
@@ -256,12 +269,16 @@
         "DESC": "(總計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "首次回覆時間",
-        "DESC": "( 平均)"
+        "NAME": "First Response Time",
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解決時間",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解決的數量",
@@ -319,12 +336,16 @@
         "DESC": "(總計)"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "首次回覆時間",
-        "DESC": "( 平均)"
+        "NAME": "First Response Time",
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_TIME": {
         "NAME": "解決時間",
-        "DESC": "( 平均)"
+        "DESC": "( 平均)",
+        "INFO_TEXT": "Total number of conversations used for computation:",
+        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "已解決的數量",
@@ -392,5 +413,33 @@
         "TOOLTIP": "Total number of responses / Total number of CSAT survey messages sent * 100"
       }
     }
+  },
+  "OVERVIEW_REPORTS": {
+    "HEADER": "總覽",
+    "LIVE": "Live",
+    "ACCOUNT_CONVERSATIONS": {
+      "HEADER": "Open Conversations",
+      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "OPEN": "打開",
+      "UNATTENDED": "Unattended",
+      "UNASSIGNED": "未指派的"
+    },
+    "AGENT_CONVERSATIONS": {
+      "HEADER": "Conversations by agents",
+      "LOADING_MESSAGE": "Loading agent metrics...",
+      "NO_AGENTS": "There are no conversations by agents",
+      "TABLE_HEADER": {
+        "AGENT": "客服",
+        "OPEN": "OPEN",
+        "UNATTENDED": "Unattended",
+        "STATUS": "狀態"
+      }
+    },
+    "AGENT_STATUS": {
+      "HEADER": "Agent status",
+      "ONLINE": "線上的",
+      "BUSY": "忙碌中",
+      "OFFLINE": "離線的"
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json b/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
index d2904423e..86743a16d 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/setNewPassword.json
@@ -15,6 +15,9 @@
       "SUCCESS_MESSAGE": "成功修改密碼",
       "ERROR_MESSAGE": "無法連接伺服器，請稍後再試"
     },
+    "CAPTCHA": {
+      "ERROR": "Verification expired. Please solve captcha again."
+    },
     "SUBMIT": "送出"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 79ad24e67..5969a1da2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -131,6 +131,10 @@
       "BUTTON_TEXT": "複製",
       "COPY_SUCCESSFUL": "代碼複製到剪貼簿成功"
     },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
     "FILE_BUBBLE": {
       "DOWNLOAD": "下載",
       "UPLOADING": "上傳中..."
@@ -147,6 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
+    "SWITCH": "Switch",
     "CONVERSATIONS": "會話",
     "ALL_CONVERSATIONS": "所有對話",
     "MENTIONED_CONVERSATIONS": "Mentions",
@@ -173,7 +178,7 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_OVERVIEW": "總覽",
+    "REPORTS_CONVERSATION": "對話",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
@@ -183,7 +188,8 @@
     "REPORTS_INBOX": "收件匣",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
-    "BETA": "Beta"
+    "BETA": "Beta",
+    "REPORTS_OVERVIEW": "總覽"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
index f8177cc7c..57bc07ecd 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
@@ -21,7 +21,8 @@
     "PASSWORD": {
       "LABEL": "密碼",
       "PLACEHOLDER": "密碼",
-      "ERROR": "密碼太短了"
+      "ERROR": "密碼太短了",
+      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "請確認密碼",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
index 8b770b833..5718a3a0f 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "選取所有克服",
       "SELECTED_COUNT": "%{total} 中的 %{selected} 個客服被選取",
       "BUTTON_TEXT": "新增客服",
-      "AGENT_VALIDATION_ERROR": "至少選擇一個客服"
+      "AGENT_VALIDATION_ERROR": "Select at least one agent."
     },
     "FINISH": {
       "TITLE": "你的團隊已經準備好了",
diff --git a/app/javascript/survey/i18n/locale/ar.json b/app/javascript/survey/i18n/locale/ar.json
index 9cd0cc6d1..945c640a2 100644
--- a/app/javascript/survey/i18n/locale/ar.json
+++ b/app/javascript/survey/i18n/locale/ar.json
@@ -15,5 +15,5 @@
       "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
     }
   },
-  "POWERED_BY": "مدعوم بواسطة Chatwoot"
+  "POWERED_BY": "مدعوم بواسطة تشات وت"
 }
diff --git a/app/javascript/survey/i18n/locale/de.json b/app/javascript/survey/i18n/locale/de.json
index 72f4ad6c6..d31a19a36 100644
--- a/app/javascript/survey/i18n/locale/de.json
+++ b/app/javascript/survey/i18n/locale/de.json
@@ -12,7 +12,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Umfrage wurde erfolgreich aktualisiert",
-      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot Server hergestellt werden. Bitte versuchen Sie es später erneut"
+      "ERROR_MESSAGE": "Es konnte keine Verbindung zum Woot-Server hergestellt werden. Bitte versuchen Sie es später erneut"
     }
   },
   "POWERED_BY": "Unterstützt von Chatwoot"
diff --git a/app/javascript/survey/i18n/locale/fr.json b/app/javascript/survey/i18n/locale/fr.json
index fbef5faf2..28ca6ba7e 100644
--- a/app/javascript/survey/i18n/locale/fr.json
+++ b/app/javascript/survey/i18n/locale/fr.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Cher client 👋, veuillez prendre quelques instants pour partager vos commentaires sur la conversation que vous avez eue avec %{inboxName}.",
     "RATING": {
       "LABEL": "Évaluer votre conversation",
       "SUCCESS_MESSAGE": "Merci d'avoir soumis votre évaluation"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "Avez-vous des pensées que vous aimeriez partager?",
+      "PLACEHOLDER": "Vos commentaires (facultatif)",
+      "BUTTON_TEXT": "Soumettre des commentaires"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Enquête mise à jour avec succès",
       "ERROR_MESSAGE": "Impossible de se connecter au serveur Woot, veuillez réessayer plus tard"
     }
   },
diff --git a/app/javascript/survey/i18n/locale/ro.json b/app/javascript/survey/i18n/locale/ro.json
index d7eeb5bcb..76482b79b 100644
--- a/app/javascript/survey/i18n/locale/ro.json
+++ b/app/javascript/survey/i18n/locale/ro.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Stimate client 👋, vă rugăm să luați câteva momente pentru a împărtăși feedback despre conversația pe care ați avut-o cu %{inboxName}.",
     "RATING": {
       "LABEL": "Evaluează conversația ta",
-      "SUCCESS_MESSAGE": "Thank you for submitting the rating"
+      "SUCCESS_MESSAGE": "Vă mulțumim pentru trimiterea de rating"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "Aveți gânduri pe care doriți să le împărtășiți?",
+      "PLACEHOLDER": "Feedback-ul tău (opțional)",
+      "BUTTON_TEXT": "Trimiteți feedback"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Chestionar actualizat cu succes",
       "ERROR_MESSAGE": "Nu s-a putut conecta la Woot Server, încercați din nou mai târziu"
     }
   },
diff --git a/app/javascript/survey/i18n/locale/th.json b/app/javascript/survey/i18n/locale/th.json
index 13702c04f..b785d5a4e 100644
--- a/app/javascript/survey/i18n/locale/th.json
+++ b/app/javascript/survey/i18n/locale/th.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "โปรดสละเวลา เพื่อแสดงความคิดเห็นกับการสนทนากับ %{inboxName} ครั้งนี้",
     "RATING": {
-      "LABEL": "Rate your conversation",
-      "SUCCESS_MESSAGE": "Thank you for submitting the rating"
+      "LABEL": "ให้คะแนนการสนทนาครั้งนี้",
+      "SUCCESS_MESSAGE": "ขอบคุณที่ร่วมมือให้คะแนนการสนทนากับเรา"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "คุณมีความคิดเห็นอะไรที่ต้องการให้เราปรับปรุงไหม?",
+      "PLACEHOLDER": "ความคิดเห็นของคุณ (ไม่จำเป็น)",
+      "BUTTON_TEXT": "ส่งความคิดเห็น"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "แบบสอบถามได้รับการอัพเดทแล้ว",
       "ERROR_MESSAGE": "ไม่สามารถเชื่อมต่อเซิฟเวอร์ได้โปรดลองอีกครั้งในภายหลัง"
     }
   },
diff --git a/app/javascript/survey/i18n/locale/uk.json b/app/javascript/survey/i18n/locale/uk.json
index f504890a4..99a61bf55 100644
--- a/app/javascript/survey/i18n/locale/uk.json
+++ b/app/javascript/survey/i18n/locale/uk.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Шановний клієнт 👋, будь ласка, приділіть кілька хвилин щоб поділитися відгуком про бесіду, що була з %{inboxName}.",
     "RATING": {
       "LABEL": "Оцініть вашу бесіду",
       "SUCCESS_MESSAGE": "Дякуємо за оцінку"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "У вас є думки, якими ви хочете поділитися?",
+      "PLACEHOLDER": "Ваш відгук (необов'язково)",
+      "BUTTON_TEXT": "Відправити відгук"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Опитування успішно оновлено",
       "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
     }
   },
diff --git a/app/javascript/survey/i18n/locale/ur.json b/app/javascript/survey/i18n/locale/ur.json
new file mode 100644
index 000000000..2473f114e
--- /dev/null
+++ b/app/javascript/survey/i18n/locale/ur.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/survey/i18n/locale/zh_CN.json b/app/javascript/survey/i18n/locale/zh_CN.json
index a2cc28a21..dcd6dc920 100644
--- a/app/javascript/survey/i18n/locale/zh_CN.json
+++ b/app/javascript/survey/i18n/locale/zh_CN.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "亲爱的客户 👋, 请花一点时间分享您与 %{inboxName} 的对话反馈。",
     "RATING": {
       "LABEL": "评价您的对话",
-      "SUCCESS_MESSAGE": "感谢您提交评分"
+      "SUCCESS_MESSAGE": "感谢您的评分"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "您是否有想要分享的想法？",
+      "PLACEHOLDER": "您的反馈(可选)",
+      "BUTTON_TEXT": "提交反馈"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "问卷已成功更新",
       "ERROR_MESSAGE": "无法连接服务器，请稍后再试"
     }
   },
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index 6a06f6c15..4ce5e56bf 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "الاسم الكامل",
         "PLACEHOLDER": "الرجاء إدخال اسمك الكامل",
-        "ERROR": "الاسم الكامل مطلوب"
+        "REQUIRED_ERROR": "الاسم الكامل مطلوب"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "عنوان البريد الإلكتروني",
         "PLACEHOLDER": "الرجاء إدخال عنوان بريد إلكتروني صحيح",
-        "ERROR": "عنوان بريد إلكتروني غير صحيح"
+        "REQUIRED_ERROR": "عنوان البريد الإلكتروني مطلوب",
+        "VALID_ERROR": "الرجاء إدخال عنوان بريد إلكتروني صحيح"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "رقم الهاتف",
+        "PLACEHOLDER": "الرجاء إدخال رقم الهاتف الخاص بك",
+        "REQUIRED_ERROR": "رقم الهاتف مطلوب",
+        "VALID_ERROR": "يجب أن يكون رقم الهاتف من E.164 مثال: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "رسالة",
@@ -57,7 +64,8 @@
         "ERROR": "رسالة قصيرة جداً"
       }
     },
-    "CAMPAIGN_HEADER": "الرجاء تقديم اسمك و بريدك الإلكتروني قبل بدء المحادثة"
+    "CAMPAIGN_HEADER": "الرجاء تقديم اسمك و بريدك الإلكتروني قبل بدء المحادثة",
+    "IS_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 f11042192..01ec8a097 100644
--- a/app/javascript/widget/i18n/locale/bg.json
+++ b/app/javascript/widget/i18n/locale/bg.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Пълно име",
         "PLACEHOLDER": "Моля, въведете пълното си име",
-        "ERROR": "Пълното име е задължително"
+        "REQUIRED_ERROR": "Пълното име е задължително"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Имейл адрес",
         "PLACEHOLDER": "Моля, въведете имейл адреса си",
-        "ERROR": "Невалиден имейл адрес"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Please enter a valid email address"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Телефон",
+        "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": "Съобщение",
@@ -57,7 +64,8 @@
         "ERROR": "Съобщението е прекалено кратко"
       }
     },
-    "CAMPAIGN_HEADER": "Преди да започенте разговора, моля, посочете вашето име и имейл адрес"
+    "CAMPAIGN_HEADER": "Преди да започенте разговора, моля, посочете вашето име и имейл адрес",
+    "IS_REQUIRED": "is 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 e0a2c1e64..1e44e288c 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nom complet",
         "PLACEHOLDER": "Introdueix el vostre nom complet",
-        "ERROR": "El Nom Complert és obligatori"
+        "REQUIRED_ERROR": "El Nom Complert és obligatori"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Adreça de correu electrònic",
         "PLACEHOLDER": "Si us plau, introdueix la teva adreça email",
-        "ERROR": "Adreça email invàlida"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Introduïu una adreça de correu electrònic vàlida"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Número de telèfon",
+        "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": "Missatge",
@@ -57,7 +64,8 @@
         "ERROR": "Missatge massa curt"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 52c1b060c..5df52e2ee 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Celé jméno",
         "PLACEHOLDER": "Zadejte své celé jméno",
-        "ERROR": "Je vyžadováno celé jméno"
+        "REQUIRED_ERROR": "Je vyžadováno celé jméno"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-mailová adresa",
         "PLACEHOLDER": "Zadejte prosím Váš e-mail",
-        "ERROR": "Neplatná e-mailová adresa"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Zadejte prosím platnou e-mailovou adresu"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonní číslo",
+        "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": "Zpráva",
@@ -57,7 +64,8 @@
         "ERROR": "Zpráva je příliš krátká"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 4051ffb69..03e6c1cb3 100644
--- a/app/javascript/widget/i18n/locale/da.json
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Fulde Navn",
         "PLACEHOLDER": "Indtast venligst dit fulde navn",
-        "ERROR": "Det fulde navn er påkrævet"
+        "REQUIRED_ERROR": "Det fulde navn er påkrævet"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-Mail Adresse",
         "PLACEHOLDER": "Indtast venligst din e-mail adresse",
-        "ERROR": "Ugyldig e-mailadresse"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Indtast venligst en gyldig e-mailadresse"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonnummer",
+        "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": "Besked",
@@ -57,7 +64,8 @@
         "ERROR": "Beskeden er for kort"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "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 5a3588ae1..cb0d2a25f 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Vollständiger Name",
         "PLACEHOLDER": "Bitte geben Sie Ihren vollständigen Namen ein",
-        "ERROR": "Vollständiger Name ist erforderlich"
+        "REQUIRED_ERROR": "Vollständiger Name ist erforderlich"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-Mail-Adresse",
         "PLACEHOLDER": "Bitte geben Sie ihre E-Mail-Adresse ein",
-        "ERROR": "Ungültige E-Mail-Adresse"
+        "REQUIRED_ERROR": "E-Mail-Adresse wird benötigt",
+        "VALID_ERROR": "Bitte geben Sie eine gültige E-Mail-Adresse ein"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonnummer",
+        "PLACEHOLDER": "Bitte geben Sie ihre Telefonnummer ein",
+        "REQUIRED_ERROR": "Telefonnummer ist erforderlich",
+        "VALID_ERROR": "Die Telefonnummer sollte im E.164-Format vorliegen, z. B.: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Nachricht",
@@ -57,7 +64,8 @@
         "ERROR": "Nachricht ist zu kurz"
       }
     },
-    "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie die Konversation beginnen"
+    "CAMPAIGN_HEADER": "Bitte geben Sie Ihren Namen und Ihre E-Mail-Adresse an, bevor Sie die Konversation beginnen",
+    "IS_REQUIRED": "erforderlich"
   },
   "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 0cca803f3..3359fac08 100644
--- a/app/javascript/widget/i18n/locale/el.json
+++ b/app/javascript/widget/i18n/locale/el.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Πλήρες Όνομα",
         "PLACEHOLDER": "Παρακαλώ συμπληρώστε το πλήρες όνομα σας",
-        "ERROR": "Απαιτείται πλήρες όνομα"
+        "REQUIRED_ERROR": "Απαιτείται πλήρες όνομα"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Διεύθυνση Email",
         "PLACEHOLDER": "Παρακαλούμε εισάγετε τη διεύθυνση email σας",
-        "ERROR": "Μη έγκυρη διεύθυνση email"
+        "REQUIRED_ERROR": "Απαιτείται διεύθυνση email",
+        "VALID_ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Αριθμός Τηλεφώνου",
+        "PLACEHOLDER": "Παρακαλώ εισάγετε τον αριθμό του τηλεφώνου σας",
+        "REQUIRED_ERROR": "Απαιτείται ο αριθμός τηλεφώνου",
+        "VALID_ERROR": "Ο αριθμός τηλεφώνου πρέπει να έχει μορφή E.164 π.χ.: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Μήνυμα",
@@ -57,7 +64,8 @@
         "ERROR": "Πολύ σύντομο μήνυμα"
       }
     },
-    "CAMPAIGN_HEADER": "Παρακαλώ δώστε το όνομα και το email σας πριν ξεκινήσετε την συνομιλία"
+    "CAMPAIGN_HEADER": "Παρακαλώ δώστε το όνομα και το email σας πριν ξεκινήσετε την συνομιλία",
+    "IS_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 5889171f9..a0998fdbe 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nombre completo",
         "PLACEHOLDER": "Introduzca su nombre completo por favor",
-        "ERROR": "Nombre completo es obligatorio"
+        "REQUIRED_ERROR": "Nombre completo es obligatorio"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Dirección de correo",
         "PLACEHOLDER": "Introduzca su dirección de correo electrónico",
-        "ERROR": "Dirección de correo no válida"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Por favor, introduzca una dirección de correo válida"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Número telefónico",
+        "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": "Mensaje",
@@ -57,7 +64,8 @@
         "ERROR": "Mensaje demasiado corto"
       }
     },
-    "CAMPAIGN_HEADER": "Por favor, introduce tu nombre y correo electrónico antes de iniciar la conversación"
+    "CAMPAIGN_HEADER": "Por favor, introduce tu nombre y correo electrónico antes de iniciar la conversación",
+    "IS_REQUIRED": "is required"
   },
   "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 603c9e10f..ec6237a4e 100644
--- a/app/javascript/widget/i18n/locale/fa.json
+++ b/app/javascript/widget/i18n/locale/fa.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "نام کامل",
         "PLACEHOLDER": "لطفا نام کامل خود را وارد کنید",
-        "ERROR": "نام کامل مورد نیاز است"
+        "REQUIRED_ERROR": "نام کامل مورد نیاز است"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ایمیل",
         "PLACEHOLDER": "لطفا ایمیل خود را وارد کنید",
-        "ERROR": "آدرس ایمیل اشتباه است"
+        "REQUIRED_ERROR": "آدرس ایمیل مورد نیاز است",
+        "VALID_ERROR": "لطفا ایمیل خود را به شکل صحیح وارد کنید"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "شماره تلفن",
+        "PLACEHOLDER": "لطفا شماره تلفن خود را وارد کنید",
+        "REQUIRED_ERROR": "شماره تلفن الزامی است",
+        "VALID_ERROR": "شماره تلفن باید با فرمت E.164 باشد، به عنوان مثال: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "پیام",
@@ -57,7 +64,8 @@
         "ERROR": "پیام بسیار کوتاه است"
       }
     },
-    "CAMPAIGN_HEADER": "لطفا قبل از شروع گفتگو نام و ایمیل خود را وارد کنید"
+    "CAMPAIGN_HEADER": "لطفا قبل از شروع گفتگو نام و ایمیل خود را وارد کنید",
+    "IS_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 9bf988f04..85c2b300e 100644
--- a/app/javascript/widget/i18n/locale/fi.json
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Koko nimi",
         "PLACEHOLDER": "Syötä koko nimesi",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Sähköpostiosoite",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Ole hyvä ja syötä validi sähköposti"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Puhelinnumero",
+        "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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 8df1a14d9..728125ec7 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -8,8 +8,8 @@
       "SUBMIT": "Envoyer"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Envoyer à nouveau le message",
+      "ERROR_MESSAGE": "Impossible d'envoyer, réessayez"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -22,8 +22,8 @@
     "IN_A_DAY": "Répond généralement dans la journée"
   },
   "START_CONVERSATION": "Démarrer la conversation",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
+  "END_CONVERSATION": "Mettre fin à la conversation",
+  "CONTINUE_CONVERSATION": "Continuer la conversation",
   "START_NEW_CONVERSATION": "Démarrer une nouvelle conversation",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Voir les nouveaux messages",
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nom complet",
         "PLACEHOLDER": "Veuillez entrer votre nom complet",
-        "ERROR": "Le nom complet est requis"
+        "REQUIRED_ERROR": "Le nom complet est requis"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Adresse de courriel",
         "PLACEHOLDER": "Veuillez saisir votre adresse de courriel",
-        "ERROR": "Adresse e-mail invalide"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Veuillez saisir une adresse de courriel valide"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Numéro de téléphone",
+        "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",
@@ -57,7 +64,8 @@
         "ERROR": "Message trop court"
       }
     },
-    "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre email avant de commencer la conversation"
+    "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre email avant de commencer la conversation",
+    "IS_REQUIRED": "is 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 72d44e5ea..f7158e2c3 100644
--- a/app/javascript/widget/i18n/locale/he.json
+++ b/app/javascript/widget/i18n/locale/he.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "שם מלא",
         "PLACEHOLDER": "הכנס שם מלא בבקשה",
-        "ERROR": "שם מלא שדה חובה"
+        "REQUIRED_ERROR": "שם מלא שדה חובה"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "כתובת מייל",
         "PLACEHOLDER": "הכנס כתובת מייל בבקשה",
-        "ERROR": "כתובת מייל לא חוקית"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "בבקשה הכנס כתוכת אימייל תקינה"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "מספר טלפון",
+        "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": "הודעה",
@@ -57,7 +64,8 @@
         "ERROR": "הודעה קצרה מדי"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 66bf83fe5..ef4149191 100644
--- a/app/javascript/widget/i18n/locale/hi.json
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Full Name",
         "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email Address",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid 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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 6ae189e82..6e7605a9a 100644
--- a/app/javascript/widget/i18n/locale/hu.json
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Teljes név",
         "PLACEHOLDER": "Kérjük a teljes nevedet add meg",
-        "ERROR": "A teljes név megadása kötelező"
+        "REQUIRED_ERROR": "A teljes név megadása kötelező"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email cím",
         "PLACEHOLDER": "Kérjük helyes e-mailcímet adj meg",
-        "ERROR": "Helytelen e-mailcím"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Kérjük helyes e-mailcímet adj meg"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonszám",
+        "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": "Üzenet",
@@ -57,7 +64,8 @@
         "ERROR": "Az üzenet túl rövid"
       }
     },
-    "CAMPAIGN_HEADER": "Kérjük a beszélgetés megkezdése előtt add meg neved és e-mail címed"
+    "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"
   },
   "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 770737786..23c474a1e 100644
--- a/app/javascript/widget/i18n/locale/id.json
+++ b/app/javascript/widget/i18n/locale/id.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nama Lengkap",
         "PLACEHOLDER": "Harap masukkan nama lengkap anda yang valid",
-        "ERROR": "Nama Lengkap dibutuhkan"
+        "REQUIRED_ERROR": "Nama Lengkap dibutuhkan"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Alamat email",
         "PLACEHOLDER": "Harap masukkan alamat email Anda",
-        "ERROR": "Alamat email salah"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Harap masukkan alamat email yang valid"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Nomor Telpon",
+        "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": "Pesan",
@@ -57,7 +64,8 @@
         "ERROR": "Pesan terlalu pendek"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "File melebihi batas {MAXIMUM_FILE_UPLOAD_SIZE} lampiran",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
index 61bdcee80..eaac0833f 100644
--- a/app/javascript/widget/i18n/locale/it.json
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nome completo",
         "PLACEHOLDER": "Per favore inserisci il tuo nome completo",
-        "ERROR": "Il nome completo è obbligatorio"
+        "REQUIRED_ERROR": "Il nome completo è obbligatorio"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Indirizzo email",
         "PLACEHOLDER": "Inserisci il tuo indirizzo email",
-        "ERROR": "Indirizzo email non valido"
+        "REQUIRED_ERROR": "L'indirizzo email è obbligatorio",
+        "VALID_ERROR": "Inserisci un indirizzo email valido"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Numero di telefono",
+        "PLACEHOLDER": "Inserisci il tuo numero di telefono",
+        "REQUIRED_ERROR": "Il numero di telefono è obbligatorio",
+        "VALID_ERROR": "Il numero di telefono deve essere nel formato E.164 es.: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Messaggio",
@@ -57,7 +64,8 @@
         "ERROR": "Messaggio troppo corto"
       }
     },
-    "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione"
+    "CAMPAIGN_HEADER": "Per favore inserisci il tuo nome ed email prima di iniziare la conversazione",
+    "IS_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 b2677661b..38a6e300c 100644
--- a/app/javascript/widget/i18n/locale/ja.json
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "フルネーム",
         "PLACEHOLDER": "氏名を入力してください。",
-        "ERROR": "お名前を入力してください"
+        "REQUIRED_ERROR": "お名前を入力してください"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Eメールアドレス",
         "PLACEHOLDER": "メールアドレスを入力してください",
-        "ERROR": "メールアドレスを正しく入力してください"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "正しいメールアドレスを入力してください"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "電話番号",
+        "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": "メッセージ",
@@ -57,7 +64,8 @@
         "ERROR": "メッセージが短すぎます"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "添付ファイルサイズの上限 {MAXIMUM_FILE_UPLOAD_SIZE} を超えています",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
index 06871ff0c..82a62f42b 100644
--- a/app/javascript/widget/i18n/locale/ko.json
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "전체 이름",
         "PLACEHOLDER": "전체 이름을 입력하십시오.",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "이메일 주소",
         "PLACEHOLDER": "이메일을 입력해주세요.",
-        "ERROR": "잘못된 이메일 주소입니다."
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "올바른 전자 메일 주소를 입력하십시오."
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "전화 번호",
+        "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": "메시지",
@@ -57,7 +64,8 @@
         "ERROR": "너무 짧은 메시지"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "첨부파일이 최대 {MAXIMUM_FILE_UPLOAD_SIZE} 용량 제한을 넘어섭니다.",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/lv.json b/app/javascript/widget/i18n/locale/lv.json
index 66bf83fe5..ef4149191 100644
--- a/app/javascript/widget/i18n/locale/lv.json
+++ b/app/javascript/widget/i18n/locale/lv.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Full Name",
         "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email Address",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid 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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index 20142dbc9..bd89f538d 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "പൂർണ്ണമായ പേര്",
         "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ മുഴുവൻ പേര് നൽകുക",
-        "ERROR": "മുഴുവൻ പേര് ആവശ്യമാണ്"
+        "REQUIRED_ERROR": "മുഴുവൻ പേര് ആവശ്യമാണ്"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ഇമെയിൽ വിലാസം",
         "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ വിലാസം നൽകുക",
-        "ERROR": "ഇമെയിൽ വിലാസം അസാധുവാണ്"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ വിലാസം നൽകുക"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "ഫോൺ നമ്പർ",
+        "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": "സന്ദേശം",
@@ -57,7 +64,8 @@
         "ERROR": "സന്ദേശം വളരെ ചെറുതാണ്"
       }
     },
-    "CAMPAIGN_HEADER": "സംഭാഷണം ആരംഭിക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പേരും ഇമെയിലും നൽകുക"
+    "CAMPAIGN_HEADER": "സംഭാഷണം ആരംഭിക്കുന്നതിന് മുമ്പ് ദയവായി നിങ്ങളുടെ പേരും ഇമെയിലും നൽകുക",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "ഫയൽ {MAXIMUM_FILE_UPLOAD_SIZE} അറ്റാച്ച്‌മെന്റ് പരിധി കവിഞ്ഞു",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/ne.json b/app/javascript/widget/i18n/locale/ne.json
index 4c180cd1f..2961bfd14 100644
--- a/app/javascript/widget/i18n/locale/ne.json
+++ b/app/javascript/widget/i18n/locale/ne.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Full Name",
         "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email Address",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid 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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 8983ef628..a7ac9ba43 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Volledige Naam",
         "PLACEHOLDER": "Voer uw volledige naam in",
-        "ERROR": "Volledige naam is vereist"
+        "REQUIRED_ERROR": "Volledige naam is vereist"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Uw e-mailadres",
         "PLACEHOLDER": "Voer uw e-mailadres in",
-        "ERROR": "Ongeldig e-mailadres"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Voer een geldig e-mailadres in"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefoonnummer",
+        "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": "Bericht",
@@ -57,7 +64,8 @@
         "ERROR": "Bericht te kort"
       }
     },
-    "CAMPAIGN_HEADER": "Geef uw naam en e-mail voordat u het gesprek begint"
+    "CAMPAIGN_HEADER": "Geef uw naam en e-mail voordat u het gesprek begint",
+    "IS_REQUIRED": "is 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 68e373318..4958ba33c 100644
--- a/app/javascript/widget/i18n/locale/no.json
+++ b/app/javascript/widget/i18n/locale/no.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Fullt navn",
         "PLACEHOLDER": "Skriv inn fullt navn",
-        "ERROR": "Fullt navn er påkrevd"
+        "REQUIRED_ERROR": "Fullt navn er påkrevd"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-postadresse",
         "PLACEHOLDER": "Vennligst skriv inn din e-postadresse",
-        "ERROR": "Ugyldig e-postadresse"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Vennligst skriv inn en gyldig e-postadresse"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonnummer",
+        "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": "Melding",
@@ -57,7 +64,8 @@
         "ERROR": "Meldingen er for kort"
       }
     },
-    "CAMPAIGN_HEADER": "Angi navn og e-post før du starter samtalen"
+    "CAMPAIGN_HEADER": "Angi navn og e-post før du starter samtalen",
+    "IS_REQUIRED": "is 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 17999f14a..5249881af 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Pełna nazwa (imię i nazwisko)",
         "PLACEHOLDER": "Podaj swoje imię i nazwisko",
-        "ERROR": "Pełne imię i nazwisko jest wymagane"
+        "REQUIRED_ERROR": "Pełne imię i nazwisko jest wymagane"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Adres e-mail",
         "PLACEHOLDER": "Wprowadź swój adres e-mail",
-        "ERROR": "Nieprawidłowy adres e-mail"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Wprowadź poprawny adres e-mail"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Numer telefonu",
+        "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": "Wiadomość",
@@ -57,7 +64,8 @@
         "ERROR": "Wiadomość za krótka"
       }
     },
-    "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy"
+    "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy",
+    "IS_REQUIRED": "is 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 3bf35af69..78e78c5bf 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nome completo",
         "PLACEHOLDER": "Por favor, digite o seu nome completo",
-        "ERROR": "Nome completo é necessário"
+        "REQUIRED_ERROR": "Nome completo é necessário"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Endereço de e-mail",
         "PLACEHOLDER": "Por favor, insira um endereço de email válido",
-        "ERROR": "Endereço de email inválido"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Por favor, insira um endereço de e-mail válido"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Número de telefone",
+        "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": "Messagem",
@@ -57,7 +64,8 @@
         "ERROR": "Mensagem muito pequena"
       }
     },
-    "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa"
+    "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "O ficheiro ultrapassa o tamanho limite {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/pt_BR.json b/app/javascript/widget/i18n/locale/pt_BR.json
index 2e8aaed8d..6e9318fd2 100644
--- a/app/javascript/widget/i18n/locale/pt_BR.json
+++ b/app/javascript/widget/i18n/locale/pt_BR.json
@@ -22,7 +22,7 @@
     "IN_A_DAY": "Responde normalmente em um dia"
   },
   "START_CONVERSATION": "Iniciar Conversa",
-  "END_CONVERSATION": "End Conversation",
+  "END_CONVERSATION": "Fim da Conversa",
   "CONTINUE_CONVERSATION": "Continuar conversa",
   "START_NEW_CONVERSATION": "Iniciar uma nova conversa",
   "UNREAD_VIEW": {
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Nome Completo",
         "PLACEHOLDER": "Por favor, digite seu nome completo",
-        "ERROR": "Nome Completo é mandatório"
+        "REQUIRED_ERROR": "Nome Completo é mandatório"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Endereço de e-mail",
         "PLACEHOLDER": "Por favor, digite seu e-mail",
-        "ERROR": "Endereço de e-mail inválido"
+        "REQUIRED_ERROR": "Endereço de e-mail é obrigatório",
+        "VALID_ERROR": "Por favor, insira um endereço de e-mail válido"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Número de Telefone",
+        "PLACEHOLDER": "Por favor, digite seu número de telefone",
+        "REQUIRED_ERROR": "O número de telefone é obrigatório",
+        "VALID_ERROR": "Número de telefone deve ser do formato E.164, por exemplo: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Messagem",
@@ -57,7 +64,8 @@
         "ERROR": "Mensagem muito curta"
       }
     },
-    "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa"
+    "CAMPAIGN_HEADER": "Por favor, forneça seu nome e e-mail antes de iniciar a conversa",
+    "IS_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 8d9be551d..d78eff79a 100644
--- a/app/javascript/widget/i18n/locale/ro.json
+++ b/app/javascript/widget/i18n/locale/ro.json
@@ -8,31 +8,31 @@
       "SUBMIT": "Trimite"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Trimiteți din nou un mesaj",
+      "ERROR_MESSAGE": "Nu s-a putut trimite! Încearcă din nou"
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are away at the moment"
+    "ONLINE": "Suntem online",
+    "OFFLINE": "Suntem plecați în acest 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"
+    "IN_A_FEW_MINUTES": "De obicei, răspunsurile în câteva minute",
+    "IN_A_FEW_HOURS": "De obicei, răspunsurile în câteva ore",
+    "IN_A_DAY": "De obicei, răspunsurile într-o zi"
   },
-  "START_CONVERSATION": "Start Conversation",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "START_CONVERSATION": "Începe conversația",
+  "END_CONVERSATION": "Terminați conversația",
+  "CONTINUE_CONVERSATION": "Continuați conversația",
+  "START_NEW_CONVERSATION": "Începeți o conversație nouă",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Vezi mesajele noi",
     "CLOSE_MESSAGES_BUTTON": "Închide",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "de la",
     "BOT": "Bot"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "Discută cu noi"
   },
   "POWERED_BY": "Oferit de Chatwoot",
   "EMAIL_PLACEHOLDER": "Te rugăm să introduci adresa de e-mail",
@@ -42,36 +42,44 @@
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
-        "LABEL": "Full Name",
+        "LABEL": "Nume complet",
         "PLACEHOLDER": "Te rugăm să introduci un nume valid",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Este necesar numele complet"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Adresa Email",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "Te rugăm să-ți introduci adresa de email",
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Vă rugăm să introduceți o adresă de e-mail validă"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Număr de telefon",
+        "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"
+        "LABEL": "Mesaj",
+        "PLACEHOLDER": "Introdu mesajul tău",
+        "ERROR": "Mesaj prea scurt"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Vă rugăm să furnizați numele și e-mailul înainte de a începe conversația",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "Fisierul depaseste limita de {MAXIMUM_FILE_UPLOAD_SIZE} atasamente",
   "CHAT_FORM": {
     "INVALID": {
-      "FIELD": "Invalid field"
+      "FIELD": "Câmp invalid"
     }
   },
   "CSAT": {
     "TITLE": "Evaluează conversația ta",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "SUBMITTED_TITLE": "Vă mulțumim pentru trimiterea de rating",
     "PLACEHOLDER": "Spune-ne mai mult..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "Solicitați o transcriere a conversației",
     "SEND_EMAIL_SUCCESS": "Transscrisul de chat a fost trimis cu succes",
     "SEND_EMAIL_ERROR": "A apărut o eroare, încercați din nou"
   }
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
index ca466f4be..e25e30e2c 100644
--- a/app/javascript/widget/i18n/locale/ru.json
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Полное имя",
         "PLACEHOLDER": "Пожалуйста, введите ваше ФИО",
-        "ERROR": "Необходимо указать имя"
+        "REQUIRED_ERROR": "Необходимо указать имя"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email",
         "PLACEHOLDER": "Пожалуйста, введите ваш адрес электронной почты",
-        "ERROR": "Неправильный адрес электронной почты"
+        "REQUIRED_ERROR": "Требуется адрес электронной почты",
+        "VALID_ERROR": "Пожалуйста, введите действительный адрес электронной почты"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Номер телефона",
+        "PLACEHOLDER": "Пожалуйста, введите ваш номер телефона",
+        "REQUIRED_ERROR": "Требуется указать номер телефона",
+        "VALID_ERROR": "Номер телефона должен быть в формате E.164, например: +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Сообщение",
@@ -57,7 +64,8 @@
         "ERROR": "Сообщение слишком короткое"
       }
     },
-    "CAMPAIGN_HEADER": "Пожалуйста, укажите ваше имя и адрес электронной почты перед началом беседы"
+    "CAMPAIGN_HEADER": "Пожалуйста, укажите ваше имя и адрес электронной почты перед началом беседы",
+    "IS_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 71138fcd2..0ed1c3310 100644
--- a/app/javascript/widget/i18n/locale/sk.json
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Celé meno",
         "PLACEHOLDER": "Prosím zadajte svoje celé meno",
-        "ERROR": "Vyžaduje sa celé meno"
+        "REQUIRED_ERROR": "Vyžaduje sa celé meno"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-mailová adresa",
         "PLACEHOLDER": "Zadajte svoj e-mail",
-        "ERROR": "Neplatná e-mailová adresa"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Prosím zadajte platnú e-mailovú adresu"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefónne číslo",
+        "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": "Správa",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "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 d867e526c..256fc0655 100644
--- a/app/javascript/widget/i18n/locale/sr.json
+++ b/app/javascript/widget/i18n/locale/sr.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Puno ime",
         "PLACEHOLDER": "Molimo unesite vaše puno ime",
-        "ERROR": "Puno ime je obavezno"
+        "REQUIRED_ERROR": "Puno ime je obavezno"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-mail adresa",
         "PLACEHOLDER": "Molimo unesite vašu e-mail adresu",
-        "ERROR": "Neispravna e-mail adresa"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Please enter a valid email address"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Broj telefona",
+        "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": "Poruka",
@@ -57,7 +64,8 @@
         "ERROR": "Poruka prekratka"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
index 9dc83348c..2843bf0a8 100644
--- a/app/javascript/widget/i18n/locale/sv.json
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Fullständigt namn",
         "PLACEHOLDER": "Vänligen ange ditt fullständiga namn",
-        "ERROR": "Fullständigt namn krävs"
+        "REQUIRED_ERROR": "Fullständigt namn krävs"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-postadress",
         "PLACEHOLDER": "Vänligen ange din e-postadress",
-        "ERROR": "Ogiltig e-postadress"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Ange en giltig e-postadress"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefonnummer",
+        "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": "Meddelande",
@@ -57,7 +64,8 @@
         "ERROR": "Meddelandet är för kort"
       }
     },
-    "CAMPAIGN_HEADER": "Ange ditt namn och e-post innan du startar konversationen"
+    "CAMPAIGN_HEADER": "Ange ditt namn och e-post innan du startar konversationen",
+    "IS_REQUIRED": "is 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 57ede7387..ed863e886 100644
--- a/app/javascript/widget/i18n/locale/ta.json
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Full Name",
         "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ஈ-மெயில் முகவரி",
         "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "சரியான ஈமெயில் முகவரியை பதிவிடவும்"
+      },
+      "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",
@@ -57,7 +64,8 @@
         "ERROR": "Message too short"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
+    "IS_REQUIRED": "is 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 908920e05..4c85c78c6 100644
--- a/app/javascript/widget/i18n/locale/th.json
+++ b/app/javascript/widget/i18n/locale/th.json
@@ -2,62 +2,70 @@
   "COMPONENTS": {
     "FILE_BUBBLE": {
       "DOWNLOAD": "ดาวโหลด",
-      "UPLOADING": "Uploading..."
+      "UPLOADING": "กำลังอัพโหลด"
     },
     "FORM_BUBBLE": {
       "SUBMIT": "ส่ง"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "ส่งข้อความอีกครั้ง",
+      "ERROR_MESSAGE": "ไม่สามารถส่งได้ ลองอีกครั้ง"
     }
   },
   "TEAM_AVAILABILITY": {
-    "ONLINE": "We are online",
-    "OFFLINE": "We are away at the moment"
+    "ONLINE": "เรากำลังออนไลน์",
+    "OFFLINE": "เราไม่อยู่"
   },
   "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"
+    "IN_A_FEW_MINUTES": "ปกติจะตอบกลับภายในไม่กี่นาที",
+    "IN_A_FEW_HOURS": "ปกติจะตอบกลับในไม่กี่ชั่วโมง",
+    "IN_A_DAY": "ปกติจะตอบกลับภายใน 1 วัน"
   },
-  "START_CONVERSATION": "Start Conversation",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
-  "START_NEW_CONVERSATION": "Start a new conversation",
+  "START_CONVERSATION": "เริ่มการสนทนา",
+  "END_CONVERSATION": "จบการสนทนา",
+  "CONTINUE_CONVERSATION": "สนทนาต่อ",
+  "START_NEW_CONVERSATION": "เริ่มการสนทนาใหม่",
   "UNREAD_VIEW": {
-    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "VIEW_MESSAGES_BUTTON": "ดูข้อความใหม่",
     "CLOSE_MESSAGES_BUTTON": "ปิด",
-    "COMPANY_FROM": "from",
+    "COMPANY_FROM": "จาก",
     "BOT": "บอท"
   },
   "BUBBLE": {
-    "LABEL": "Chat with us"
+    "LABEL": "คุยกับเรา"
   },
   "POWERED_BY": "Powered by Chatwoot",
   "EMAIL_PLACEHOLDER": "กรุณากรอกอีเมล์ของคุณ",
-  "CHAT_PLACEHOLDER": "Type your message",
-  "TODAY": "Today",
-  "YESTERDAY": "Yesterday",
+  "CHAT_PLACEHOLDER": "พิมพ์ข้อความ",
+  "TODAY": "วันนี้",
+  "YESTERDAY": "เมื่อวาน",
   "PRE_CHAT_FORM": {
     "FIELDS": {
       "FULL_NAME": {
         "LABEL": "ชื่อเต็ม",
-        "PLACEHOLDER": "Please enter your full name",
-        "ERROR": "Full Name is required"
+        "PLACEHOLDER": "โปรดใส่ชื่อเต็มของคุณ",
+        "REQUIRED_ERROR": "จำเป็นต้องใส่ชื่อเต็ม"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "ที่อยู่อีเมล์",
-        "PLACEHOLDER": "Please enter your email address",
-        "ERROR": "Invalid email address"
+        "PLACEHOLDER": "โปรดใส่อีเมล์ของคุณ",
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "กรุณากรอกที่อยู่อีเมล์ให้ถูกต้อง"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "หมายเลขโทรศัพท์",
+        "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": "ข้อความ",
-        "PLACEHOLDER": "Please enter your message",
-        "ERROR": "Message too short"
+        "PLACEHOLDER": "โปรดพิมพ์ข้อความ",
+        "ERROR": "ข้อความสั้นเกินไป"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "โปรดแจ้งชื่อ และ อีเมลื ก่อนเริ่มการสนทนา",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "ไฟล์ใหเกินกว่า {MAXIMUM_FILE_UPLOAD_SIZE} ที่กำหนดไว้",
   "CHAT_FORM": {
@@ -66,12 +74,12 @@
     }
   },
   "CSAT": {
-    "TITLE": "Rate your conversation",
-    "SUBMITTED_TITLE": "Thank you for submitting the rating",
-    "PLACEHOLDER": "Tell us more..."
+    "TITLE": "ให้คะแนนการสนทนาครั้งนี้",
+    "SUBMITTED_TITLE": "ขอบคุณที่ร่วมมือให้คะแนนการสนทนากับเรา",
+    "PLACEHOLDER": "บอกเราเพิ่มเติม..."
   },
   "EMAIL_TRANSCRIPT": {
-    "BUTTON_TEXT": "Request a conversation transcript",
+    "BUTTON_TEXT": "ต้องการให้ส่งบทสนทนานี้ทางอีเมล์",
     "SEND_EMAIL_SUCCESS": "บันทึกการสนทนาได้ถูกส่งเเล้ว",
     "SEND_EMAIL_ERROR": "เกิดข้อผิดพลาดกรุณาลองใหม่อีกครั้ง"
   }
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
index b1ebc81b0..f1b737504 100644
--- a/app/javascript/widget/i18n/locale/tr.json
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -44,20 +44,28 @@
       "FULL_NAME": {
         "LABEL": "Ad Soyad",
         "PLACEHOLDER": "lütfen tam adınızı giriniz",
-        "ERROR": "Tam isim gerekli"
+        "REQUIRED_ERROR": "Tam isim gerekli"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "E-posta adresi",
-        "PLACEHOLDER": "Lütfen E-postanızı girin",
-        "ERROR": "Geçersiz email adresi"
+        "PLACEHOLDER": "Lütfen e-postanızı girin",
+        "REQUIRED_ERROR": "e-Posta adresi zorunludur",
+        "VALID_ERROR": "Lütfen geçerli bir e-posta adresi girin"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Telefon numarası",
+        "PLACEHOLDER": "Lütfen telefon numaranızı yazınız",
+        "REQUIRED_ERROR": "Telefon numarası zorunludur",
+        "VALID_ERROR": "Telefon numarası E.164 formatında olmalıdır örn: +905555555"
       },
       "MESSAGE": {
         "LABEL": "Mesaj",
-        "PLACEHOLDER": "Lütfen E-postanızı girin",
+        "PLACEHOLDER": "Lütfen mesajınızı girin",
         "ERROR": "Mesaj çok kısa"
       }
     },
-    "CAMPAIGN_HEADER": "Görüşmeye başlamadan önce lütfen isminizi ve eposta adresinizi belirtiniz"
+    "CAMPAIGN_HEADER": "Görüşmeye başlamadan önce lütfen isminizi ve e-posta adresinizi belirtiniz",
+    "IS_REQUIRED": "zorunlu"
   },
   "FILE_SIZE_LIMIT": "Dosya {MAXIMUM_FILE_UPLOAD_SIZE} sınırını aşıyor",
   "CHAT_FORM": {
@@ -66,8 +74,8 @@
     }
   },
   "CSAT": {
-    "TITLE": "Konuşmanızı oylayın",
-    "SUBMITTED_TITLE": "Konuşmanızı oyladığınız için teşekkürler",
+    "TITLE": "Görüşmenizi değerlendirin",
+    "SUBMITTED_TITLE": "Değerlendirmeniz için teşekkürler",
     "PLACEHOLDER": "Biraz daha fazla bilgi verin..."
   },
   "EMAIL_TRANSCRIPT": {
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
index 58e0d7329..2bbeeff9f 100644
--- a/app/javascript/widget/i18n/locale/uk.json
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -8,8 +8,8 @@
       "SUBMIT": "Додати"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Надіслати ще раз",
+      "ERROR_MESSAGE": "Не вдалося надіслати, спробуйте ще раз"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -22,8 +22,8 @@
     "IN_A_DAY": "Зазвичай, відповідаємо протягом доби"
   },
   "START_CONVERSATION": "Розпочати розмову",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
+  "END_CONVERSATION": "Закінчити спілкуванна",
+  "CONTINUE_CONVERSATION": "Продовжити спілкування",
   "START_NEW_CONVERSATION": "Розпочати нову розмову",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Переглянути нові повідомлення",
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Повне ім`я",
         "PLACEHOLDER": "Будь ласка, введіть своє повне ім'я",
-        "ERROR": "Потрібне повне ім'я"
+        "REQUIRED_ERROR": "Потрібне повне ім'я"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Адреса електронної пошти",
         "PLACEHOLDER": "Будь ласка, введіть адресу вашої електронної пошти",
-        "ERROR": "Некоректна адреса ел. пошти"
+        "REQUIRED_ERROR": "Необхідно вказати адресу електронної пошти",
+        "VALID_ERROR": "Будь ласка, введіть коректну адресу електронної пошти"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Номер телефону",
+        "PLACEHOLDER": "Будь ласка, введіть номер телефону",
+        "REQUIRED_ERROR": "Номер телефону є обов'язковим",
+        "VALID_ERROR": "Номер телефону має бути в форматі E.164; наприклад: + 1415555555"
       },
       "MESSAGE": {
         "LABEL": "Текст повідомлення",
@@ -57,7 +64,8 @@
         "ERROR": "Занадто коротке повідомлення"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation"
+    "CAMPAIGN_HEADER": "Будь ласка, надайте своє ім'я та електронну пошту перед початком бесіди",
+    "IS_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
new file mode 100644
index 000000000..ef4149191
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -0,0 +1,86 @@
+{
+  "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"
+  },
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  },
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "PLACEHOLDER": "Tell us more..."
+  },
+  "EMAIL_TRANSCRIPT": {
+    "BUTTON_TEXT": "Request a conversation transcript",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again"
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
index 842eaf12f..d2bfbd319 100644
--- a/app/javascript/widget/i18n/locale/vi.json
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "Tên đầy đủ",
         "PLACEHOLDER": "Vui lòng nhập tên đầy đủ của bạn",
-        "ERROR": "Tên đầy đủ là bắt buộc"
+        "REQUIRED_ERROR": "Tên đầy đủ là bắt buộc"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "Email",
         "PLACEHOLDER": "Vui lòng nhập email",
-        "ERROR": "Email không hợp lệ"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "Vui lòng nhập một địa chỉ email hợp lệ"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "Số điện thoại",
+        "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": "Tin nhắn",
@@ -57,7 +64,8 @@
         "ERROR": "Tin nhắnn quá ngắn"
       }
     },
-    "CAMPAIGN_HEADER": "Vui lòng cung cấp tên và địa chỉ email của bạn trước khi bắt đầu cuộc trò chuyện"
+    "CAMPAIGN_HEADER": "Vui lòng cung cấp tên và địa chỉ email của bạn trước khi bắt đầu cuộc trò chuyện",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "File 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 dc2319c5c..5eb3369e3 100644
--- a/app/javascript/widget/i18n/locale/zh_CN.json
+++ b/app/javascript/widget/i18n/locale/zh_CN.json
@@ -22,7 +22,7 @@
     "IN_A_DAY": "通常在一天之内回复您"
   },
   "START_CONVERSATION": "开始会话",
-  "END_CONVERSATION": "End Conversation",
+  "END_CONVERSATION": "结束对话",
   "CONTINUE_CONVERSATION": "继续对话",
   "START_NEW_CONVERSATION": "开始新的对话",
   "UNREAD_VIEW": {
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "名字",
         "PLACEHOLDER": "请输入您的姓名",
-        "ERROR": "必须填写姓名"
+        "REQUIRED_ERROR": "必须填写姓名"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "电子邮件地址",
         "PLACEHOLDER": "请输入您的邮箱地址",
-        "ERROR": "无效的邮箱地址"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "请输入一个有效的电子邮件"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "电话号码",
+        "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": "消息",
@@ -57,7 +64,8 @@
         "ERROR": "消息太短了"
       }
     },
-    "CAMPAIGN_HEADER": "请在开始对话之前提供您的姓名和电子邮件"
+    "CAMPAIGN_HEADER": "请在开始对话之前提供您的姓名和电子邮件",
+    "IS_REQUIRED": "is 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 020c5a21d..e1a7fcb5b 100644
--- a/app/javascript/widget/i18n/locale/zh_TW.json
+++ b/app/javascript/widget/i18n/locale/zh_TW.json
@@ -44,12 +44,19 @@
       "FULL_NAME": {
         "LABEL": "聯絡人姓名",
         "PLACEHOLDER": "請輸入您的完整姓名",
-        "ERROR": "姓名為必填"
+        "REQUIRED_ERROR": "姓名為必填"
       },
       "EMAIL_ADDRESS": {
         "LABEL": "電子信箱地址",
         "PLACEHOLDER": "請輸入你的 Email",
-        "ERROR": "無效的電子郵件"
+        "REQUIRED_ERROR": "Email Address is required",
+        "VALID_ERROR": "請輸入一個有效的電子信箱"
+      },
+      "PHONE_NUMBER": {
+        "LABEL": "聯絡人電話",
+        "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": "訊息",
@@ -57,7 +64,8 @@
         "ERROR": "訊息過短"
       }
     },
-    "CAMPAIGN_HEADER": "在開始對話之前請提供您的名字及電郵"
+    "CAMPAIGN_HEADER": "在開始對話之前請提供您的名字及電郵",
+    "IS_REQUIRED": "is required"
   },
   "FILE_SIZE_LIMIT": "{MAXIMUM_FILE_UPLOAD_SIZE} 已超出檔案大小限制",
   "CHAT_FORM": {
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 5836a40e3..35ed2e1b6 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -22,6 +22,8 @@ ar:
     reset_password_success: تم إرسال طلب إعادة تعيين كلمة المرور. يرجى مراجعة بريدك الإلكتروني للحصول على التعليمات.
     reset_password_failure: أوه! لم نتمكن من العثور على أي مستخدم بعنوان البريد الإلكتروني المحدد.
   errors:
+    webhook:
+      invalid: أحداث غير صالحة
     signup:
       disposable_email: نحن لا نسمح باسخدام عناوين البريد الإلكتروني المؤقتة
       invalid_email: لقد قمت بإدخال عنوان بريد إلكتروني غير صالح
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index d2036cad8..e52248b3e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -22,6 +22,8 @@ bg:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 400c1715e..e4b47f68b 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -22,6 +22,8 @@ ca:
     reset_password_success: Woot! S'ha restablert la contrasenya amb èxit. Revisa el correu per més instruccions.
     reset_password_failure: Uh ho! No s'ha trobat cap compte amb aquest correu electrònic.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Els correus d'un sol ús no s'accepten
       invalid_email: Heu introduït un correu electrònic no vàlid
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index f60f50bfc..3a72b05d1 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -22,6 +22,8 @@ cs:
     reset_password_success: Woot! Žádost o obnovení hesla byla úspěšná. Zkontrolujte svůj e-mail pro pokyny.
     reset_password_failure: Jejda! Nenašli jsme žádného uživatele se zadaným e-mailem.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Nepovolujeme jednorázové e-maily
       invalid_email: Zadali jste neplatný e-mail
diff --git a/config/locales/da.yml b/config/locales/da.yml
index d84bd3ea0..c2cc19c2a 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -22,6 +22,8 @@ da:
     reset_password_success: Woot! Anmodning om nulstilling af adgangskode er vellykket. Tjek din mail for instruktioner.
     reset_password_failure: Åh nej! Vi kunne ikke finde nogen bruger med den angivne e-mail.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Vi tillader ikke engangs e-mails
       invalid_email: Du har indtastet en ugyldig e-mail
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 93d7c5def..d39914a80 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -22,6 +22,8 @@ de:
     reset_password_success: Woot! Die Anforderung zum Zurücksetzen des Passworts ist erfolgreich. Überprüfen Sie Ihre E-Mails auf Anweisungen.
     reset_password_failure: Uh ho! Wir konnten keinen Benutzer mit der angegebenen E-Mail-Adresse finden.
   errors:
+    webhook:
+      invalid: Ungültige Events
     signup:
       disposable_email: Wir erlauben keine Einweg-E-Mails
       invalid_email: Sie haben eine ungültige E-Mail-Adresse eingegeben
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
index 516082ff1..25635c4dc 100644
--- a/config/locales/devise.ro.yml
+++ b/config/locales/devise.ro.yml
@@ -59,4 +59,4 @@ ro:
       not_saved:
         one: "O eroare a împiedicat salvarea acestui %{resource}:"
         few: "%{count} erori au împiedicat salvarea acestui %{resource}:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+        other: "%{count} erori au interzis salvarea acestui %{resource}:"
diff --git a/config/locales/devise.th.yml b/config/locales/devise.th.yml
index a06ceb177..18e1572bb 100644
--- a/config/locales/devise.th.yml
+++ b/config/locales/devise.th.yml
@@ -23,7 +23,7 @@ th:
       unlock_instructions:
         subject: "Unlock instructions"
       password_change:
-        subject: "Password Changed"
+        subject: "เปลี่ยนรหัสผ่านแล้ว"
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."
diff --git a/config/locales/devise.uk.yml b/config/locales/devise.uk.yml
index c34779784..bf3621c29 100644
--- a/config/locales/devise.uk.yml
+++ b/config/locales/devise.uk.yml
@@ -25,16 +25,16 @@ uk:
       password_change:
         subject: "Пароль змінено"
     omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
+      failure: "Не вдалося вас авторизувати з %{kind} , тому що \"%{reason}\"."
+      success: "Успішна аутентифікація з %{kind} аккаунта."
     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."
+      no_token: "Ви не можете отримати доступ до цієї сторінки без переходу з листа для зміни пароля. Якщо ви переходите з електронного листа для зміни паролю, переконайтеся, що використали повну URL-адресу."
+      send_instructions: "За декілька хвилин ви отримаєте лист із вказівками щодо відновлення пароля."
+      send_paranoid_instructions: "Якщо ваша адреса електронної пошти наявна в нашій базі даних, то за декілька хвилин ви отримаєте посилання на відновлення паролю на вашу електронну адресу."
+      updated: "Ваш пароль змінено. Ви увійшли в систему."
+      updated_not_active: "Ваш пароль було успішно змінено."
     registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      destroyed: "До побачення! Ваш обліковий запис було успішно видалено. Сподіваємось незабаром побачитись з вами знову."
       signed_up: "Ласкаво просимо! Ви успішно зареєструвалися."
       signed_up_but_inactive: "Ви успішно зареєструвалися, але не можете увійти в систему, тому що ваш обліковий запис ще не активовано."
       signed_up_but_locked: "Ви успішно зареєструвались. Але ми не можемо надати вам доступ до системи через те, що ваш обліковий запис заблоковано."
@@ -53,11 +53,11 @@ uk:
     messages:
       already_confirmed: "вже було підтверджено, будь ласка спробуйте увійти в систему"
       confirmation_period_expired: "потребує підтвердження протягом %{period}, будь ласка, подайте новий запит"
-      expired: "has expired, please request a new one"
+      expired: "вже закінчився термін дії. Будь ласка, зробіть новий запит"
       not_found: "не знайдено"
       not_locked: "не було заблоковано"
       not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        few: "%{count} errors prohibited this %{resource} from being saved:"
-        many: "%{count} errors prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
+        one: "1 помилка не дозволяє зберегти цей %{resource}:"
+        few: "Збереженню цього %{resource} заважало %{count} помилок:"
+        many: "Збереженню цього %{resource} заважало %{count} помилок:"
+        other: "Збереженню цього %{resource} заважало %{count} помилок:"
diff --git a/config/locales/devise.ur.yml b/config/locales/devise.ur.yml
new file mode 100644
index 000000000..48a1f8396
--- /dev/null
+++ b/config/locales/devise.ur.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ur:
+  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 45dfe2b5b..df71a715d 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -22,6 +22,8 @@ el:
     reset_password_success: Woot! Το αίτημά σας για επαναφορά κωδικού ενεργοποιήθηκε. Ελέξτε το email σας για οδηγίες.
     reset_password_failure: Ωχ όχι! Δεν υπάρχει κάποιος χρήστης με το συγκεκριμένο email.
   errors:
+    webhook:
+      invalid: Μη έγκυρα συμβάντα
     signup:
       disposable_email: Δεν επιτρέπονται προσωρινά emails
       invalid_email: Έχετε καταχωρήσει ακατάλληλο email
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a75cb63ae..4b8e36eb7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -22,6 +22,8 @@ es:
     reset_password_success: '¡Genial! La solicitud de restablecimiento de contraseña ha sido exitosa. Revisa tu correo para ver las instrucciones.'
     reset_password_failure: '¡Uh ho! No hemos podido encontrar ningún usuario con el correo electrónico especificado.'
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: No permitimos correos electrónicos desechables
       invalid_email: Ha introducido un correo electrónico no válido
@@ -42,7 +44,7 @@ es:
       conversations_count: Cantidad de conversaciones
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
-    default_group_by: day
+    default_group_by: día
   notifications:
     notification_title:
       conversation_creation: "[Nueva conversación] - #%{display_id} ha sido creado en %{inbox_name}"
@@ -51,12 +53,12 @@ es:
       conversation_mention: "Ha sido mencionado en la conversación [ID - %{display_id}] por %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} te mencionó en la historia: "
       deleted: Este mensaje se ha eliminado
     activity:
       status:
         resolved: "La conversación fue marcada por %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "Conversación fue resuelta por %{contact_name}"
         open: "La conversación fue reabierta por %{user_name}"
         pending: "La conversación fue marcada como pendiente por %{user_name}"
         snoozed: "La conversación fue pospuesta por %{user_name}"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 6bd5376c0..ad250ec62 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -22,6 +22,8 @@ fa:
     reset_password_success: سوت! درخواست ریست شدن رمز عبور با موفقیت ارسال شد. ایمیل خود را چک کنید
     reset_password_failure: اوه نه! کاربری با چنین ایمیلی وجود ندارد
   errors:
+    webhook:
+      invalid: رویدادهای نامعتبر
     signup:
       disposable_email: استفاده از ایمیل‌های موقت امکان‌پذیر نیست
       invalid_email: ایمیل وارد شده معتبر نیست
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index a6476829d..552fc7eb7 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -22,6 +22,8 @@ fi:
     reset_password_success: Woot! Salasanan nollauspyyntö onnistui. Tarkista sähköpostisi saadaksesi ohjeita.
     reset_password_failure: Hö! Emme löytäneet yhtään käyttäjää määritellyllä sähköpostilla.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Emme salli kertakäyttöisiä sähköposteja
       invalid_email: Olet syöttänyt virheellisen sähköpostin
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 73bb0601f..129940293 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -22,6 +22,8 @@ fr:
     reset_password_success: Super ! La demande de réinitialisation du mot de passe a réussi. Consultez vos e-mails pour obtenir des instructions.
     reset_password_failure: Oh oh ! Nous n'avons trouvé aucun utilisateur avec le courriel spécifié.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Nous n'autorisons pas les courriels jetables
       invalid_email: Vous avez entré un courriel non valide
@@ -42,7 +44,7 @@ fr:
       conversations_count: Nombre de conversations
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
-    default_group_by: day
+    default_group_by: jour
   notifications:
     notification_title:
       conversation_creation: "[Nouvelle conversation] - #%{display_id} a été créé dans %{inbox_name}"
@@ -51,12 +53,12 @@ fr:
       conversation_mention: "Vous avez été mentionné dans la conversation [ID - %{display_id}] par %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} vous a mentionné dans l'histoire: "
       deleted: Ce message a été supprimé
     activity:
       status:
         resolved: "La conversation a été marquée résolue par %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "La conversation a été résolue par %{contact_name}"
         open: "La conversation a été ré-ouverte par %{user_name}"
         pending: "La conversation a été marquée comme en attente par %{user_name}"
         snoozed: "La conversation a été reportée par %{user_name}"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 6549ef603..d605b98b0 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -22,6 +22,8 @@ he:
     reset_password_success: יאס! בקשה לאיפוס ססמה נשלחה בהצלחה. בדוק תיבת מייל להוראות.
     reset_password_failure: אופס! לא מצאנו משתמש עם המייל שצוין.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: אנחנו לא מאפשרים מיילים חד פעמיים
       invalid_email: הכנסת מייל לא תקין
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 6a60e3e66..0e045faad 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -22,6 +22,8 @@ hi:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 3caad6e0c..70b38bc1b 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -22,6 +22,8 @@ hu:
     reset_password_success: Mi?! A jelszóvisszaállítási kérésed sikeres volt. Nézd meg az e-mailed a részletekért.
     reset_password_failure: Jajj ne! Nem találtunk felhasználót ezzel az e-mailcímmel.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Nem támogatjuk az eldobható e-mailcímeket
       invalid_email: Hibás e-mailcímet adtál meg
diff --git a/config/locales/id.yml b/config/locales/id.yml
index f897bd7bd..a462a8fcb 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -22,6 +22,8 @@ id:
     reset_password_success: Woot! Permintaan pengaturan ulang kata sandi berhasil. Periksa email Anda untuk mendapatkan petunjuk.
     reset_password_failure: Aduh! Kami tidak dapat menemukan pengguna dengan email yang dimasukkan.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Kami tidak mengizinkan email sekali pakai
       invalid_email: Anda telah memasukkan email yang tidak valid
diff --git a/config/locales/it.yml b/config/locales/it.yml
index da456046c..a3864d218 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -22,6 +22,8 @@ it:
     reset_password_success: Woot! Richiesta di reimpostazione della password riuscita. Controlla la tua mail per le istruzioni.
     reset_password_failure: Uh ho! Non siamo riusciti a trovare alcun utente con l'email specificata.
   errors:
+    webhook:
+      invalid: Eventi non validi
     signup:
       disposable_email: Non consentiamo email usa e getta
       invalid_email: Hai inserito un'email non valida
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 61eae0b92..e55f52c5d 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -22,6 +22,8 @@ ja:
     reset_password_success: やりましたね! パスワードのリセットリクエストが成功しました。手順についてはメールを確認してください。
     reset_password_failure: メールアドレスが見つかりませんでした。
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: 使い捨てメールは許可されません
       invalid_email: 無効なメールアドレスを入力しました。
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index cfdcf802c..e0e4ba8ff 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -22,6 +22,8 @@ ko:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index eb1aae1db..c284b2a61 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -22,6 +22,8 @@ lv:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 84a66b1fe..2fdee2596 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -22,6 +22,8 @@ ml:
     reset_password_success: Woot! പാസ്‌വേഡ് പുനസജ്ജീകരണത്തിനുള്ള അഭ്യർത്ഥന വിജയകരമാണ്. നിർദ്ദേശങ്ങൾക്കായി നിങ്ങളുടെ മെയിൽ പരിശോധിക്കുക.
     reset_password_failure: ക്ഷമിക്കണം! നിർദ്ദിഷ്ട ഇമെയിൽ ഉള്ള ഒരു ഉപയോക്താവിനെയും ഞങ്ങൾക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: ഡിസ്പോസിബിൾ ഇമെയിലുകൾ ഞങ്ങൾ അനുവദിക്കുന്നില്ല
       invalid_email: നിങ്ങൾ ഒരു അസാധുവായ ഇമെയിൽ നൽകി
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 784f5d0d8..b5c5e27c7 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -22,6 +22,8 @@ ne:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 4b2d53c3c..aac903a2d 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -22,6 +22,8 @@ nl:
     reset_password_success: Woot! Verzoek om wachtwoord te resetten is gelukt. Controleer je e-mail voor instructies.
     reset_password_failure: Oh ho! We konden geen gebruiker vinden met het opgegeven e-mailadres.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Wij staan geen verwijderbare e-mails toe
       invalid_email: Je hebt een ongeldig e-mailadres ingevoerd
diff --git a/config/locales/no.yml b/config/locales/no.yml
index ba3d8c85c..35f78f939 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -22,6 +22,8 @@
     reset_password_success: Woot! Forespørsel om tilbakestilling av passord er vellykket. Sjekk innboksen for instruksjoner.
     reset_password_failure: Uff da! Vi fant ingen bruker med den angitte eposten.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Vi tillater ikke engangs e-poster
       invalid_email: Du har angitt en ugyldig e-post
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 21c86a614..5af376b28 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -22,6 +22,8 @@ pl:
     reset_password_success: Woot! Prośba o zresetowanie hasła zakończona pomyślnie. Sprawdź swoją pocztę, aby uzyskać instrukcje.
     reset_password_failure: Ups! Nie mogliśmy znaleźć żadnego użytkownika z podanym adresem e-mail.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Nie zezwalamy na jednorazowe konta e-mail
       invalid_email: Wprowadzono nieprawidłowy adres e-mail
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index fa5bc9ba6..ed033cea8 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -22,6 +22,8 @@ pt:
     reset_password_success: Legal! Pedido de redefinição de senha bem sucedido. Verifique seu e-mail para obter instruções.
     reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Não permitimos e-mails descartáveis
       invalid_email: Você digitou um email inválido
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 4c88c6f3a..2f7a8aeec 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -22,6 +22,8 @@ pt_BR:
     reset_password_success: Legal! A solicitação de alteração de senha foi bem sucedida. Verifique seu e-mail para obter instruções.
     reset_password_failure: Uh ho! Não conseguimos encontrar nenhum usuário com o e-mail especificado.
   errors:
+    webhook:
+      invalid: Eventos inválidos
     signup:
       disposable_email: Não permitimos e-mails descartáveis
       invalid_email: Você digitou um email inválido
@@ -42,7 +44,7 @@ pt_BR:
       conversations_count: Contagem de conversas
       avg_first_response_time: Tempo médio de primeira resposta (minutos)
       avg_resolution_time: Tempo médio de resolução (minutos)
-    default_group_by: day
+    default_group_by: dia
   notifications:
     notification_title:
       conversation_creation: "[Nova conversa] - #%{display_id} foi criado em %{inbox_name}"
@@ -51,12 +53,12 @@ pt_BR:
       conversation_mention: "Você foi mencionado na conversa [ID - %{display_id}] por %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} mencionou você na conversa: "
       deleted: Esta mensagem foi apagada
     activity:
       status:
         resolved: "Conversa foi marcada como resolvida por %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "A conversa foi resolvida por %{contact_name}"
         open: "Conversa foi reaberta por %{user_name}"
         pending: "Conversa foi marcada como pendente por %{user_name}"
         snoozed: "Conversa não atribuída por %{user_name}"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 603e72eb8..aaf9c81f0 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -22,6 +22,8 @@ ro:
     reset_password_success: Woot! Cererea de resetare a parolei a reusit. Verifica emailul pentru instructiuni.
     reset_password_failure: Nu am putut găsi niciun utilizator cu e-mailul specificat.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Nu permitem email-uri de unică folosință
       invalid_email: Ați introdus un e-mail invalid
@@ -29,78 +31,78 @@ ro:
       failed: Înregistrare eșuată
     contacts:
       import:
-        failed: File is blank
+        failed: Fișierul este necompletat
   reports:
-    period: Reporting period %{since} to %{until}
+    period: Perioada de raportare %{since}-%{until}
     agent_csv:
-      agent_name: Agent name
-      conversations_count: Conversations count
-      avg_first_response_time: Avg first response time (Minutes)
-      avg_resolution_time: Avg resolution time (Minutes)
+      agent_name: Nume agent
+      conversations_count: Conversațiile contează
+      avg_first_response_time: Avg primul timp de răspuns (minute)
+      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     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
+      team_name: Numele echipei
+      conversations_count: Conversațiile contează
+      avg_first_response_time: Avg primul timp de răspuns (minute)
+      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+    default_group_by: zi
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Conversație nouă] - #%{display_id} a fost creat în %{inbox_name}"
+      conversation_assignment: "[V-a fost atribuit] - #%{display_id} v-a fost atribuit"
+      assigned_conversation_new_message: "[Mesaj nou] - #%{display_id} %{content}"
+      conversation_mention: "Ați fost menționat în conversație [ID - %{display_id}] de către %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
-      deleted: This message was deleted
+      instagram_story_content: "%{story_sender} menționat în poveste: "
+      deleted: Acest mesaj a fost șters
     activity:
       status:
         resolved: "Conversația a fost marcată de %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "Conversația a fost rezolvată de %{contact_name}"
         open: "Conversația a fost redeschisă de %{user_name}"
-        pending: "Conversation was marked as pending by %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        pending: "Conversația a fost marcată ca fiind în așteptare de către %{user_name}"
+        snoozed: "Conversația a fost snoozed de %{user_name}"
+        auto_resolved: "Conversația a fost marcată de sistem din cauza %{duration} zile de inactivitate"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
+        self_assigned: "%{user_name} auto-atribuit această conversație"
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
         removed: "Conversație neasociată de %{user_name}"
       team:
         assigned: "Atribuit lui %{team_name} de %{user_name}"
-        assigned_with_assignee: "Assigned to %{assignee_name} via %{team_name} by %{user_name}"
-        removed: "Unassigned from %{team_name} by %{user_name}"
+        assigned_with_assignee: "Atribuit %{assignee_name} prin %{team_name} de către %{user_name}"
+        removed: "Neatribuit de la %{team_name} de către %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} adăugat %{labels}"
+        removed: "%{user_name} eliminat %{labels}"
+      muted: "%{user_name} a dezactivat conversația"
+      unmuted: "%{user_name} a activat conversația"
     templates:
       greeting_message_body: "%{account_name} răspunde de obicei în câteva ore."
       ways_to_reach_you_message_body: "Dă-i echipei o modalitate de a te contacta."
       email_input_box_message_body: "Primește notificări prin e-mail"
-      csat_input_message_body: "Please rate the conversation"
+      csat_input_message_body: "Vă rugăm să evaluați conversația"
     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} din %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} din %{inbox_name} <reply+%{reply_email}>'
       email_subject: "Mesaje noi în această conversație"
-      transcript_subject: "Conversation Transcript"
+      transcript_subject: "Trimite Transcriere"
     survey:
-      response: "Please rate this conversation, %{link}"
+      response: "Vă rugăm să evaluați această conversație, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} este online, încercați din nou mai târziu"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "Slack este un instrument de chat care vă reunește toate comunicările într-un singur loc. Prin integrarea Slack, puteți fi notificat cu privire la toate conversațiile noi din cont chiar în interiorul Slack-ului."
     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."
+      name: "Webhook-uri"
+      description: "Evenimentele Webhook vă oferă informații în timp real despre ceea ce se întâmplă în contul dvs. Puteți utiliza webhook-urile pentru a comunica evenimentele aplicațiilor preferate, cum ar fi Slack sau Github. Faceți clic pe Configurare pentru a configura webhooks dumneavoastră."
     dialogflow:
-      name: "Dialogflow"
-      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+      name: "Flux de dialog"
+      description: "Construiți chatboți folosind Dialogflow și conectați-i rapid la inbox. Lăsați roboții să se ocupe de interogări înainte de a le preda unui agent de servicii pentru clienți."
     fullcontact:
       name: "Fullcontact"
-      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
+      description: "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."
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b8d0f5601..f15779328 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -22,6 +22,8 @@ ru:
     reset_password_success: Круто! Запрос на сброс пароля удался. Проверьте почту для получения инструкций.
     reset_password_failure: Ой! Мы не смогли найти пользователя с указанным email.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Мы не разрешаем одноразовые почтовые ящики
       invalid_email: Вы ввели неверный email
@@ -51,7 +53,7 @@ ru:
       conversation_mention: "Вас упомянули в разговоре [ID - %{display_id}] %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} упомянул Вас в истории: "
       deleted: Это сообщение было удалено
     activity:
       status:
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index a8907feba..6a410382a 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -22,6 +22,8 @@ sk:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index a86f21978..b67c836e6 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -22,6 +22,8 @@ sr-Latn:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 327a8d4de..232d8953f 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -22,6 +22,8 @@ sv:
     reset_password_success: Woot! Begäran om återställning av lösenord lyckades. Kontrollera din e-post för instruktioner.
     reset_password_failure: Oj då! Vi kunde inte hitta någon användare med den angivna e-postadressen.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Vi tillåter inte engångsadresser
       invalid_email: Du har angett en ogiltig e-postadress
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 4db714fe6..3639960e8 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -22,6 +22,8 @@ ta:
     reset_password_success: வூட்! பாஸ்வேர்டை மீட்டமைப்பிற்கான கோரிக்கை வெற்றிகரமாக அனுப்பப்பட்டுள்ளது. வழிமுறைகளுக்கு உங்கள் ஈ-மெயிலைப் பார்க்கவும்.
     reset_password_failure: மன்னிக்கவும்! குறிப்பிட்ட ஈ-மெயிலுடன் எந்த பயனரையும் எங்களால் கண்டுபிடிக்க முடியவில்லை.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: களைந்துவிடும் இமெயில்களை நாங்கள் அனுமதிக்க மாட்டோம்
       invalid_email: நீங்கள் தவறான ஈ-மெயிலை உள்ளிட்டுள்ளீர்கள்
diff --git a/config/locales/th.yml b/config/locales/th.yml
index fd2c7625b..2932759a2 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -22,6 +22,8 @@ th:
     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:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: We do not allow disposable emails
       invalid_email: You have entered an invalid email
@@ -38,7 +40,7 @@ th:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     team_csv:
-      team_name: Team name
+      team_name: ชื่อทีม
       conversations_count: Conversations count
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 8963f5e6c..f74ddec45 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -22,6 +22,8 @@ tr:
     reset_password_success: Parola sıfırlama isteği başarılı. Talimatlar için postanızı kontrol edin.
     reset_password_failure: Belirtilen e-postaya sahip herhangi bir kullanıcı bulamadık.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Tek kullanımlık e-postalara izin vermiyoruz
       invalid_email: Geçersiz bir e-posta girdiniz
@@ -29,7 +31,7 @@ tr:
       failed: Kayıt başarısız oldu
     contacts:
       import:
-        failed: File is blank
+        failed: Dosya boş
   reports:
     period: Raporlama aralığı %{since}'dan %{until}'a
     agent_csv:
@@ -42,7 +44,7 @@ tr:
       conversations_count: Konuşma sayısı
       avg_first_response_time: Ortalama cevap süresi(dakika)
       avg_resolution_time: Ortalama çözüm üretme süresi(dakika)
-    default_group_by: day
+    default_group_by: gün
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
@@ -78,7 +80,7 @@ tr:
       greeting_message_body: "%{account_name} genellikle birkaç saat içinde yanıt verir."
       ways_to_reach_you_message_body: "Ekibin size ulaşması için bir bilgi verin."
       email_input_box_message_body: "E-posta ile haberdar olun"
-      csat_input_message_body: "Lütfen konuşmayı oylayın"
+      csat_input_message_body: "Lütfen görüşmeyi değerlendirin"
     reply:
       email:
         header:
@@ -87,7 +89,7 @@ tr:
       email_subject: "Bu görüşmedeki yeni mesajlar"
       transcript_subject: "Konuşma Metni"
     survey:
-      response: "Lütfen konuşmayı oylayın, %{link}"
+      response: "Lütfen bu görüşmeyi değerlendirin, %{link}"
   contacts:
     online:
       delete: "%{contact_name} is Online, please try again later"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3ac22e1ca..679312262 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -22,6 +22,8 @@ uk:
     reset_password_success: Круто! Запит на скидання пароля виконано успішно. Перевірте вашу пошту за подальшими інструкціями.
     reset_password_failure: Ой-ой! Ми не змогли знайти жодного користувача з цією адресою електронної пошти.
   errors:
+    webhook:
+      invalid: Недійсні події
     signup:
       disposable_email: Ми не дозволяємо використувати одноразові адреси електронної пошти
       invalid_email: Ви ввели неправильну адресу електронної пошти
@@ -42,59 +44,59 @@ uk:
       conversations_count: Кількість бесід
       avg_first_response_time: Середній час першої відповіді (Хвилин)
       avg_resolution_time: Середній час вирішення (Хвилин)
-    default_group_by: day
+    default_group_by: день
   notifications:
     notification_title:
-      conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
-      conversation_assignment: "[Assigned to you] - #%{display_id} has been assigned to you"
-      assigned_conversation_new_message: "[New message] - #%{display_id} %{content}"
-      conversation_mention: "You have been mentioned in conversation [ID - %{display_id}] by %{name}"
+      conversation_creation: "[Новий діалог] - #%{display_id} було створено в %{inbox_name}"
+      conversation_assignment: "[Призначено вам] - #%{display_id} було призначено вам"
+      assigned_conversation_new_message: "[Нове повідомлення] - #%{display_id} %{content}"
+      conversation_mention: "Ви були згадані в діалозі [ID - %{display_id}] від %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} згадав вас у сторіс: "
       deleted: Це повідомлення було видалено
     activity:
       status:
         resolved: "Розмова була відмічена як вирішена %{user_name}"
-        contact_resolved: "Conversation was resolved by %{contact_name}"
+        contact_resolved: "Діалог був закритий %{contact_name}"
         open: "Розмову знову відкрито %{user_name}"
         pending: "Бесіда була позначена як очікується %{user_name}"
-        snoozed: "Conversation was snoozed by %{user_name}"
-        auto_resolved: "Conversation was marked resolved by system due to %{duration} days of inactivity"
+        snoozed: "Розмова була відкладена %{user_name}"
+        auto_resolved: "Діалог був закритий системою через %{duration} днів неактивності"
       assignee:
-        self_assigned: "%{user_name} self-assigned this conversation"
-        assigned: "Assigned to %{assignee_name} by %{user_name}"
-        removed: "Conversation unassigned by %{user_name}"
+        self_assigned: "%{user_name} самостійно призначив цей діалог"
+        assigned: "Призначено до %{assignee_name} користувачем %{user_name}"
+        removed: "Діалог знято %{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}"
+        assigned: "Призначено до %{team_name} користувачем %{user_name}"
+        assigned_with_assignee: "Призначено до %{assignee_name} користувачем %{user_name} з %{team_name}"
+        removed: "Виключений з %{team_name} користувачем %{user_name}"
       labels:
-        added: "%{user_name} added %{labels}"
-        removed: "%{user_name} removed %{labels}"
-      muted: "%{user_name} has muted the conversation"
-      unmuted: "%{user_name} has unmuted the conversation"
+        added: "%{user_name} додав %{labels}"
+        removed: "%{user_name} видалив %{labels}"
+      muted: "%{user_name} включив безвучний режим"
+      unmuted: "%{user_name} виключив безвучний режим"
     templates:
-      greeting_message_body: "%{account_name} typically replies in a few hours."
+      greeting_message_body: "%{account_name} зазвичай відповідає за кілька годин."
       ways_to_reach_you_message_body: "Дайте команді можливість з вами зв'язатися."
       email_input_box_message_body: "Отримувати сповіщення електронною поштою"
-      csat_input_message_body: "Please rate the conversation"
+      csat_input_message_body: "Будь ласка, оцініть розмову"
     reply:
       email:
         header:
-          from_with_name: '%{assignee_name} from %{inbox_name} <%{from_email}>'
-          reply_with_name: '%{assignee_name} from %{inbox_name} <reply+%{reply_email}>'
-      email_subject: "New messages on this conversation"
-      transcript_subject: "Conversation Transcript"
+          from_with_name: '%{assignee_name} з %{inbox_name} <%{from_email}>'
+          reply_with_name: '%{assignee_name} від %{inbox_name} <reply+%{reply_email}>'
+      email_subject: "Нові повідомлення в цьому діалозі"
+      transcript_subject: "Транскрипція діалогу"
     survey:
-      response: "Please rate this conversation, %{link}"
+      response: "Будь ласка, оцініть цю розмову, %{link}"
   contacts:
     online:
-      delete: "%{contact_name} is Online, please try again later"
+      delete: "%{contact_name} в онлайні, будь ласка, спробуйте ще раз пізніше"
   integration_apps:
     slack:
       name: "Slack"
-      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+      description: "Slack - це інструмент чату, який об'єднує ваші комунікації разом в одному місці. Інтегруючи Slack, ви можете отримати повідомлення про всі нові діалоги у вашому обліковому записі прямо в Slack."
     webhooks:
       name: "Веб-хук"
       description: "Вебхуки автоматично повідомляють про те, що відбувається у вашому обліковому записі Chatwoot. Ви можете скористатись веб-хуками для обміну подіями з вашими улюбленими додатками, такими як Slack чи Github. Натисніть на Налаштування, щоб налаштувати web-хуки."
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
new file mode 100644
index 000000000..65c47be7d
--- /dev/null
+++ b/config/locales/ur.yml
@@ -0,0 +1,108 @@
+#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.
+ur:
+  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:
+    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
+    contacts:
+      import:
+        failed: File is blank
+  reports:
+    period: Reporting period %{since} to %{until}
+    agent_csv:
+      agent_name: Agent name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    team_csv:
+      team_name: Team name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    default_group_by: day
+  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: "
+      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}>'
+      email_subject: "New messages on this conversation"
+      transcript_subject: "Conversation Transcript"
+    survey:
+      response: "Please rate this conversation, %{link}"
+  contacts:
+    online:
+      delete: "%{contact_name} is Online, please try again later"
+  integration_apps:
+    slack:
+      name: "Slack"
+      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+    webhooks:
+      name: "Webhooks"
+      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+    dialogflow:
+      name: "Dialogflow"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    fullcontact:
+      name: "Fullcontact"
+      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 98e54baf2..fb74fa259 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -22,6 +22,8 @@ vi:
     reset_password_success: Chà! Yêu cầu đặt lại mật khẩu thành công. Kiểm tra thư của bạn để biết hướng dẫn.
     reset_password_failure: Uh ho! Chúng tôi không thể tìm thấy bất kỳ người dùng nào có email được chỉ định.
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: Chúng tôi không cho phép các email dùng một lần
       invalid_email: Bạn đã nhập một email không hợp lệ
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index f1c0d5abf..40b2d77ed 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -22,6 +22,8 @@ zh_CN:
     reset_password_success: 哇！密码重置请求成功。请检查您的邮件获取说明。
     reset_password_failure: 哎呀！我们找不到指定电子邮件的任何用户。
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: 我们不允许可用的电子邮件
       invalid_email: 您输入了一个无效的电子邮件
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 8fcc54a40..3463aa64e 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -22,6 +22,8 @@ zh_TW:
     reset_password_success: 密碼重設成功，請確認您的信箱有收到重設信件。
     reset_password_failure: 我們找不到用戶指定的電子郵件。
   errors:
+    webhook:
+      invalid: Invalid events
     signup:
       disposable_email: 我們不允許一次性電子郵件。
       invalid_email: 您輸入的電子郵件無效。

From 0eeab8c56c1af6cd5ff8e5b9e048a49e59fb2fc1 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 9 May 2022 19:18:30 +0530
Subject: [PATCH 101/177] Fix: slack repeated callback event message for
 attached files (#4610)

---
 lib/integrations/slack/incoming_message_builder.rb   | 12 ++++++++++--
 .../slack/incoming_message_builder_spec.rb           | 12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index b7c235b35..ec4f8e2b5 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -35,9 +35,9 @@ class Integrations::Slack::IncomingMessageBuilder
 
   def supported_message?
     if message.present?
-      SUPPORTED_MESSAGE_TYPES.include?(message[:type])
+      SUPPORTED_MESSAGE_TYPES.include?(message[:type]) && !attached_file_message?
     else
-      params.dig(:event, :files).any?
+      params[:event][:files].any? && !attached_file_message?
     end
   end
 
@@ -135,4 +135,12 @@ class Integrations::Slack::IncomingMessageBuilder
       :file
     end
   end
+
+  # Ignoring the changes added here https://github.com/chatwoot/chatwoot/blob/5b5a6d89c0cf7f3148a1439d6fcd847784a79b94/lib/integrations/slack/send_on_slack_service.rb#L69
+  # This make sure 'Attached File!' comment is not visible on CW dashboard.
+  # This is showing because of https://github.com/chatwoot/chatwoot/pull/4494/commits/07a1c0da1e522d76e37b5f0cecdb4613389ab9b6 change.
+  # As now we consider the postback message with event[:files]
+  def attached_file_message?
+    params[:event][:text] == 'Attached File!'
+  end
 end
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index 43bf2f35d..1695331c3 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -71,6 +71,18 @@ describe Integrations::Slack::IncomingMessageBuilder do
         expect(conversation.messages.last.content).to eql('this is test https://chatwoot.com Hey @Sojan Test again')
         expect(conversation.messages.last.attachments).to be_any
       end
+
+      it 'ignore message if it is postback of CW attachment message' do
+        expect(hook).not_to eq nil
+        messages_count = conversation.messages.count
+        message_with_attachments[:event][:text] = 'Attached File!'
+        builder = described_class.new(message_with_attachments)
+
+        allow(builder).to receive(:sender).and_return(nil)
+        builder.perform
+
+        expect(conversation.messages.count).to eql(messages_count)
+      end
     end
   end
 end

From f64cf85ab24e933e9469d0eab45c748f4f859f3e Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 9 May 2022 23:54:45 +0530
Subject: [PATCH 102/177] Fix: sentry issue for slack incoming files check
 (#4656)

Interpreter error for nil. any? added nil. present?

Fixes: https://sentry.io/share/issue/48c10d26490f4bdaab78c82244fcea98/
---
 lib/integrations/slack/incoming_message_builder.rb       | 2 +-
 .../integrations/slack/incoming_message_builder_spec.rb  | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index ec4f8e2b5..86c3c232b 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -37,7 +37,7 @@ class Integrations::Slack::IncomingMessageBuilder
     if message.present?
       SUPPORTED_MESSAGE_TYPES.include?(message[:type]) && !attached_file_message?
     else
-      params[:event][:files].any? && !attached_file_message?
+      params[:event][:files].present? && !attached_file_message?
     end
   end
 
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index 1695331c3..0eede30cf 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -61,6 +61,15 @@ describe Integrations::Slack::IncomingMessageBuilder do
         expect(conversation.messages.count).to eql(messages_count)
       end
 
+      it 'does not create message for invalid event type and event files is not present' do
+        messages_count = conversation.messages.count
+        message_with_attachments[:event][:files] = nil
+        builder = described_class.new(message_with_attachments)
+        allow(builder).to receive(:sender).and_return(nil)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count)
+      end
+
       it 'saves attachment if params files present' do
         expect(hook).not_to eq nil
         messages_count = conversation.messages.count

From 81d0405473109971e24773657705fa4e77af49fb Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 10 May 2022 00:28:46 +0530
Subject: [PATCH 103/177] chore: Ability to update user email via Platform APIs
 (#4659)

When the platform update API is called with a new user email, Chatwoot will still follow the same behaviour as in the dashboard where the user will have to confirm the new email activation link until the email gets updated on the user record.

In the case of platform APIs, this might not be the ideal behaviour since the original app will already have a flow to update the user emails. Hence we need to confirm the emails without the extra step in this case

fixes: #4510
---
 app/controllers/platform/api/v1/users_controller.rb       | 4 ++++
 spec/controllers/platform/api/v1/users_controller_spec.rb | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/platform/api/v1/users_controller.rb b/app/controllers/platform/api/v1/users_controller.rb
index c9f256c6f..4a7eafc9c 100644
--- a/app/controllers/platform/api/v1/users_controller.rb
+++ b/app/controllers/platform/api/v1/users_controller.rb
@@ -21,6 +21,10 @@ class Platform::Api::V1::UsersController < PlatformController
 
   def update
     @resource.assign_attributes(user_update_params)
+
+    # We are using devise's reconfirmable flow for changing emails
+    # But in case of platform APIs we don't want user to go through this extra step
+    @resource.skip_reconfirmation! if user_update_params[:email].present?
     @resource.save!
   end
 
diff --git a/spec/controllers/platform/api/v1/users_controller_spec.rb b/spec/controllers/platform/api/v1/users_controller_spec.rb
index e2e9d17df..6ed3cbb7d 100644
--- a/spec/controllers/platform/api/v1/users_controller_spec.rb
+++ b/spec/controllers/platform/api/v1/users_controller_spec.rb
@@ -145,14 +145,17 @@ RSpec.describe 'Platform Users API', type: :request do
         expect(response).to have_http_status(:unauthorized)
       end
 
-      it 'updates the user' do
+      it 'updates the user attributes' do
         create(:platform_app_permissible, platform_app: platform_app, permissible: user)
-        patch "/platform/api/v1/users/#{user.id}", params: { name: 'test123', custom_attributes: { test: 'test_update' } },
+        patch "/platform/api/v1/users/#{user.id}", params: {
+          name: 'test123', email: 'newtestemail@test.com', custom_attributes: { test: 'test_update' }
+        },
                                                    headers: { api_access_token: platform_app.access_token.token }, as: :json
 
         expect(response).to have_http_status(:success)
         data = JSON.parse(response.body)
         expect(data['name']).to eq('test123')
+        expect(data['email']).to eq('newtestemail@test.com')
         expect(data['custom_attributes']['test']).to eq('test_update')
       end
     end

From 9ed1f5d96b558564bfcd5e3d1c6cc2b47790e33f Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 10 May 2022 19:20:55 +0530
Subject: [PATCH 104/177] Fix: Make version changeable from the environment
 vars (#4654)

---
 app/controllers/dashboard_controller.rb                    | 7 +++++--
 app/javascript/dashboard/helper/scriptGenerator.js         | 2 +-
 .../routes/dashboard/settings/inbox/channels/Facebook.vue  | 2 +-
 .../dashboard/settings/inbox/facebook/Reauthorize.vue      | 2 +-
 app/views/layouts/vueapp.html.erb                          | 1 +
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 2bb8e9847..107aec56e 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -38,9 +38,12 @@ class DashboardController < ActionController::Base
   end
 
   def app_config
-    { APP_VERSION: Chatwoot.config[:version],
+    {
+      APP_VERSION: Chatwoot.config[:version],
       VAPID_PUBLIC_KEY: VapidService.public_key,
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
-      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', '') }
+      FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
+      FACEBOOK_API_VERSION: 'v13.0'
+    }
   end
 end
diff --git a/app/javascript/dashboard/helper/scriptGenerator.js b/app/javascript/dashboard/helper/scriptGenerator.js
index 5a278d30a..bb6f2a72f 100644
--- a/app/javascript/dashboard/helper/scriptGenerator.js
+++ b/app/javascript/dashboard/helper/scriptGenerator.js
@@ -4,7 +4,7 @@ export const createMessengerScript = pageId => `
     FB.init({
       appId: "${window.chatwootConfig.fbAppId}",
       xfbml: true,
-      version: "v4.0"
+      version: "${window.chatwootConfig.fbApiVersion}"
     });
   };
   (function(d, s, id){
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
index 820b4631b..31eff872e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Facebook.vue
@@ -163,7 +163,7 @@ export default {
           FB.init({
             appId: window.chatwootConfig.fbAppId,
             xfbml: true,
-            version: 'v12.0',
+            version: window.chatwootConfig.fbApiVersion,
             status: true,
           });
           window.fbSDKLoaded = true;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
index 736642f29..d86ebaaff 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/facebook/Reauthorize.vue
@@ -40,7 +40,7 @@ export default {
           FB.init({
             appId: window.chatwootConfig.fbAppId,
             xfbml: true,
-            version: 'v12.0',
+            version: window.chatwootConfig.fbApiVersion,
             status: true,
           });
           window.fbSDKLoaded = true;
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index f7d7155d1..3f91ac042 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -34,6 +34,7 @@
       window.chatwootConfig = {
         hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>',
         fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>',
+        fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
         signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
         <% if @global_config['VAPID_PUBLIC_KEY'] %>
         vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),

From 9cec0917165a21651b335f8beac10f259da1ba56 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 11 May 2022 12:05:42 +0530
Subject: [PATCH 105/177] chore: Remove unused method scriptGenerator (#4671)

---
 .../dashboard/helper/scriptGenerator.js       | 25 -------------------
 .../dashboard/settings/inbox/Settings.vue     |  4 ---
 2 files changed, 29 deletions(-)
 delete mode 100644 app/javascript/dashboard/helper/scriptGenerator.js

diff --git a/app/javascript/dashboard/helper/scriptGenerator.js b/app/javascript/dashboard/helper/scriptGenerator.js
deleted file mode 100644
index bb6f2a72f..000000000
--- a/app/javascript/dashboard/helper/scriptGenerator.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export const createMessengerScript = pageId => `
-<script>
-  window.fbAsyncInit = function() {
-    FB.init({
-      appId: "${window.chatwootConfig.fbAppId}",
-      xfbml: true,
-      version: "${window.chatwootConfig.fbApiVersion}"
-    });
-  };
-  (function(d, s, id){
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) { return; }
-      js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/en_US/sdk.js";
-      fjs.parentNode.insertBefore(js, fjs);
-  }(document, 'script', 'facebook-jssdk'));
-
-</script>
-<div class="fb-messengermessageus"
-  messenger_app_id="${window.chatwootConfig.fbAppId}"
-  page_id="${pageId}"
-  color="blue"
-  size="standard" >
-</div>
-`;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 16b6b0f74..38a1c5e98 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -436,7 +436,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { createMessengerScript } from 'dashboard/helper/scriptGenerator';
 import { required } from 'vuelidate/lib/validators';
 import { shouldBeUrl } from 'shared/helpers/Validators';
 import configMixin from 'shared/mixins/configMixin';
@@ -568,9 +567,6 @@ export default {
       }
       return this.inbox.name;
     },
-    messengerScript() {
-      return createMessengerScript(this.inbox.page_id);
-    },
     inboxNameLabel() {
       if (this.isAWebWidgetInbox) {
         return this.$t('INBOX_MGMT.ADD.WEBSITE_NAME.LABEL');

From 5c161e0fefd14aa1769480a78829761cf464ecb2 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 11 May 2022 13:33:24 +0530
Subject: [PATCH 106/177] chore: Split Inbox Settings Page Component (#4664)

Clean up the Inbox settings page component as the logic was growing complex.

- Moved subpages like collaborators and configuration to new components
- Moved Assignment settings to the collaborators tab
- Introduced a new inbox seeder to quickly preview setting pages of all inbox types when in development
---
 .../dashboard/i18n/locale/en/inboxMgmt.json   |   6 +-
 .../dashboard/settings/inbox/Settings.vue     | 185 +-----------------
 .../inbox/settingsPage/CollaboratorsPage.vue  | 148 ++++++++++++++
 .../inbox/settingsPage/ConfigurationPage.vue  | 130 ++++++++++++
 lib/seeders/account_seeder.rb                 |  62 ++++++
 5 files changed, 348 insertions(+), 183 deletions(-)
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 218d1cf95..405348058 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "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",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 38a1c5e98..344ea218c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -189,21 +189,6 @@
           </p>
         </label>
 
-        <label class="medium-9 columns settings-item">
-          {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
-          <select v-model="autoAssignment">
-            <option :value="true">
-              {{ $t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.ENABLED') }}
-            </option>
-            <option :value="false">
-              {{ $t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.DISABLED') }}
-            </option>
-          </select>
-          <p class="help-text">
-            {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT_SUB_TEXT') }}
-          </p>
-        </label>
-
         <label class="medium-9 columns settings-item">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.ENABLE_CSAT') }}
           <select v-model="csatSurveyEnabled">
@@ -316,114 +301,11 @@
       <facebook-reauthorize v-if="isAFacebookInbox" :inbox-id="inbox.id" />
     </div>
 
-    <!-- update agents in inbox -->
-
     <div v-if="selectedTabKey === 'collaborators'" class="settings--content">
-      <settings-section
-        :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_AGENTS')"
-        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_AGENTS_SUB_TEXT')"
-      >
-        <multiselect
-          v-model="selectedAgents"
-          :options="agentList"
-          track-by="id"
-          label="name"
-          :multiple="true"
-          :close-on-select="false"
-          :clear-on-select="false"
-          :hide-selected="true"
-          placeholder="Pick some"
-          selected-label
-          :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
-          :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
-          @select="$v.selectedAgents.$touch"
-        />
-
-        <woot-submit-button
-          :button-text="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
-          :loading="isAgentListUpdating"
-          @click="updateAgents"
-        />
-      </settings-section>
+      <collaborators-page :inbox="inbox" />
     </div>
     <div v-if="selectedTabKey === 'configuration'">
-      <div v-if="isATwilioChannel" class="settings--content">
-        <settings-section
-          :title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.TITLE')"
-          :sub-title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.SUBTITLE')"
-        >
-          <woot-code
-            :script="inbox.callback_webhook_url"
-            lang="html"
-          ></woot-code>
-        </settings-section>
-      </div>
-      <div v-else-if="isALineChannel" class="settings--content">
-        <settings-section
-          :title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.TITLE')"
-          :sub-title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.SUBTITLE')"
-        >
-          <woot-code
-            :script="inbox.callback_webhook_url"
-            lang="html"
-          ></woot-code>
-        </settings-section>
-      </div>
-      <div v-else-if="isAWebWidgetInbox">
-        <div class="settings--content">
-          <settings-section
-            :title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_HEADING')"
-            :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_SUB_HEAD')"
-          >
-            <woot-code :script="inbox.web_widget_script"></woot-code>
-          </settings-section>
-
-          <settings-section
-            :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_VERIFICATION')"
-            :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_DESCRIPTION')"
-          >
-            <woot-code :script="inbox.hmac_token"></woot-code>
-          </settings-section>
-          <settings-section
-            :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
-            :sub-title="
-              $t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_DESCRIPTION')
-            "
-          >
-            <div class="enter-to-send--checkbox">
-              <input
-                id="hmacMandatory"
-                v-model="hmacMandatory"
-                type="checkbox"
-                @change="handleHmacFlag"
-              />
-              <label for="hmacMandatory">
-                {{ $t('INBOX_MGMT.EDIT.ENABLE_HMAC.LABEL') }}
-              </label>
-            </div>
-          </settings-section>
-        </div>
-      </div>
-      <div v-else-if="isAPIInbox" class="settings--content">
-        <settings-section
-          :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER')"
-          :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER_SUB_TEXT')"
-        >
-          <woot-code :script="inbox.inbox_identifier"></woot-code>
-        </settings-section>
-      </div>
-      <div v-else-if="isAnEmailChannel">
-        <div class="settings--content">
-          <settings-section
-            :title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_TITLE')"
-            :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')"
-          >
-            <woot-code :script="inbox.forward_to_email"></woot-code>
-          </settings-section>
-        </div>
-        <imap-settings :inbox="inbox" />
-        <smtp-settings v-if="inbox.imap_enabled" :inbox="inbox" />
-      </div>
+      <configuration-page :inbox="inbox" />
     </div>
     <div v-if="selectedTabKey === 'preChatForm'">
       <pre-chat-form-settings :inbox="inbox" />
@@ -447,8 +329,8 @@ import FacebookReauthorize from './facebook/Reauthorize';
 import PreChatFormSettings from './PreChatForm/Settings';
 import WeeklyAvailability from './components/WeeklyAvailability';
 import GreetingsEditor from 'shared/components/GreetingsEditor';
-import ImapSettings from './ImapSettings';
-import SmtpSettings from './SmtpSettings';
+import ConfigurationPage from './settingsPage/ConfigurationPage';
+import CollaboratorsPage from './settingsPage/CollaboratorsPage';
 
 export default {
   components: {
@@ -458,22 +340,18 @@ export default {
     PreChatFormSettings,
     WeeklyAvailability,
     GreetingsEditor,
-    ImapSettings,
-    SmtpSettings,
+    ConfigurationPage,
+    CollaboratorsPage,
   },
   mixins: [alertMixin, configMixin, inboxMixin],
   data() {
     return {
       avatarFile: null,
       avatarUrl: '',
-      selectedAgents: [],
       greetingEnabled: true,
       tweetsEnabled: true,
-      hmacMandatory: null,
       greetingMessage: '',
-      autoAssignment: false,
       emailCollectEnabled: false,
-      isAgentListUpdating: false,
       csatSurveyEnabled: false,
       allowMessagesAfterResolved: true,
       continuityViaEmail: true,
@@ -484,22 +362,11 @@ export default {
       channelWelcomeTagline: '',
       selectedFeatureFlags: [],
       replyTime: '',
-      autoAssignmentOptions: [
-        {
-          value: true,
-          label: this.$t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.ENABLED'),
-        },
-        {
-          value: false,
-          label: this.$t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.DISABLED'),
-        },
-      ],
       selectedTabIndex: 0,
     };
   },
   computed: {
     ...mapGetters({
-      agentList: 'agents/getAgents',
       uiFlags: 'inboxes/getUIFlags',
     }),
     selectedTabKey() {
@@ -606,9 +473,6 @@ export default {
         e.target.value
       );
     },
-    handleHmacFlag() {
-      this.updateInbox();
-    },
     toggleInput(selected, current) {
       if (selected.includes(current)) {
         const newSelectedFlags = selected.filter(flag => flag !== current);
@@ -626,15 +490,12 @@ export default {
       this.$store.dispatch('teams/get');
       this.$store.dispatch('labels/get');
       this.$store.dispatch('inboxes/get').then(() => {
-        this.fetchAttachedAgents();
         this.avatarUrl = this.inbox.avatar_url;
         this.selectedInboxName = this.inbox.name;
         this.webhookUrl = this.inbox.webhook_url;
         this.greetingEnabled = this.inbox.greeting_enabled || false;
         this.tweetsEnabled = this.inbox.tweets_enabled || false;
-        this.hmacMandatory = this.inbox.hmac_mandatory || false;
         this.greetingMessage = this.inbox.greeting_message || '';
-        this.autoAssignment = this.inbox.enable_auto_assignment;
         this.emailCollectEnabled = this.inbox.enable_email_collect;
         this.csatSurveyEnabled = this.inbox.csat_survey_enabled;
         this.allowMessagesAfterResolved = this.inbox.allow_messages_after_resolved;
@@ -646,39 +507,11 @@ export default {
         this.replyTime = this.inbox.reply_time;
       });
     },
-    async fetchAttachedAgents() {
-      try {
-        const response = await this.$store.dispatch('inboxMembers/get', {
-          inboxId: this.currentInboxId,
-        });
-        const {
-          data: { payload: inboxMembers },
-        } = response;
-        this.selectedAgents = inboxMembers;
-      } catch (error) {
-        //  Handle error
-      }
-    },
-    async updateAgents() {
-      const agentList = this.selectedAgents.map(el => el.id);
-      this.isAgentListUpdating = true;
-      try {
-        await this.$store.dispatch('inboxMembers/create', {
-          inboxId: this.currentInboxId,
-          agentList,
-        });
-        this.showAlert(this.$t('AGENT_MGMT.EDIT.API.SUCCESS_MESSAGE'));
-      } catch (error) {
-        this.showAlert(this.$t('AGENT_MGMT.EDIT.API.ERROR_MESSAGE'));
-      }
-      this.isAgentListUpdating = false;
-    },
     async updateInbox() {
       try {
         const payload = {
           id: this.currentInboxId,
           name: this.selectedInboxName,
-          enable_auto_assignment: this.autoAssignment,
           enable_email_collect: this.emailCollectEnabled,
           csat_survey_enabled: this.csatSurveyEnabled,
           allow_messages_after_resolved: this.allowMessagesAfterResolved,
@@ -692,7 +525,6 @@ export default {
             welcome_tagline: this.channelWelcomeTagline || '',
             selectedFeatureFlags: this.selectedFeatureFlags,
             reply_time: this.replyTime || 'in_a_few_minutes',
-            hmac_mandatory: this.hmacMandatory,
             tweets_enabled: this.tweetsEnabled,
             continuity_via_email: this.continuityViaEmail,
           },
@@ -733,11 +565,6 @@ export default {
       required,
       shouldBeUrl,
     },
-    selectedAgents: {
-      isEmpty() {
-        return !!this.selectedAgents.length;
-      },
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
new file mode 100644
index 000000000..2b3fa413f
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <settings-section
+      :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_AGENTS')"
+      :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_AGENTS_SUB_TEXT')"
+    >
+      <multiselect
+        v-model="selectedAgents"
+        :options="agentList"
+        track-by="id"
+        label="name"
+        :multiple="true"
+        :close-on-select="false"
+        :clear-on-select="false"
+        :hide-selected="true"
+        placeholder="Pick some"
+        selected-label
+        :select-label="$t('FORMS.MULTISELECT.ENTER_TO_SELECT')"
+        :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
+        @select="$v.selectedAgents.$touch"
+      />
+
+      <woot-submit-button
+        :button-text="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
+        :loading="isAgentListUpdating"
+        @click="updateAgents"
+      />
+    </settings-section>
+
+    <settings-section
+      :title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT')"
+      :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.AGENT_ASSIGNMENT_SUB_TEXT')"
+    >
+      <label class="medium-9 columns settings-item">
+        <div class="enter-to-send--checkbox">
+          <input
+            id="enableAutoAssignment"
+            v-model="enableAutoAssignment"
+            type="checkbox"
+            @change="handleEnableAutoAssignment"
+          />
+          <label for="enableAutoAssignment">
+            {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
+          </label>
+        </div>
+
+        <p class="help-text">
+          {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT_SUB_TEXT') }}
+        </p>
+      </label>
+    </settings-section>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+import SettingsSection from '../../../../../components/SettingsSection';
+
+export default {
+  components: {
+    SettingsSection,
+  },
+  mixins: [alertMixin],
+  props: {
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      selectedAgents: [],
+      isAgentListUpdating: false,
+      enableAutoAssignment: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      agentList: 'agents/getAgents',
+    }),
+  },
+  watch: {
+    inbox() {
+      this.setDefaults();
+    },
+  },
+  mounted() {
+    this.setDefaults();
+  },
+  methods: {
+    setDefaults() {
+      this.enableAutoAssignment = this.inbox.enable_auto_assignment;
+      this.fetchAttachedAgents();
+    },
+    async fetchAttachedAgents() {
+      try {
+        const response = await this.$store.dispatch('inboxMembers/get', {
+          inboxId: this.inbox.id,
+        });
+        const {
+          data: { payload: inboxMembers },
+        } = response;
+        this.selectedAgents = inboxMembers;
+      } catch (error) {
+        //  Handle error
+      }
+    },
+    handleEnableAutoAssignment() {
+      this.updateInbox();
+    },
+    async updateAgents() {
+      const agentList = this.selectedAgents.map(el => el.id);
+      this.isAgentListUpdating = true;
+      try {
+        await this.$store.dispatch('inboxMembers/create', {
+          inboxId: this.inbox.id,
+          agentList,
+        });
+        this.showAlert(this.$t('AGENT_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('AGENT_MGMT.EDIT.API.ERROR_MESSAGE'));
+      }
+      this.isAgentListUpdating = false;
+    },
+    async updateInbox() {
+      try {
+        const payload = {
+          id: this.inbox.id,
+          formData: false,
+          enable_auto_assignment: this.enableAutoAssignment,
+        };
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      }
+    },
+  },
+  validations: {
+    selectedAgents: {
+      isEmpty() {
+        return !!this.selectedAgents.length;
+      },
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
new file mode 100644
index 000000000..cc8746fed
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -0,0 +1,130 @@
+<template>
+  <div v-if="isATwilioChannel" class="settings--content">
+    <settings-section
+      :title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.TITLE')"
+      :sub-title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.SUBTITLE')"
+    >
+      <woot-code :script="inbox.callback_webhook_url" lang="html"></woot-code>
+    </settings-section>
+  </div>
+  <div v-else-if="isALineChannel" class="settings--content">
+    <settings-section
+      :title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.TITLE')"
+      :sub-title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.SUBTITLE')"
+    >
+      <woot-code :script="inbox.callback_webhook_url" lang="html"></woot-code>
+    </settings-section>
+  </div>
+  <div v-else-if="isAWebWidgetInbox">
+    <div class="settings--content">
+      <settings-section
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_HEADING')"
+        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_SUB_HEAD')"
+      >
+        <woot-code :script="inbox.web_widget_script"></woot-code>
+      </settings-section>
+
+      <settings-section
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_VERIFICATION')"
+        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_DESCRIPTION')"
+      >
+        <woot-code :script="inbox.hmac_token"></woot-code>
+      </settings-section>
+      <settings-section
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
+        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_DESCRIPTION')"
+      >
+        <div class="enter-to-send--checkbox">
+          <input
+            id="hmacMandatory"
+            v-model="hmacMandatory"
+            type="checkbox"
+            @change="handleHmacFlag"
+          />
+          <label for="hmacMandatory">
+            {{ $t('INBOX_MGMT.EDIT.ENABLE_HMAC.LABEL') }}
+          </label>
+        </div>
+      </settings-section>
+    </div>
+  </div>
+  <div v-else-if="isAPIInbox" class="settings--content">
+    <settings-section
+      :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER')"
+      :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER_SUB_TEXT')"
+    >
+      <woot-code :script="inbox.inbox_identifier"></woot-code>
+    </settings-section>
+  </div>
+  <div v-else-if="isAnEmailChannel">
+    <div class="settings--content">
+      <settings-section
+        :title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_TITLE')"
+        :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')"
+      >
+        <woot-code :script="inbox.forward_to_email"></woot-code>
+      </settings-section>
+    </div>
+    <imap-settings :inbox="inbox" />
+    <smtp-settings v-if="inbox.imap_enabled" :inbox="inbox" />
+  </div>
+</template>
+
+<script>
+import alertMixin from 'shared/mixins/alertMixin';
+import inboxMixin from 'shared/mixins/inboxMixin';
+import SettingsSection from '../../../../../components/SettingsSection';
+import ImapSettings from '../ImapSettings';
+import SmtpSettings from '../SmtpSettings';
+
+export default {
+  components: {
+    SettingsSection,
+    ImapSettings,
+    SmtpSettings,
+  },
+  mixins: [inboxMixin, alertMixin],
+  props: {
+    inbox: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      hmacMandatory: false,
+    };
+  },
+  watch: {
+    inbox() {
+      this.setDefaults();
+    },
+  },
+  mounted() {
+    this.setDefaults();
+  },
+  methods: {
+    setDefaults() {
+      this.hmacMandatory = this.inbox.hmac_mandatory || false;
+    },
+    handleHmacFlag() {
+      this.updateInbox();
+    },
+    async updateInbox() {
+      try {
+        const payload = {
+          id: this.inbox.id,
+          formData: false,
+          channel: {
+            hmac_mandatory: this.hmacMandatory,
+          },
+        };
+        await this.$store.dispatch('inboxes/updateInbox', payload);
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      } catch (error) {
+        this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+      }
+    },
+  },
+};
+</script>
diff --git a/lib/seeders/account_seeder.rb b/lib/seeders/account_seeder.rb
index 65fe5a4e1..162bc4cd9 100644
--- a/lib/seeders/account_seeder.rb
+++ b/lib/seeders/account_seeder.rb
@@ -17,6 +17,7 @@ class Seeders::AccountSeeder
 
   def seed!
     seed_canned_responses
+    seed_inboxes
   end
 
   def seed_canned_responses(count: 50)
@@ -24,4 +25,65 @@ class Seeders::AccountSeeder
       account.canned_responses.create(content: Faker::Quote.fortune_cookie, short_code: Faker::Alphanumeric.alpha(number: 10))
     end
   end
+
+  def seed_inboxes
+    seed_website_inbox
+    seed_facebook_inbox
+    seed_twitter_inbox
+    seed_whatsapp_inbox
+    seed_sms_inbox
+    seed_email_inbox
+    seed_api_inbox
+    seed_telegram_inbox
+    seed_line_inbox
+  end
+
+  def seed_website_inbox
+    channel = Channel::WebWidget.create!(account: account, website_url: 'https://acme.inc')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Website')
+  end
+
+  def seed_facebook_inbox
+    channel = Channel::FacebookPage.create!(account: account, user_access_token: 'test', page_access_token: 'test', page_id: 'test')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Facebook')
+  end
+
+  def seed_twitter_inbox
+    channel = Channel::TwitterProfile.create!(account: account, twitter_access_token: 'test', twitter_access_token_secret: 'test', profile_id: '123')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Twitter')
+  end
+
+  def seed_whatsapp_inbox
+    channel = Channel::Whatsapp.create!(account: account, phone_number: '+123456789')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Whatsapp')
+  end
+
+  def seed_sms_inbox
+    channel = Channel::Sms.create!(account: account, phone_number: '+123456789')
+    Inbox.create!(channel: channel, account: account, name: 'Acme SMS')
+  end
+
+  def seed_email_inbox
+    channel = Channel::Email.create!(account: account, email: 'test@acme.inc', forward_to_email: 'test_fwd@acme.inc')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Email')
+  end
+
+  def seed_api_inbox
+    channel = Channel::Api.create!(account: account)
+    Inbox.create!(channel: channel, account: account, name: 'Acme API')
+  end
+
+  def seed_telegram_inbox
+    # rubocop:disable Rails/SkipsModelValidations
+    Channel::Telegram.insert({ account_id: account.id, bot_name: 'Acme', bot_token: 'test', created_at: Time.now.utc, updated_at: Time.now.utc },
+                             returning: %w[id])
+    channel = Channel::Telegram.find_by(bot_token: 'test')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Telegram')
+    # rubocop:enable Rails/SkipsModelValidations
+  end
+
+  def seed_line_inbox
+    channel = Channel::Line.create!(account: account, line_channel_id: 'test', line_channel_secret: 'test', line_channel_token: 'test')
+    Inbox.create!(channel: channel, account: account, name: 'Acme Line')
+  end
 end

From 329d305e9272ae62113a3cfd6564500e5c5d1cca Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Wed, 11 May 2022 14:29:38 +0530
Subject: [PATCH 107/177] Fix: Creating contacts for already outgoing/echo
 messages (#4668)

Check if the Instagram contact is already present in the system before throwing the exception.

Fixes: #4666
---
 app/services/instagram/message_text.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/services/instagram/message_text.rb b/app/services/instagram/message_text.rb
index 75c77b540..619ef4c90 100644
--- a/app/services/instagram/message_text.rb
+++ b/app/services/instagram/message_text.rb
@@ -22,7 +22,7 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
 
     return unsend_message if message_is_deleted?
 
-    ensure_contact(contact_id)
+    ensure_contact(contact_id) if contacts_first_message?(contact_id)
 
     create_message
   end
@@ -36,7 +36,7 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
     rescue Koala::Facebook::AuthenticationError
       @inbox.channel.authorization_error!
       raise
-    rescue StandardError => e
+    rescue StandardError, Koala::Facebook::ClientError => e
       result = {}
       ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     end
@@ -52,6 +52,10 @@ class Instagram::MessageText < Instagram::WebhooksBaseService
     @messaging[:message][:is_deleted].present?
   end
 
+  def contacts_first_message?(ig_scope_id)
+    @inbox.contact_inboxes.where(source_id: ig_scope_id).empty? && @inbox.channel.instagram_id.present?
+  end
+
   def unsend_message
     message_to_delete = @inbox.messages.find_by(
       source_id: @messaging[:message][:mid]

From 41b89014324772d8351b15936d25623f852980cb Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Wed, 11 May 2022 14:31:57 +0530
Subject: [PATCH 108/177] Fix: Agent Reports counts when they have access to
 multiple accounts (#4663)

This change restricts the agent report API to fetch agent metrics from the current account.

Fixes: #4660
---
 app/helpers/report_helper.rb                  | 16 ++++-----
 .../api/v2/accounts/report_controller_spec.rb | 34 +++++++++++++++++++
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/app/helpers/report_helper.rb b/app/helpers/report_helper.rb
index 9f37295cb..5fdb34170 100644
--- a/app/helpers/report_helper.rb
+++ b/app/helpers/report_helper.rb
@@ -17,30 +17,30 @@ module ReportHelper
   end
 
   def conversations_count
-    (get_grouped_values scope.conversations).count
+    (get_grouped_values scope.conversations.where(account_id: account.id)).count
   end
 
   def incoming_messages_count
-    (get_grouped_values scope.messages.incoming.unscope(:order)).count
+    (get_grouped_values scope.messages.where(account_id: account.id).incoming.unscope(:order)).count
   end
 
   def outgoing_messages_count
-    (get_grouped_values scope.messages.outgoing.unscope(:order)).count
+    (get_grouped_values scope.messages.where(account_id: account.id).outgoing.unscope(:order)).count
   end
 
   def resolutions_count
-    (get_grouped_values scope.conversations.resolved).count
+    (get_grouped_values scope.conversations.where(account_id: account.id).resolved).count
   end
 
   def avg_first_response_time
-    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response'))
+    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'first_response', account_id: account.id))
     return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
 
     grouped_reporting_events.average(:value)
   end
 
   def avg_resolution_time
-    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved'))
+    grouped_reporting_events = (get_grouped_values scope.reporting_events.where(name: 'conversation_resolved', account_id: account.id))
     return grouped_reporting_events.average(:value_in_business_hours) if params[:business_hours]
 
     grouped_reporting_events.average(:value)
@@ -48,7 +48,7 @@ module ReportHelper
 
   def avg_resolution_time_summary
     reporting_events = scope.reporting_events
-                            .where(name: 'conversation_resolved', created_at: range)
+                            .where(name: 'conversation_resolved', account_id: account.id, created_at: range)
     avg_rt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
 
     return 0 if avg_rt.blank?
@@ -58,7 +58,7 @@ module ReportHelper
 
   def avg_first_response_time_summary
     reporting_events = scope.reporting_events
-                            .where(name: 'first_response', created_at: range)
+                            .where(name: 'first_response', account_id: account.id, created_at: range)
     avg_frt = params[:business_hours] ? reporting_events.average(:value_in_business_hours) : reporting_events.average(:value)
 
     return 0 if avg_frt.blank?
diff --git a/spec/controllers/api/v2/accounts/report_controller_spec.rb b/spec/controllers/api/v2/accounts/report_controller_spec.rb
index c14b570d2..134a61220 100644
--- a/spec/controllers/api/v2/accounts/report_controller_spec.rb
+++ b/spec/controllers/api/v2/accounts/report_controller_spec.rb
@@ -223,6 +223,40 @@ RSpec.describe 'Reports API', type: :request do
         expect(response).to have_http_status(:success)
       end
     end
+
+    context 'when an agent has access to multiple accounts' do
+      let(:account1) { create(:account) }
+      let(:account2) { create(:account) }
+
+      let(:params) do
+        super().merge(
+          type: :agent,
+          since: 30.days.ago.to_i.to_s,
+          until: date_timestamp.to_s
+        )
+      end
+
+      it 'returns agent metrics from the current account' do
+        admin1 = create(:user, account: account1, role: :administrator)
+        inbox1 = create(:inbox, account: account1)
+        inbox2 = create(:inbox, account: account2)
+
+        create(:account_user, user: admin1, account: account2)
+        create(:conversation, account: account1, inbox: inbox1,
+                              assignee: admin1, created_at: Time.zone.today - 2.days)
+        create(:conversation, account: account2, inbox: inbox2,
+                              assignee: admin1, created_at: Time.zone.today - 2.days)
+
+        get "/api/v2/accounts/#{account1.id}/reports/summary",
+            params: params.merge({ id: admin1.id }),
+            headers: admin1.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        json_response = JSON.parse(response.body)
+        expect(json_response['conversations_count']).to eq(1)
+      end
+    end
   end
 
   describe 'GET /api/v2/accounts/:account_id/reports/inboxes' do

From ab3ee74a8672f4ac07c6107448c2d9ba6f012653 Mon Sep 17 00:00:00 2001
From: Hricha Shandily <103104754+Hricha-Shandily@users.noreply.github.com>
Date: Fri, 13 May 2022 11:34:09 +0530
Subject: [PATCH 109/177] chore: Update the note of Personal message signature
 (#4679)

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

diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 2c5909d8b..0eb08ee74 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"

From 8fbe470bdd9b65ceeb36a3f25b25f9fefd89ece6 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Fri, 13 May 2022 11:34:43 +0530
Subject: [PATCH 110/177] feat: Control sidekiq log level via rails LOG_LEVEL
 env variable (#4675)

---
 config/initializers/sidekiq.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 3a183f0a9..66262ea43 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -8,6 +8,7 @@ end
 
 Sidekiq.configure_server do |config|
   config.redis = Redis::Config.app
+  config.logger.level = Logger.const_get(ENV.fetch('LOG_LEVEL', 'info').upcase.to_s)
 end
 
 # https://github.com/ondrejbartas/sidekiq-cron

From 6535624cd6bb0aca76421e452b64645f8c1b015e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 13 May 2022 11:38:49 +0530
Subject: [PATCH 111/177] chore: Update translations from Crowdin (#4665)

---
 .../dashboard/i18n/locale/ar/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/bg/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/cs/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/da/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/de/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fi/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/he/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/hi/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/hu/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/id/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/it/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/it/settings.json    |   2 +-
 .../dashboard/i18n/locale/ja/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ko/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/lv/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ne/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/no/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/pl/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |   6 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |   6 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/sk/campaign.json    |   4 +-
 .../dashboard/i18n/locale/sk/inboxMgmt.json   |  14 +-
 .../i18n/locale/sk/integrationApps.json       |   4 +-
 .../dashboard/i18n/locale/sr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/sv/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/ta/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/th/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/tr/inboxMgmt.json   |   6 +-
 .../dashboard/i18n/locale/uk/inboxMgmt.json   |   6 +-
 .../i18n/locale/ur/advancedFilters.json       |  10 +-
 .../dashboard/i18n/locale/ur/agentMgmt.json   | 120 ++--
 .../i18n/locale/ur/attributesMgmt.json        |  12 +-
 .../dashboard/i18n/locale/ur/automation.json  |  26 +-
 .../dashboard/i18n/locale/ur/campaign.json    |  20 +-
 .../dashboard/i18n/locale/ur/cannedMgmt.json  |  82 +--
 .../dashboard/i18n/locale/ur/chatlist.json    |  66 +--
 .../dashboard/i18n/locale/ur/contact.json     | 348 +++++------
 .../i18n/locale/ur/contactFilters.json        |  12 +-
 .../i18n/locale/ur/conversation.json          |  92 +--
 .../i18n/locale/ur/generalSettings.json       |   4 +-
 .../dashboard/i18n/locale/ur/inboxMgmt.json   |  20 +-
 .../i18n/locale/ur/integrationApps.json       |  12 +-
 .../i18n/locale/ur/integrations.json          |  24 +-
 .../dashboard/i18n/locale/ur/labelsMgmt.json  |  20 +-
 .../dashboard/i18n/locale/ur/login.json       |   2 +-
 .../dashboard/i18n/locale/ur/report.json      |  22 +-
 .../i18n/locale/ur/resetPassword.json         |   6 +-
 .../i18n/locale/ur/setNewPassword.json        |   4 +-
 .../dashboard/i18n/locale/ur/settings.json    |  24 +-
 .../dashboard/i18n/locale/ur/signup.json      |   4 +-
 .../i18n/locale/ur/teamsSettings.json         |   6 +-
 .../i18n/locale/ur_IN/advancedFilters.json    |  93 +++
 .../i18n/locale/ur_IN/agentMgmt.json          | 113 ++++
 .../i18n/locale/ur_IN/attributesMgmt.json     |  99 ++++
 .../i18n/locale/ur_IN/automation.json         | 116 ++++
 .../dashboard/i18n/locale/ur_IN/campaign.json | 126 ++++
 .../i18n/locale/ur_IN/cannedMgmt.json         |  76 +++
 .../dashboard/i18n/locale/ur_IN/chatlist.json |  87 +++
 .../dashboard/i18n/locale/ur_IN/contact.json  | 338 +++++++++++
 .../i18n/locale/ur_IN/contactFilters.json     |  49 ++
 .../i18n/locale/ur_IN/conversation.json       | 204 +++++++
 .../dashboard/i18n/locale/ur_IN/csatMgmt.json |   6 +
 .../i18n/locale/ur_IN/generalSettings.json    | 140 +++++
 .../i18n/locale/ur_IN/inboxMgmt.json          | 543 ++++++++++++++++++
 .../i18n/locale/ur_IN/integrationApps.json    |  62 ++
 .../i18n/locale/ur_IN/integrations.json       |  89 +++
 .../i18n/locale/ur_IN/labelsMgmt.json         |  70 +++
 .../dashboard/i18n/locale/ur_IN/login.json    |  21 +
 .../dashboard/i18n/locale/ur_IN/report.json   | 445 ++++++++++++++
 .../i18n/locale/ur_IN/resetPassword.json      |  15 +
 .../i18n/locale/ur_IN/setNewPassword.json     |  23 +
 .../dashboard/i18n/locale/ur_IN/settings.json | 236 ++++++++
 .../dashboard/i18n/locale/ur_IN/signup.json   |  39 ++
 .../i18n/locale/ur_IN/teamsSettings.json      | 125 ++++
 .../dashboard/i18n/locale/ur_IN/webhooks.json |   5 +
 .../dashboard/i18n/locale/vi/inboxMgmt.json   |   6 +-
 .../i18n/locale/zh_CN/inboxMgmt.json          |   6 +-
 .../i18n/locale/zh_TW/inboxMgmt.json          |   6 +-
 app/javascript/survey/i18n/locale/ur.json     |   2 +-
 app/javascript/survey/i18n/locale/ur_IN.json  |  19 +
 app/javascript/widget/i18n/locale/ur.json     |   6 +-
 app/javascript/widget/i18n/locale/ur_IN.json  |  86 +++
 config/locales/devise.ur_IN.yml               |  61 ++
 config/locales/ur_IN.yml                      | 108 ++++
 93 files changed, 3950 insertions(+), 634 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/automation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/campaign.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/contactFilters.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/csatMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/integrationApps.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/teamsSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/webhooks.json
 create mode 100644 app/javascript/survey/i18n/locale/ur_IN.json
 create mode 100644 app/javascript/widget/i18n/locale/ur_IN.json
 create mode 100644 config/locales/devise.ur_IN.yml
 create mode 100644 config/locales/ur_IN.yml

diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index 42f2a45fb..da5e213e9 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "تم تحديث إعدادات الإسناد التلقائي بنجاح",
         "ERROR_MESSAGE": "تعذر تحديث لون صندوق الدردشة. الرجاء المحاولة مرة أخرى لاحقاً."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "مفعل",
-        "DISABLED": "معطّل"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "مفعل",
         "DISABLED": "معطّل"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "ضع هذا الكود داخل وسم الـ body في موقعك",
       "INBOX_AGENTS": "موظف الدعم",
       "INBOX_AGENTS_SUB_TEXT": "إضافة أو إزالة موظفين من قناة التواصل هذه",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "تحديث",
       "ENABLE_EMAIL_COLLECT_BOX": "تفعيل صندوق جمع البريد الإلكتروني",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "تمكين أو تعطيل مربع جمع البريد الإلكتروني في محادثة جديدة",
diff --git a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
index 94110fae8..7e4842bd7 100644
--- a/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/bg/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
       "INBOX_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",
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index 06f934430..19fa864b0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Assignació automàtica actualitzada correctament",
         "ERROR_MESSAGE": "No s'ha pogut actualitzar el color del widget. Torneu-ho a provar més endavant."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Habilita",
-        "DISABLED": "Inhabilita"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Habilita",
         "DISABLED": "Inhabilita"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Col·loca aquest botó dins de l'etiqueta body",
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Afegir o eliminar agents d'aquesta safata d'entrada",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Actualitza",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
index 3e1142191..c0771d5de 100644
--- a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatické přiřazení bylo úspěšně aktualizováno",
         "ERROR_MESSAGE": "Nelze aktualizovat barvu widgetu. Opakujte akci později."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Povoleno",
-        "DISABLED": "Zakázáno"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Povoleno",
         "DISABLED": "Zakázáno"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Umístěte toto tlačítko dovnitř vašeho tělesného štítku",
       "INBOX_AGENTS": "Agenti",
       "INBOX_AGENTS_SUB_TEXT": "Přidat nebo odebrat agenty z této složky doručené pošty",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Aktualizovat",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
index 1a199e343..6c5201ef9 100644
--- a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatisk tildeling opdateret",
         "ERROR_MESSAGE": "Kunne ikke opdatere widget farve. Prøv igen senere."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Aktiveret",
-        "DISABLED": "Deaktiveret"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Aktiveret",
         "DISABLED": "Deaktiveret"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Placer denne knap inde i din body tag",
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Tilføj eller fjern agenter fra denne indbakke",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Opdater",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index ea61c99c1..5d8d2aaa4 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatische Zuordnung erfolgreich aktualisiert",
         "ERROR_MESSAGE": "Widget-Farbe konnte nicht aktualisiert werden. Bitte versuchen Sie es später noch einmal."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Aktiviert",
-        "DISABLED": "Deaktiviert"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Aktiviert",
         "DISABLED": "Deaktiviert"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Platzieren Sie diese Schaltfläche in Ihrem Body-Tag",
       "INBOX_AGENTS": "Agenten",
       "INBOX_AGENTS_SUB_TEXT": "Hinzufügen oder Entfernen von Agenten zu diesem Posteingang",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Aktualisieren",
       "ENABLE_EMAIL_COLLECT_BOX": "E-Mail-Sammelbox aktivieren",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "E-Mail-Sammelbox für neue Konversation aktivieren oder deaktivieren",
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index ac7d25e5a..e0f284e48 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Η αυτόματη αντιστοίχιση ενημερώθηκε επιτυχώς",
         "ERROR_MESSAGE": "Δεν μπορεί να ενημερωθεί το χρώμα του widget. Παρακαλώ προσπαθήστε αργότερα."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Ενεργό",
-        "DISABLED": "Ανενεργό"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Ενεργό",
         "DISABLED": "Ανενεργό"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Τοποθετήσετε αυτόν τον κώδικα μέσα στο body tag της ιστοσελίδας σας",
       "INBOX_AGENTS": "Πράκτορες",
       "INBOX_AGENTS_SUB_TEXT": "Προσθέστε ή αφαιρέστε πράκτορες σε αυτό το κιβώτιο",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Ενημέρωση",
       "ENABLE_EMAIL_COLLECT_BOX": "Ενεργοποιήσετε το πλαίσιο συλλογής email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Ενεργοποίηση ή απενεργοποίηση του πλαισίου συλλογής μηνυμάτων ηλεκτρονικού ταχυδρομείου στη νέα συνομιλία",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 8f25d620a..bb46e4faf 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto-asignación actualizada correctamente",
         "ERROR_MESSAGE": "No se pudo actualizar el color del widget. Inténtalo de nuevo más tarde."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Activado",
-        "DISABLED": "Deshabilitado"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Activado",
         "DISABLED": "Deshabilitado"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Coloca este botón dentro de tu etiqueta cuerpo",
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Añadir o quitar agentes de esta bandeja de entrada",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Actualizar",
       "ENABLE_EMAIL_COLLECT_BOX": "Activar caja de recolección de correo electrónico",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Activar o desactivar la caja de recolección de correo electrónico",
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index 1734395c9..d0ff5b89b 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "واگذاری خودکار گفتگو به ایجنت ها تنظیم شد",
         "ERROR_MESSAGE": "در حال حاضر امکان تغییر رنگ ویجت امکان‌پذیر نیست. لطفا بعدا امتحان کنید."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "فعال",
-        "DISABLED": "غیرفعال"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "فعال",
         "DISABLED": "غیرفعال"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "این دکمه را در تگ body قرار دهید",
       "INBOX_AGENTS": "ایجنت ها",
       "INBOX_AGENTS_SUB_TEXT": "اضافه کردن یا حذف کردن دسترسی ایجنت به صندوق ورودی",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "اعمال شود",
       "ENABLE_EMAIL_COLLECT_BOX": "فعال سازی فرم دریافت ایمیل از کاربر",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "فعال یا غیرفعال کردن فرم دریافت ایمیل از کاربر",
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
index a985f2811..9d8a4dc70 100644
--- a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automaattinen delegointi päivitetty onnistuneesti",
         "ERROR_MESSAGE": "Widgetin väriä ei voitu päivittää. Yritä myöhemmin uudelleen."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Käytössä",
-        "DISABLED": "Pois käytöstä"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Käytössä",
         "DISABLED": "Pois käytöstä"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Aseta tämä painike body-tagiisi",
       "INBOX_AGENTS": "Edustajat",
       "INBOX_AGENTS_SUB_TEXT": "Lisää tai poista edustajia tästä saapuneet-kansiosta",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Päivitä",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 2b8423999..48d1ecb78 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Affectation automatique mise à jour avec succès",
         "ERROR_MESSAGE": "Impossible de mettre à jour la couleur du widget. Veuillez réessayer plus tard."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Activé",
-        "DISABLED": "Désactivé"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Activé",
         "DISABLED": "Désactivé"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Placez ce code avant la fermeture de votre balise body",
       "INBOX_AGENTS": "Agents",
       "INBOX_AGENTS_SUB_TEXT": "Ajouter ou supprimer des agents de cette boîte de réception",
+      "AGENT_ASSIGNMENT": "Konversationsauftrag",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Aktualisieren Sie die Konversationszuweisungseinstellungen",
       "UPDATE": "Mettre à jour",
       "ENABLE_EMAIL_COLLECT_BOX": "Activer la boîte de collecte des courriels",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Activer ou désactiver la boîte de collecte des courriels pour les nouvelles conversations",
diff --git a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
index ebda8ee17..fa71fca8e 100644
--- a/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/he/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "ההקצאה האוטומטית עודכנה בהצלחה",
         "ERROR_MESSAGE": "לא ניתן היה לעדכן את צבע הווידג'ט. בבקשה נסה שוב מאוחר יותר."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "מופעל",
-        "DISABLED": "כבוי"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "מופעל",
         "DISABLED": "כבוי"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "מקם את הכפתור הזה בתוך תג הגוף שלך",
       "INBOX_AGENTS": "סוכנים",
       "INBOX_AGENTS_SUB_TEXT": "הוסף או הסר נציגים מתיבת הדואר הנכנס הזו",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "עדכן",
       "ENABLE_EMAIL_COLLECT_BOX": "אפשר תיבת איסוף דוא\"ל",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "הפעל או השבת את תיבת איסוף הדוא\"ל בשיחה חדשה",
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
index bda8ea1ef..e9ee9c5b8 100644
--- a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
index 27d2446ac..d03a98b66 100644
--- a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatikus hozzárendelés sikeresen frissítve",
         "ERROR_MESSAGE": "Nem sikerült a widget szín változtatása. Kérjük próbáld később."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Engedélyezve",
-        "DISABLED": "Letiltva"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Engedélyezve",
         "DISABLED": "Letiltva"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Ezt a gombot a body tag-en belül helyezd el",
       "INBOX_AGENTS": "Ügynökök",
       "INBOX_AGENTS_SUB_TEXT": "Ügynökök hosszáadása vagy eltávolítása az inboxból",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Frissítés",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
index b5ad68017..705db8869 100644
--- a/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/id/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Penugasan otomatis berhasil diperbarui",
         "ERROR_MESSAGE": "Tidak dapat memperbarui warna widget. Silakan coba lagi nanti."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Diaktifkan",
-        "DISABLED": "Nonaktif"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Diaktifkan",
         "DISABLED": "Nonaktif"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Tempatkan tombol ini di dalam tag <body> Anda",
       "INBOX_AGENTS": "Agen",
       "INBOX_AGENTS_SUB_TEXT": "Tambahkan atau hapus agen dari kotak masuk ini",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Perbarui",
       "ENABLE_EMAIL_COLLECT_BOX": "Aktifkan kotak pengumpulan email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Aktifkan atau nonaktifkan kotak pengumpulan email pada percakpaan baru",
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
index 2bd15869d..9aa37e0e0 100644
--- a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Assegnazione automatica aggiornata correttamente",
         "ERROR_MESSAGE": "Impossibile aggiornare il colore del widget. Riprova più tardi."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Abilitato",
-        "DISABLED": "Disabilitato"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Abilitato",
         "DISABLED": "Disabilitato"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Posiziona questo pulsante all'interno del tuo tag body",
       "INBOX_AGENTS": "Agenti",
       "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi agenti da questa casella",
+      "AGENT_ASSIGNMENT": "Assegnazione conversazione",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Aggiorna le impostazioni di assegnazione della conversazione",
       "UPDATE": "Aggiorna",
       "ENABLE_EMAIL_COLLECT_BOX": "Abilita casella di raccolta email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Abilita o disabilita la casella di raccolta email nella nuova conversazione",
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index c62452a6d..6b4712625 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -151,7 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizzazione attuale:",
-    "SWITCH": "Switch",
+    "SWITCH": "Scambia",
     "CONVERSATIONS": "Conversazioni",
     "ALL_CONVERSATIONS": "Tutte le conversazioni",
     "MENTIONED_CONVERSATIONS": "Menzioni",
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
index 55d1537b9..1aa3f28a2 100644
--- a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "自動割り当ての更新に成功しました",
         "ERROR_MESSAGE": "ウィジェットの色を更新できませんでした。後でもう一度お試しください"
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "有効です",
-        "DISABLED": "無効です"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "有効です",
         "DISABLED": "無効です"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "このボタンをbodyタグの中に配置してください。",
       "INBOX_AGENTS": "担当者",
       "INBOX_AGENTS_SUB_TEXT": "この受信トレイから担当者を追加または削除する",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "更新",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
index 76f0dee06..7b974a3e1 100644
--- a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "자동 할당 업데이트 완료",
         "ERROR_MESSAGE": "위젯 색상을 업데이트할 수 없음. 나중에 다시 시도해 주십시오."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "사용함",
-        "DISABLED": "사용 안 함"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "사용함",
         "DISABLED": "사용 안 함"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "이 버튼을 당신의 body 태그 안에 넣으세요.",
       "INBOX_AGENTS": "에이전트",
       "INBOX_AGENTS_SUB_TEXT": "받은 메시지함에서 에이전트 추가 또는 제거",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "업데이트",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
index bda8ea1ef..e9ee9c5b8 100644
--- a/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/lv/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 2b2348830..76c9e0db5 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "ഓട്ടോമാറ്റിക് അസൈൻമെന്റ് വിജയകരമായി അപ്‌ഡേറ്റുചെയ്‌തു",
         "ERROR_MESSAGE": "വിജറ്റ് നിറം അപ്‌ഡേറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല. ദയവായി പിന്നീട് വീണ്ടും ശ്രമിക്കുക."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
-        "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
         "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "ഈ ബട്ടൺ നിങ്ങളുടെ ബോഡി ടാഗിനുള്ളിൽ സ്ഥാപിക്കുക",
       "INBOX_AGENTS": "ഏജന്റുമാർ",
       "INBOX_AGENTS_SUB_TEXT": "ഈ ഇൻ‌ബോക്സിൽ നിന്ന് ഏജന്റുമാരെ ചേർക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "അപ്‌ഡേറ്റ്",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
index bda8ea1ef..e9ee9c5b8 100644
--- a/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ne/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index a17291a0d..52ee1e374 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatische toewijzing succesvol bijgewerkt",
         "ERROR_MESSAGE": "Kan de kleur van de widget niet bijwerken. Probeer het later opnieuw."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Ingeschakeld",
-        "DISABLED": "Uitgeschakeld"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Ingeschakeld",
         "DISABLED": "Uitgeschakeld"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Plaats deze knop in je lichaam tag",
       "INBOX_AGENTS": "Agenten",
       "INBOX_AGENTS_SUB_TEXT": "Voeg agenten toe of verwijder ze uit deze inbox",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Vernieuwen",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
index acde2c58e..16c744474 100644
--- a/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/no/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Autotildeling ble oppdatert",
         "ERROR_MESSAGE": "Kunne ikke oppdatere widget-fargen. Prøv igjen senere."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Aktivert",
-        "DISABLED": "Deaktivert"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Aktivert",
         "DISABLED": "Deaktivert"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Plasser denne knappen innenfor body-taggen",
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Legg til eller fjern agenter fra denne innboksen",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Oppdater",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
index 8b629edad..e544a552f 100644
--- a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatyczne przypisanie zaktualizowane pomyślnie",
         "ERROR_MESSAGE": "Nie można zaktualizować koloru widżetu. Spróbuj ponownie później."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Włączone",
-        "DISABLED": "Wyłączone"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Włączone",
         "DISABLED": "Wyłączone"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Umieść ten przycisk wewnątrz znacznika ciała",
       "INBOX_AGENTS": "Agenci",
       "INBOX_AGENTS_SUB_TEXT": "Dodaj lub usuń agentów z tej skrzynki odbiorczej",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Aktualizuj",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Włącz lub wyłącz skrzynkę zbierania wiadomości e-mail w nowej konwersacji",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 01c8a433f..036b9a5ef 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Atribuição automática atualizada com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar a cor do widget. Por favor, tente novamente mais tarde."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Ativado",
-        "DISABLED": "Desabilitado"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Ativado",
         "DISABLED": "Desabilitado"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Coloque esse botão dentro da sua tag corporal",
       "INBOX_AGENTS": "agentes",
       "INBOX_AGENTS_SUB_TEXT": "Adicionar ou remover agentes dessa caixa de entrada",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Atualização",
       "ENABLE_EMAIL_COLLECT_BOX": "Ativar caixa de receção de email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Ativar ou desativar caixa de receção de emails para as novas conversas",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 1e2fa9cec..f3ff32c77 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Agente atualizado com sucesso",
         "ERROR_MESSAGE": "Não foi possível atualizar a cor do widget. Por favor, tente novamente mais tarde."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Ativado",
-        "DISABLED": "Desativado"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Ativado",
         "DISABLED": "Desativado"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Favor, insira essse código <script> dentro da tag Body de sua página html",
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Adicionar ou remover agentes dessa caixa de entrada",
+      "AGENT_ASSIGNMENT": "Atribuição de conversa",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Atualizar configurações de atribuição de conversa",
       "UPDATE": "Atualizar",
       "ENABLE_EMAIL_COLLECT_BOX": "Ativar caixa de coleta de e-mail",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Ativar ou desativar caixa de coleta de e-mails em novas conversas",
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 39e4ead6d..25f0335ac 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Atribuire automată actualizată cu succes",
         "ERROR_MESSAGE": "Nu s-a putut actualiza culoarea widgetului. Vă rugăm să încercați din nou mai târziu."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Activat",
-        "DISABLED": "Dezactivat"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Activat",
         "DISABLED": "Dezactivat"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Plasează acest buton în interiorul interiorul paginii web",
       "INBOX_AGENTS": "Agenți",
       "INBOX_AGENTS_SUB_TEXT": "Adaugă sau elimină agenți din acest inbox",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Actualizare",
       "ENABLE_EMAIL_COLLECT_BOX": "Caseta Activare colectare e-mail",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Caseta Activarea sau dezactivarea colectării e-mailurilor în conversația nouă",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index ea3b76ba2..08e8f33d1 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Автоназначение сохранено",
         "ERROR_MESSAGE": "Не удалось сохранить цвет виджета. Пожалуйста, повторите попытку позже."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Включено",
-        "DISABLED": "Выключено"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Включено",
         "DISABLED": "Выключено"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Поместите эту кнопку внутри тега <body>",
       "INBOX_AGENTS": "Операторы",
       "INBOX_AGENTS_SUB_TEXT": "Добавить или удалить агентов из этого источника",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Обновить",
       "ENABLE_EMAIL_COLLECT_BOX": "Включить ящик сбора почты",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Включение или отключение ящик для сбора почты в новой беседе",
diff --git a/app/javascript/dashboard/i18n/locale/sk/campaign.json b/app/javascript/dashboard/i18n/locale/sk/campaign.json
index 1832df39b..ef5202724 100644
--- a/app/javascript/dashboard/i18n/locale/sk/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/sk/campaign.json
@@ -103,8 +103,8 @@
         "DELETE": "Vymazať"
       },
       "STATUS": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled",
+        "ENABLED": "Zapnuté",
+        "DISABLED": "Vypnuté",
         "COMPLETED": "Completed",
         "ACTIVE": "Active"
       },
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
index d76b4b231..22a02353e 100644
--- a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -341,17 +341,13 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Zapnuté",
+        "DISABLED": "Vypnuté"
       },
       "ENABLE_CSAT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
+        "ENABLED": "Zapnuté",
+        "DISABLED": "Vypnuté"
       },
       "ALLOW_MESSAGES_AFTER_RESOLVED": {
         "ENABLED": "Zapnuté",
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
       "INBOX_AGENTS": "Agenti",
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrationApps.json b/app/javascript/dashboard/i18n/locale/sk/integrationApps.json
index ca3395924..70d507d95 100644
--- a/app/javascript/dashboard/i18n/locale/sk/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/sk/integrationApps.json
@@ -4,8 +4,8 @@
     "NO_HOOK_CONFIGURED": "There are no %{integrationId} integrations configured in this account.",
     "HEADER": "Applications",
     "STATUS": {
-      "ENABLED": "Enabled",
-      "DISABLED": "Disabled"
+      "ENABLED": "Zapnuté",
+      "DISABLED": "Vypnuté"
     },
     "CONFIGURE": "Configure",
     "ADD_BUTTON": "Add a new hook",
diff --git a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
index e50721a9b..a40b4aee5 100644
--- a/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sr/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
       "INBOX_AGENTS": "Agenti",
       "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",
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
index ae67e6a20..57820e445 100644
--- a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Automatisk tilldelning har uppdaterats",
         "ERROR_MESSAGE": "Kunde inte uppdatera widgetens färg. Försök igen senare."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Aktiverad",
-        "DISABLED": "Inaktiverad"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Aktiverad",
         "DISABLED": "Inaktiverad"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Placera denna knapp i din body-tagg",
       "INBOX_AGENTS": "Agenter",
       "INBOX_AGENTS_SUB_TEXT": "Lägg till eller ta bort agenter från denna inkorg",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Uppdatera",
       "ENABLE_EMAIL_COLLECT_BOX": "Aktivera inkasso för e-post",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Aktivera eller inaktivera insamlingsrutan för e-post på ny konversation",
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
index 6862fe14e..f8d9d34d6 100644
--- a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "தானியங்கு பணி வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
         "ERROR_MESSAGE": "விட்ஜெட் நிறத்தை புதுப்பிக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "இயக்கப்பட்டது",
-        "DISABLED": "முடக்கப்பட்டது"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "இயக்கப்பட்டது",
         "DISABLED": "முடக்கப்பட்டது"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "இந்த பொத்தானை உங்கள் பாடி டேகுக்குள் வைக்கவும்",
       "INBOX_AGENTS": "ஏஜென்ட்கள்",
       "INBOX_AGENTS_SUB_TEXT": "இந்த இன்பாக்ஸிலிருந்து ஏஜென்ட்களைச் சேர்க்கவும் அல்லது அகற்றவும்",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "புதுப்பிப்பு",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
index a5ea9c617..20f5d478f 100644
--- a/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/th/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "อัปเดตการมอบหมายอัตโนมัติเรียบร้อยแล้ว",
         "ERROR_MESSAGE": "ไม่สามารถอัปเดตสี widget โปรดลองใหม่อีกครั้งในภายหลัง"
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "เปิด",
-        "DISABLED": "ปิด"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "เปิด",
         "DISABLED": "ปิด"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "ใส่ปุ่มนี้ใน body tag",
       "INBOX_AGENTS": "พนักงาน",
       "INBOX_AGENTS_SUB_TEXT": "เพิ่มหรือลบพนักงานจากกล่องสนทนานี้",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "อัพเดท",
       "ENABLE_EMAIL_COLLECT_BOX": "เปิดใช้งานกล่องรวมอีเมล",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "เปิดหรือปิดการใช้งานกล่องรวมอีเมลสำหรับการสนทนาใหม่",
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
index 658ef6eae..6af86660c 100644
--- a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Otomatik atama başarıyla güncellendi",
         "ERROR_MESSAGE": "Widget rengi güncellenemedi. Lütfen daha sonra tekrar deneyiniz."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Etkin",
-        "DISABLED": "Devre dışı"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Etkin",
         "DISABLED": "Devre dışı"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Bu düğmeyi gövde etiketinizin içine yerleştirin",
       "INBOX_AGENTS": "Kullanıcılar",
       "INBOX_AGENTS_SUB_TEXT": "Bu gelen kutusuna aracı ekleyin veya aracıları kaldırın",
+      "AGENT_ASSIGNMENT": "Görüşme Atama",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Görüşme atama ayarlarını güncelle",
       "UPDATE": "Güncelleme",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
index a8e1d1afc..e23830084 100644
--- a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Автопризначення успішно оновлено",
         "ERROR_MESSAGE": "Не вдалося оновити колір віджету. Будь ласка, спробуйте ще раз."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Увімкнено",
-        "DISABLED": "Вимкнено"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Увімкнено",
         "DISABLED": "Вимкнено"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Добавте кнопку на сторінки вашого сайту",
       "INBOX_AGENTS": "Агенти",
       "INBOX_AGENTS_SUB_TEXT": "Додати або вилучити агентів з скриньки Вхідні",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Оновити",
       "ENABLE_EMAIL_COLLECT_BOX": "Включити збір електронної пошти",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Увімкнути або вимкнути ящик збору повідомлень в новій розмові",
diff --git a/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
index 46a573c42..5a6f8cc35 100644
--- a/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ur/advancedFilters.json
@@ -5,7 +5,7 @@
     "ADD_NEW_FILTER": "Add Filter",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
     "SUBMIT_BUTTON_LABEL": "Apply filters",
-    "CANCEL_BUTTON_LABEL": "Cancel",
+    "CANCEL_BUTTON_LABEL": "منسوخ کریں۔",
     "CLEAR_BUTTON_LABEL": "Clear Filters",
     "EMPTY_VALUE_ERROR": "Value is required",
     "TOOLTIP_LABEL": "Filter conversations",
@@ -29,7 +29,7 @@
       "FALSE": "False"
     },
     "ATTRIBUTES": {
-      "STATUS": "Status",
+      "STATUS": "اسٹیٹس",
       "ASSIGNEE_NAME": "Assignee Name",
       "INBOX_NAME": "Inbox Name",
       "TEAM_NAME": "Team Name",
@@ -45,7 +45,7 @@
       "CUSTOM_ATTRIBUTE_LINK": "Link",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
       "CREATED_AT": "Created At",
-      "LAST_ACTIVITY": "Last Activity"
+      "LAST_ACTIVITY": "آخری سرگرمی"
     },
     "GROUPS": {
       "STANDARD_FILTERS": "Standard Filters",
@@ -59,7 +59,7 @@
         "PLACEHOLDER": "Enter a name for this filter",
         "ERROR_MESSAGE": "Name is required",
         "SAVE_BUTTON": "Save filter",
-        "CANCEL_BUTTON": "Cancel",
+        "CANCEL_BUTTON": "منسوخ کریں۔",
         "API_FOLDERS": {
           "SUCCESS_MESSAGE": "Folder created successfully",
           "ERROR_MESSAGE": "Error while creating folder"
@@ -73,7 +73,7 @@
         "DELETE_BUTTON": "Delete filter",
         "MODAL": {
           "CONFIRM": {
-            "TITLE": "Confirm Deletion",
+            "TITLE": "حذف کرنے کی تصدیق کریں۔",
             "MESSAGE": "Are you sure to delete the filter ",
             "YES": "Yes, Delete",
             "NO": "No, Keep it"
diff --git a/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
index 0f965c717..72020b810 100644
--- a/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/agentMgmt.json
@@ -1,111 +1,111 @@
 {
   "AGENT_MGMT": {
-    "HEADER": "Agents",
-    "HEADER_BTN_TXT": "Add Agent",
-    "LOADING": "Fetching Agent List",
+    "HEADER": "ایجنٹ",
+    "HEADER_BTN_TXT": "ایجنٹ شامل کریں",
+    "LOADING": "ایجنٹ کی فہرست حاصل کی جا رہی ہے",
     "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"
+      "ADMINISTRATOR": "منتظم",
+      "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"
+      "404": "اس اکاؤنٹ سے کوئی ایجنٹ منسلک نہیں ہے",
+      "TITLE": "اپنی ٹیم میں ایجنٹوں کا انتظام کریں۔",
+      "DESC": "آپ اپنی ٹیم میں ایجنٹوں کو شامل يا ہٹا سکتے ہیں.",
+      "NAME": "نام",
+      "EMAIL": "ای میل",
+      "STATUS": "اسٹیٹس",
+      "ACTIONS": "عمل",
+      "VERIFIED": "تصدیق شدہ",
+      "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",
+      "TITLE": "اپنی ٹیم میں ایجنٹ شامل کریں۔",
+      "DESC": "آپ ایسے لوگوں کو شامل کر سکتے ہیں جو آپ کے ان باکسز کے لیے سپورٹ کو سنبھال سکیں گے.",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "ایجنٹ کا نام",
+          "PLACEHOLDER": "براہ کرم ایجنٹ کا نام درج کریں۔"
         },
         "AGENT_TYPE": {
-          "LABEL": "Role",
-          "PLACEHOLDER": "Please select a role",
-          "ERROR": "Role is required"
+          "LABEL": "کردار",
+          "PLACEHOLDER": "براہ کرم ایک کردار منتخب کریں۔",
+          "ERROR": "کردار کی ضرورت ہے۔"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "ای میل اڈریس",
+          "PLACEHOLDER": "براہ کرم ایجنٹ کا ای میل ایڈریس درج کریں۔"
         },
-        "SUBMIT": "Add Agent"
+        "SUBMIT": "ایجنٹ شامل کریں"
       },
       "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"
+        "SUCCESS_MESSAGE": "ایجنٹ کامیابی کے ساتھ شامل کرلیا گیا ہے",
+        "EXIST_MESSAGE": "ایجنٹ کا ای میل پہلے سے استعمال میں ہے، براہ کرم دوسرا ای میل آزمائیں۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "API": {
-        "SUCCESS_MESSAGE": "Agent deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "ایجنٹ کامیابی کے ساتھ حذف ہو گیا۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
+        "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       }
     },
     "EDIT": {
-      "TITLE": "Edit agent",
+      "TITLE": "ایجنٹ میں ترمیم کریں۔",
       "FORM": {
         "NAME": {
-          "LABEL": "Agent Name",
-          "PLACEHOLDER": "Please enter a name of the agent"
+          "LABEL": "ایجنٹ کا نام",
+          "PLACEHOLDER": "براہ کرم ایجنٹ کا نام درج کریں۔"
         },
         "AGENT_TYPE": {
-          "LABEL": "Role",
-          "PLACEHOLDER": "Please select a role",
-          "ERROR": "Role is required"
+          "LABEL": "کردار",
+          "PLACEHOLDER": "براہ کرم ایک کردار منتخب کریں۔",
+          "ERROR": "کردار کی ضرورت ہے۔"
         },
         "EMAIL": {
-          "LABEL": "Email Address",
-          "PLACEHOLDER": "Please enter an email address of the agent"
+          "LABEL": "ای میل اڈریس",
+          "PLACEHOLDER": "براہ کرم ایجنٹ کا ای میل ایڈریس درج کریں۔"
         },
-        "SUBMIT": "Edit Agent"
+        "SUBMIT": "ایجنٹ میں ترمیم کریں۔"
       },
-      "BUTTON_TEXT": "Edit",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "BUTTON_TEXT": "ترمیم",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "API": {
-        "SUCCESS_MESSAGE": "Agent updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "ایجنٹ کامیابی کے ساتھ اپ ڈیٹ ہو گیا۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       },
       "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"
+        "ADMIN_RESET_BUTTON": "پاس ورڈ دوبارہ مرتب کریں",
+        "ADMIN_SUCCESS_MESSAGE": "ری سیٹ پاس ورڈ کی ہدایات کے ساتھ ایک ای میل ایجنٹ کو بھیج دی گئی ہے",
+        "SUCCESS_MESSAGE": "ایجنٹ کا پاس ورڈ کامیابی سے دوبارہ ترتیب ہو گیا ہے",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "SEARCH": {
-      "NO_RESULTS": "No results found."
+      "NO_RESULTS": "کوئی نتیجہ نہیں."
     },
     "MULTI_SELECTOR": {
-      "PLACEHOLDER": "None",
+      "PLACEHOLDER": "کوئی نہیں۔",
       "TITLE": {
-        "AGENT": "Select agent",
-        "TEAM": "Select team"
+        "AGENT": "ایجنٹ منتخب کریں۔",
+        "TEAM": "ٹیم منتخب کریں۔"
       },
       "SEARCH": {
         "NO_RESULTS": {
-          "AGENT": "No agents found",
-          "TEAM": "No teams found"
+          "AGENT": "کوئی ایجنٹ نہیں ملا",
+          "TEAM": "کوئی ٹیمیں نہیں ملیں۔"
         },
         "PLACEHOLDER": {
-          "AGENT": "Search agents",
-          "TEAM": "Search teams"
+          "AGENT": "ایجنٹوں کو تلاش کریں۔",
+          "TEAM": "ٹیمیں تلاش کریں۔"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
index ff4904c34..ffb9af4b0 100644
--- a/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/attributesMgmt.json
@@ -7,7 +7,7 @@
     "ADD": {
       "TITLE": "Add Custom Attribute",
       "SUBMIT": "Create",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "FORM": {
         "NAME": {
           "LABEL": "Display Name",
@@ -47,7 +47,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "API": {
         "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
         "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
@@ -57,7 +57,7 @@
         "PLACE_HOLDER": "Please type {attributeName} to confirm",
         "MESSAGE": "Deleting will remove the custom attribute",
         "YES": "Delete ",
-        "NO": "Cancel"
+        "NO": "منسوخ کریں۔"
       }
     },
     "EDIT": {
@@ -81,14 +81,14 @@
     },
     "LIST": {
       "TABLE_HEADER": [
-        "Name",
+        "نام",
         "Description",
         "Type",
         "Key"
       ],
       "BUTTONS": {
-        "EDIT": "Edit",
-        "DELETE": "Delete"
+        "EDIT": "ترمیم",
+        "DELETE": "حذف کریں۔"
       },
       "EMPTY_RESULT": {
         "404": "There are no custom attributes created",
diff --git a/app/javascript/dashboard/i18n/locale/ur/automation.json b/app/javascript/dashboard/i18n/locale/ur/automation.json
index 5d291814e..056b3c1f9 100644
--- a/app/javascript/dashboard/i18n/locale/ur/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/automation.json
@@ -7,7 +7,7 @@
     "ADD": {
       "TITLE": "Add Automation Rule",
       "SUBMIT": "Create",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "FORM": {
         "NAME": {
           "LABEL": "Rule Name",
@@ -28,7 +28,7 @@
           "LABEL": "Conditions"
         },
         "ACTIONS": {
-          "LABEL": "Actions"
+          "LABEL": "عمل"
         }
       },
       "CONDITION_BUTTON_LABEL": "Add Condition",
@@ -40,7 +40,7 @@
     },
     "LIST": {
       "TABLE_HEADER": [
-        "Name",
+        "نام",
         "Description",
         "Active",
         "Created on"
@@ -49,13 +49,13 @@
     },
     "DELETE": {
       "TITLE": "Delete Automation Rule",
-      "SUBMIT": "Delete",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "SUBMIT": "حذف کریں۔",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
+        "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       },
       "API": {
         "SUCCESS_MESSAGE": "Automation rule deleted successfully",
@@ -65,7 +65,7 @@
     "EDIT": {
       "TITLE": "Edit Automation Rule",
       "SUBMIT": "Update",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "API": {
         "SUCCESS_MESSAGE": "Automation rule updated successfully",
         "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
@@ -79,10 +79,10 @@
       }
     },
     "FORM": {
-      "EDIT": "Edit",
+      "EDIT": "ترمیم",
       "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel",
+      "DELETE": "حذف کریں۔",
+      "CANCEL": "منسوخ کریں۔",
       "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
     },
     "CONDITION": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/campaign.json b/app/javascript/dashboard/i18n/locale/ur/campaign.json
index bbcc463ee..ab61704cf 100644
--- a/app/javascript/dashboard/i18n/locale/ur/campaign.json
+++ b/app/javascript/dashboard/i18n/locale/ur/campaign.json
@@ -9,7 +9,7 @@
     "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",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "CREATE_BUTTON_TEXT": "Create",
       "FORM": {
         "TITLE": {
@@ -63,12 +63,12 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
         "MESSAGE": "Are you sure to delete?",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       },
       "API": {
         "SUCCESS_MESSAGE": "Campaign deleted successfully",
@@ -89,8 +89,8 @@
       "TABLE_HEADER": {
         "TITLE": "Title",
         "MESSAGE": "Message",
-        "INBOX": "Inbox",
-        "STATUS": "Status",
+        "INBOX": "ان باکس",
+        "STATUS": "اسٹیٹس",
         "SENDER": "Sender",
         "URL": "URL",
         "SCHEDULED_AT": "Scheduled time",
@@ -98,9 +98,9 @@
         "CREATED_AT": "Created at"
       },
       "BUTTONS": {
-        "ADD": "Add",
-        "EDIT": "Edit",
-        "DELETE": "Delete"
+        "ADD": "شامل کریں۔",
+        "EDIT": "ترمیم",
+        "DELETE": "حذف کریں۔"
       },
       "STATUS": {
         "ENABLED": "Enabled",
diff --git a/app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json
index 9c14f5a52..289ffc39f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/cannedMgmt.json
@@ -1,75 +1,75 @@
 {
   "CANNED_MGMT": {
-    "HEADER": "Canned Responses",
-    "HEADER_BTN_TXT": "Add Canned Response",
-    "LOADING": "Fetching Canned Responses",
-    "SEARCH_404": "There are no items matching this query",
+    "HEADER": "محفوظ کردہ جوابات",
+    "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>",
     "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.",
+      "404": "اس اکاؤنٹ میں کوئی محفوظ کردہ جوابات دستیاب نہیں ہیں۔.",
+      "TITLE": "محفوظ کردہ جوابات کو نظم کریں",
+      "DESC": "محفوظ کردہ جوابات پہلے سے طے شدہ جوابی ٹیمپلیٹس ہیں جنہیں ٹکٹوں کے جوابات فوری بھیجنے کے لیے استعمال کیا جا سکتا ہے۔.",
       "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",
+      "TITLE": "محفوظ کردہ جوابات شامل کریں",
+      "DESC": "محفوظ کردہ جوابی ٹیمپلیٹس کو محفوظ کیا جاتا ہے جو گفتگو کے جواب کو تیزی سے بھیجنے کے لیے استعمال کیا جا سکتا ہے۔.",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a short code",
-          "ERROR": "Short Code is required"
+          "LABEL": "مختصر کوڈ",
+          "PLACEHOLDER": "براہ کرم مختصر کوڈ درج کریں۔",
+          "ERROR": "مختصر کوڈ درکار ہے۔"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "مواد",
+          "PLACEHOLDER": "براہ کرم مواد درج کریں۔",
+          "ERROR": "مواد درکار ہے۔"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "جمع کرائیں"
       },
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "جواب کامیابی کے ساتھ محفوظ کیا گیا۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Canned Response",
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "TITLE": "محفوظ کردہ جوابات میں ترمیم کریں۔",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "FORM": {
         "SHORT_CODE": {
-          "LABEL": "Short Code",
-          "PLACEHOLDER": "Please enter a shortcode",
-          "ERROR": "Short Code is required"
+          "LABEL": "مختصر کوڈ",
+          "PLACEHOLDER": "براہ کرم مختصر کوڈ درج کریں۔",
+          "ERROR": "مختصر کوڈ درکار ہے۔"
         },
         "CONTENT": {
-          "LABEL": "Content",
-          "PLACEHOLDER": "Please enter a content",
-          "ERROR": "Content is required"
+          "LABEL": "مواد",
+          "PLACEHOLDER": "براہ کرم مواد درج کریں۔",
+          "ERROR": "مواد درکار ہے۔"
         },
-        "SUBMIT": "Submit"
+        "SUBMIT": "جمع کرائیں"
       },
-      "BUTTON_TEXT": "Edit",
+      "BUTTON_TEXT": "ترمیم",
       "API": {
-        "SUCCESS_MESSAGE": "Canned Response updated successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "محفوظ کردہ جواب کامیابی کے ساتھ اپ ڈیٹ ہو گیا۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "API": {
-        "SUCCESS_MESSAGE": "Canned response deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "SUCCESS_MESSAGE": "محفوظ کردہ جواب کامیابی کے ساتھ حذف کر دیا گیا۔",
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       },
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
+        "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur/chatlist.json b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
index e3d637b71..b209790e2 100644
--- a/app/javascript/dashboard/i18n/locale/ur/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
@@ -1,87 +1,87 @@
 {
   "CHAT_LIST": {
-    "LOADING": "Fetching conversations",
-    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
-    "EOF": "All conversations loaded 🎉",
+    "LOADING": "مکالمات فیچ کئیے جا رہےہیں",
+    "LOAD_MORE_CONVERSATIONS": "مزید مکالمات لوڈ کریں۔",
+    "EOF": "تمام مکالمات لوڈ ہو گئے 🎉",
     "LIST": {
-      "404": "There are no active conversations in this group."
+      "404": "اس گروپ میں کوئی فعال گفتگو نہیں ہے۔."
     },
-    "TAB_HEADING": "Conversations",
-    "MENTION_HEADING": "Mentions",
+    "TAB_HEADING": "مکالمات",
+    "MENTION_HEADING": "تذکرہ",
     "SEARCH": {
-      "INPUT": "Search for People, Chats, Saved Replies .."
+      "INPUT": "لوگوں ، چیٹس یا محفوظ کردہ جوابات میں تلاش کریں.."
     },
-    "FILTER_ALL": "All",
+    "FILTER_ALL": "تمام",
     "STATUS_TABS": [
       {
-        "NAME": "Open",
+        "NAME": "کھولیں۔",
         "KEY": "openCount"
       },
       {
-        "NAME": "Resolved",
+        "NAME": "حل ہو گیا۔",
         "KEY": "allConvCount"
       }
     ],
     "ASSIGNEE_TYPE_TABS": [
       {
-        "NAME": "Mine",
+        "NAME": "میرا",
         "KEY": "me",
         "COUNT_KEY": "mineCount"
       },
       {
-        "NAME": "Unassigned",
+        "NAME": "نا مقرر کیا ہوا",
         "KEY": "unassigned",
         "COUNT_KEY": "unAssignedCount"
       },
       {
-        "NAME": "All",
+        "NAME": "تمام",
         "KEY": "all",
         "COUNT_KEY": "allCount"
       }
     ],
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
-        "TEXT": "Open"
+        "TEXT": "کھولیں۔"
       },
       "resolved": {
-        "TEXT": "Resolved"
+        "TEXT": "حل ہو گیا۔"
       },
       "pending": {
-        "TEXT": "Pending"
+        "TEXT": "زیر التواء"
       },
       "snoozed": {
-        "TEXT": "Snoozed"
+        "TEXT": "اسنوز کیا گیا۔"
       }
     },
     "ATTACHMENTS": {
       "image": {
-        "CONTENT": "Picture message"
+        "CONTENT": "تصویری پیغام"
       },
       "audio": {
-        "CONTENT": "Audio message"
+        "CONTENT": "آڈیو پیغام"
       },
       "video": {
-        "CONTENT": "Video message"
+        "CONTENT": "ویڈیو پیغام"
       },
       "file": {
-        "CONTENT": "File Attachment"
+        "CONTENT": "فائل منسلک کرنا"
       },
       "location": {
-        "CONTENT": "Location"
+        "CONTENT": "مقام"
       },
       "fallback": {
-        "CONTENT": "has shared a url"
+        "CONTENT": "نے ایک یو آر ایل بھیجا"
       }
     },
-    "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",
-    "NO_MESSAGES": "No Messages",
-    "NO_CONTENT": "No content available",
-    "HIDE_QUOTED_TEXT": "Hide Quoted Text",
-    "SHOW_QUOTED_TEXT": "Show Quoted Text",
-    "MESSAGE_READ": "Read"
+    "RECEIVED_VIA_EMAIL": "ای میل کے ذریعے موصول ہوا۔",
+    "VIEW_TWEET_IN_TWITTER": "ٹویٹر میں ٹویٹ دیکھیں",
+    "REPLY_TO_TWEET": "اس ٹویٹ کا جواب دیں۔",
+    "LINK_TO_STORY": "انسٹاگرام سٹوری پر جائیں۔",
+    "SENT": "کامیابی سے بھیج دیا گیا۔",
+    "NO_MESSAGES": "کوئی پیغامات نہیں۔",
+    "NO_CONTENT": "کوئی مواد دستیاب نہیں ہے۔",
+    "HIDE_QUOTED_TEXT": "اقتباس شدہ متن کو چھپائیں۔",
+    "SHOW_QUOTED_TEXT": "اقتباس شدہ متن دکھائیں۔",
+    "MESSAGE_READ": "پڑھیں"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contact.json b/app/javascript/dashboard/i18n/locale/ur/contact.json
index 2257b4573..a2c5575ef 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contact.json
@@ -1,272 +1,272 @@
 {
   "CONTACT_PANEL": {
-    "NOT_AVAILABLE": "Not Available",
-    "EMAIL_ADDRESS": "Email Address",
-    "PHONE_NUMBER": "Phone number",
-    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
-    "COMPANY": "Company",
-    "LOCATION": "Location",
-    "CONVERSATION_TITLE": "Conversation Details",
-    "VIEW_PROFILE": "View Profile",
-    "BROWSER": "Browser",
-    "OS": "Operating System",
-    "INITIATED_FROM": "Initiated from",
-    "INITIATED_AT": "Initiated at",
-    "IP_ADDRESS": "IP Address",
-    "NEW_MESSAGE": "New message",
+    "NOT_AVAILABLE": "دستیاب نہیں ہے",
+    "EMAIL_ADDRESS": "ای میل اڈریس",
+    "PHONE_NUMBER": "فون نمبر",
+    "COPY_SUCCESSFUL": "کامیابی کے ساتھ کلپ بورڈ پر کاپی ہو گیا۔",
+    "COMPANY": "کمپنی",
+    "LOCATION": "مقام",
+    "CONVERSATION_TITLE": "گفتگو کی تفصیلات",
+    "VIEW_PROFILE": "پروفائل کا مشاھدہ کریں",
+    "BROWSER": "براؤزر",
+    "OS": "آپریٹنگ سسٹم",
+    "INITIATED_FROM": "سے شروع کیا گیا۔",
+    "INITIATED_AT": "پر شروع کیا گیا۔",
+    "IP_ADDRESS": "آئی پی ایڈریس",
+    "NEW_MESSAGE": "نیا پیغام",
     "CONVERSATIONS": {
-      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
-      "TITLE": "Previous Conversations"
+      "NO_RECORDS_FOUND": "اس کانٹیکٹ سے وابستہ کوئی پچھلی بات چیت موجود نہیں ہے۔.",
+      "TITLE": "پچھلی بات چیت"
     },
     "LABELS": {
       "CONTACT": {
-        "TITLE": "Contact Labels",
-        "ERROR": "Couldn't update labels"
+        "TITLE": "کانٹیکٹ لیبلز",
+        "ERROR": "لیبلز کو اپ ڈیٹ نہیں کیا جا سکا"
       },
       "CONVERSATION": {
-        "TITLE": "Conversation Labels",
-        "ADD_BUTTON": "Add Labels"
+        "TITLE": "گفتگو کے لیبلز",
+        "ADD_BUTTON": "لیبلز شامل کریں۔"
       },
       "LABEL_SELECT": {
-        "TITLE": "Add Labels",
-        "PLACEHOLDER": "Search labels",
-        "NO_RESULT": "No labels found"
+        "TITLE": "لیبلز شامل کریں۔",
+        "PLACEHOLDER": "لیبل تلاش کریں۔",
+        "NO_RESULT": "کوئی لیبل نہیں ملے"
       }
     },
-    "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",
+    "MERGE_CONTACT": "کانٹیکٹ ضم کریں۔",
+    "CONTACT_ACTIONS": "کانٹیکٹ ایکشنز",
+    "MUTE_CONTACT": "خاموش گفتگو",
+    "UNMUTE_CONTACT": "گفتگو کو چالو کریں۔",
+    "MUTED_SUCCESS": "یہ گفتگو 6 گھنٹے کے لیے خاموش ہے۔",
+    "UNMUTED_SUCCESS": "یہ گفتگو غیر خاموش ہے۔",
+    "SEND_TRANSCRIPT": "ٹرانسکرپٹ بھیجیں۔",
+    "EDIT_LABEL": "ترمیم",
     "SIDEBAR_SECTIONS": {
-      "CUSTOM_ATTRIBUTES": "Custom Attributes",
-      "CONTACT_LABELS": "Contact Labels",
-      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+      "CUSTOM_ATTRIBUTES": "حسب ضرورت اوصاف",
+      "CONTACT_LABELS": "کانٹیکٹ لیبلز",
+      "PREVIOUS_CONVERSATIONS": "پچھلی بات چیت"
     }
   },
   "EDIT_CONTACT": {
-    "BUTTON_LABEL": "Edit Contact",
-    "TITLE": "Edit contact",
-    "DESC": "Edit contact details"
+    "BUTTON_LABEL": "کانٹیکٹ میں ترمیم کریں۔",
+    "TITLE": "کانٹیکٹ میں ترمیم کریں۔",
+    "DESC": "کانٹیکٹ کی تفصیلات میں ترمیم کریں۔"
   },
   "CREATE_CONTACT": {
-    "BUTTON_LABEL": "New Contact",
-    "TITLE": "Create new contact",
-    "DESC": "Add basic information details about the contact."
+    "BUTTON_LABEL": "نیا کانٹیکٹ",
+    "TITLE": "نیا کانٹیکٹ بنائیں",
+    "DESC": "کانٹیکٹ کے بارے میں بنیادی معلومات کی تفصیلات شامل کریں۔."
   },
   "IMPORT_CONTACTS": {
-    "BUTTON_LABEL": "Import",
-    "TITLE": "Import Contacts",
-    "DESC": "Import contacts through a CSV file.",
-    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "BUTTON_LABEL": "درآمد کریں۔",
+    "TITLE": "کانٹیکٹ درآمد کریں۔",
+    "DESC": "سی ایس وی فائل کے ذریعے کانٹیکٹ درآمد کریں۔.",
+    "DOWNLOAD_LABEL": "ایک نمونہ سی ایس وی ڈاؤن لوڈ کریں۔.",
     "FORM": {
-      "LABEL": "CSV File",
-      "SUBMIT": "Import",
-      "CANCEL": "Cancel"
+      "LABEL": "سی ایس وی فائل",
+      "SUBMIT": "درآمد کریں۔",
+      "CANCEL": "منسوخ کریں۔"
     },
-    "SUCCESS_MESSAGE": "Contacts saved successfully",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "SUCCESS_MESSAGE": "کانٹیکٹ کامیابی سے محفوظ ہو گیا۔",
+    "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
   },
   "DELETE_NOTE": {
     "CONFIRM": {
-      "TITLE": "Confirm Deletion",
-      "MESSAGE": "Are you want sure to delete this note?",
-      "YES": "Yes, Delete it",
-      "NO": "No, Keep it"
+      "TITLE": "حذف کرنے کی تصدیق کریں۔",
+      "MESSAGE": "کیا آپ یقینی طور پر اس نوٹ کو حذف کرنا چاہتے ہیں⸮",
+      "YES": "ہاں، حذف کریں۔",
+      "NO": "نہیں ، رہنے دیں"
     }
   },
   "DELETE_CONTACT": {
-    "BUTTON_LABEL": "Delete Contact",
-    "TITLE": "Delete contact",
-    "DESC": "Delete contact details",
+    "BUTTON_LABEL": "کانٹیکٹ حذف کریں۔",
+    "TITLE": "کانٹیکٹ حذف کریں۔",
+    "DESC": "کانٹیکٹ کی تفصیلات حذف کریں۔",
     "CONFIRM": {
-      "TITLE": "Confirm Deletion",
-      "MESSAGE": "Are you sure to delete ",
-      "YES": "Yes, Delete",
-      "NO": "No, Keep"
+      "TITLE": "حذف کرنے کی تصدیق کریں۔",
+      "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
+      "YES": "ہاں، حذف کریں۔ ",
+      "NO": "نہیں ، رہنے دیں"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Contact deleted successfully",
-      "ERROR_MESSAGE": "Could not delete contact. Please try again later."
+      "SUCCESS_MESSAGE": "کانٹیکٹ کامیابی سے حذف ہو گیا۔",
+      "ERROR_MESSAGE": "کانٹیکٹ حذف نہیں کیا جا سکا۔ براہ کرم کچھ دیر بعد کوشش کریں."
     }
   },
   "CONTACT_FORM": {
     "FORM": {
-      "SUBMIT": "Submit",
-      "CANCEL": "Cancel",
+      "SUBMIT": "جمع کرائیں",
+      "CANCEL": "منسوخ کریں۔",
       "AVATAR": {
-        "LABEL": "Contact Avatar"
+        "LABEL": "کانٹیکٹ اوتار"
       },
       "NAME": {
-        "PLACEHOLDER": "Enter the full name of the contact",
-        "LABEL": "Full Name"
+        "PLACEHOLDER": "کانٹیکٹ کا پورا نام درج کریں۔",
+        "LABEL": "پورا نام"
       },
       "BIO": {
-        "PLACEHOLDER": "Enter the bio of the contact",
-        "LABEL": "Bio"
+        "PLACEHOLDER": "کانٹیکٹ کے بارے میں معلومات درج کریں",
+        "LABEL": "معلومات"
       },
       "EMAIL_ADDRESS": {
-        "PLACEHOLDER": "Enter the email address of the contact",
-        "LABEL": "Email Address",
-        "DUPLICATE": "This email address is in use for another contact."
+        "PLACEHOLDER": "کانٹیکٹ کا ای میل درج کریں۔",
+        "LABEL": "ای میل اڈریس",
+        "DUPLICATE": "یہ ای میل دوسرے کانٹیکٹ کے لیے استعمال میں ہے۔."
       },
       "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."
+        "PLACEHOLDER": "کانٹیکٹ کا فون نمبر درج کریں۔",
+        "LABEL": "فون نمبر",
+        "HELP": "فون نمبر E.164 فارمیٹ کا ہونا چاہیے جیسے: +1415555555 [+][ملک کا کوڈ][علاقہ کا کوڈ][مقامی فون نمبر]",
+        "ERROR": "فون نمبر یا تو خالی یا E.164 فارمیٹ کا ہونا چاہیے۔",
+        "DUPLICATE": "یہ فون نمبر دوسرے کانٹیکٹ کے لیے استعمال میں ہے۔."
       },
       "LOCATION": {
-        "PLACEHOLDER": "Enter the location of the contact",
-        "LABEL": "Location"
+        "PLACEHOLDER": "کانٹیکٹ کا مقام درج کریں۔",
+        "LABEL": "مقام"
       },
       "COMPANY_NAME": {
-        "PLACEHOLDER": "Enter the company name",
-        "LABEL": "Company Name"
+        "PLACEHOLDER": "کمپنی کا نام درج کریں۔",
+        "LABEL": "کمپنی کا نام"
       },
       "SOCIAL_PROFILES": {
         "FACEBOOK": {
-          "PLACEHOLDER": "Enter the Facebook username",
-          "LABEL": "Facebook"
+          "PLACEHOLDER": "فیس بک صارف کا مخصوص نام درج کریں",
+          "LABEL": "فیس بک"
         },
         "TWITTER": {
-          "PLACEHOLDER": "Enter the Twitter username",
-          "LABEL": "Twitter"
+          "PLACEHOLDER": "ٹویٹر صارف کا مخصوص نام درج کریں۔",
+          "LABEL": "ٹویٹر"
         },
         "LINKEDIN": {
-          "PLACEHOLDER": "Enter the LinkedIn username",
-          "LABEL": "LinkedIn"
+          "PLACEHOLDER": "لنک ڈن صارف کا خصوصی نام درج کریں۔",
+          "LABEL": "لنک ڈن"
         },
         "GITHUB": {
-          "PLACEHOLDER": "Enter the Github username",
-          "LABEL": "Github"
+          "PLACEHOLDER": "گٹ حب صارف کا خصوصی نام درج کریں۔",
+          "LABEL": "گٹ حب"
         }
       }
     },
-    "SUCCESS_MESSAGE": "Contact saved successfully",
-    "ERROR_MESSAGE": "There was an error, please try again"
+    "SUCCESS_MESSAGE": "کانٹیکٹ کامیابی سے محفوظ ہو گیا۔",
+    "ERROR_MESSAGE": "ایک خامی تھی، براہ کرم دوبارہ کوشش کریں۔"
   },
   "NEW_CONVERSATION": {
-    "BUTTON_LABEL": "Start conversation",
-    "TITLE": "New conversation",
-    "DESC": "Start a new conversation by sending a new message.",
-    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "BUTTON_LABEL": "گفتگو شروع کریں",
+    "TITLE": "نئی گفتگو",
+    "DESC": "ایک نیا پیغام بھیج کر ایک نئی گفتگو شروع کریں۔.",
+    "NO_INBOX": "اس رابطے کے ساتھ نئی بات چیت شروع کرنے کے لیے ان باکس نہیں مل سکا۔.",
     "FORM": {
       "TO": {
-        "LABEL": "To"
+        "LABEL": "کو"
       },
       "INBOX": {
-        "LABEL": "Inbox",
-        "ERROR": "Select an inbox"
+        "LABEL": "ان باکس",
+        "ERROR": "ایک ان باکس منتخب کریں۔"
       },
       "SUBJECT": {
-        "LABEL": "Subject",
-        "PLACEHOLDER": "Subject",
-        "ERROR": "Subject can't be empty"
+        "LABEL": "مضمون",
+        "PLACEHOLDER": "مضمون",
+        "ERROR": "موضوع خالی نہیں ہو سکتا"
       },
       "MESSAGE": {
-        "LABEL": "Message",
-        "PLACEHOLDER": "Write your message here",
-        "ERROR": "Message can't be empty"
+        "LABEL": "پیغام",
+        "PLACEHOLDER": "اپنا پیغام یہاں لکھیں۔",
+        "ERROR": "پیغام خالی نہیں ہو سکتا"
       },
-      "SUBMIT": "Send message",
-      "CANCEL": "Cancel",
-      "SUCCESS_MESSAGE": "Message sent!",
-      "GO_TO_CONVERSATION": "View",
-      "ERROR_MESSAGE": "Couldn't send! try again"
+      "SUBMIT": "پیغام بھیجیں",
+      "CANCEL": "منسوخ کریں۔",
+      "SUCCESS_MESSAGE": "پیغام چلا گیا!",
+      "GO_TO_CONVERSATION": "دیکھیں",
+      "ERROR_MESSAGE": "نہیں بھیج سکا! دوبارہ کوشش کریں"
     }
   },
   "CONTACTS_PAGE": {
-    "HEADER": "Contacts",
-    "FIELDS": "Contact fields",
-    "SEARCH_BUTTON": "Search",
-    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
-    "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "HEADER": "کانٹیکٹس",
+    "FIELDS": "کانٹیکٹ فیلڈز",
+    "SEARCH_BUTTON": "تلاش کریں۔",
+    "SEARCH_INPUT_PLACEHOLDER": "کانٹیکٹ تلاش کریں",
+    "FILTER_CONTACTS": "فلٹر",
+    "FILTER_CONTACTS_SAVE": "فلٹر محفوظ کریں۔",
+    "FILTER_CONTACTS_DELETE": "فلٹر کو حذف کریں۔",
     "LIST": {
-      "LOADING_MESSAGE": "Loading contacts...",
-      "404": "No contacts matches your search 🔍",
-      "NO_CONTACTS": "There are no available contacts",
+      "LOADING_MESSAGE": "کانٹیکٹس لوڈ ہو رہے ہیں...",
+      "404": "کوئی کانٹیکٹ آپ کی تلاش سے میل نہیں کھاتا 🔍",
+      "NO_CONTACTS": "کوئی کانٹیکٹ دستیاب نہیں ہے۔",
       "TABLE_HEADER": {
-        "NAME": "Name",
-        "PHONE_NUMBER": "Phone Number",
-        "CONVERSATIONS": "Conversations",
-        "LAST_ACTIVITY": "Last Activity",
-        "COUNTRY": "Country",
-        "CITY": "City",
-        "SOCIAL_PROFILES": "Social Profiles",
-        "COMPANY": "Company",
-        "EMAIL_ADDRESS": "Email Address"
+        "NAME": "نام",
+        "PHONE_NUMBER": "فون نمبر",
+        "CONVERSATIONS": "مکالمات",
+        "LAST_ACTIVITY": "آخری سرگرمی",
+        "COUNTRY": "ملک",
+        "CITY": "شہر",
+        "SOCIAL_PROFILES": "سوشل پروفائلز",
+        "COMPANY": "کمپنی",
+        "EMAIL_ADDRESS": "ای میل اڈریس"
       },
-      "VIEW_DETAILS": "View details"
+      "VIEW_DETAILS": "تفصیلات دیکھیں"
     }
   },
   "CONTACT_PROFILE": {
-    "BACK_BUTTON": "Contacts",
-    "LOADING": "Loading contact profile..."
+    "BACK_BUTTON": "کانٹیکٹس",
+    "LOADING": "کانٹیکٹ پروفائل لوڈ ہورہی ہے..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
-      "BUTTON": "Add",
-      "TITLE": "Shift + Enter to create a task"
+      "BUTTON": "شامل کریں۔",
+      "TITLE": "ٹاسک بنانے کے لیے Shift + Enter"
     },
     "FOOTER": {
-      "DUE_DATE": "Due date",
-      "LABEL_TITLE": "Set type"
+      "DUE_DATE": "اخری تاریخ",
+      "LABEL_TITLE": "قسم سیٹ کریں۔"
     }
   },
   "NOTES": {
-    "FETCHING_NOTES": "Fetching notes...",
-    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "FETCHING_NOTES": "نوٹس فیچ ہورہے ہیں...",
+    "NOT_AVAILABLE": "اس کانٹیکٹ کے لیے کوئی نوٹس نہیں بنائے گئے ہیں۔",
     "HEADER": {
-      "TITLE": "Notes"
+      "TITLE": "نوٹس"
     },
     "LIST": {
-      "LABEL": "added a note"
+      "LABEL": "ایک نوٹ شامل کیا"
     },
     "ADD": {
-      "BUTTON": "Add",
-      "PLACEHOLDER": "Add a note",
-      "TITLE": "Shift + Enter to create a note"
+      "BUTTON": "شامل کریں۔",
+      "PLACEHOLDER": "ایک نوٹ شامل کیا",
+      "TITLE": "نوٹ بنانے کے لیے Shift + Enter دبائیں"
     },
     "CONTENT_HEADER": {
-      "DELETE": "Delete note"
+      "DELETE": "نوٹ حذف کریں۔"
     }
   },
   "EVENTS": {
     "HEADER": {
-      "TITLE": "Activities"
+      "TITLE": "سرگرمیاں"
     },
     "BUTTON": {
-      "PILL_BUTTON_NOTES": "notes",
-      "PILL_BUTTON_EVENTS": "events",
-      "PILL_BUTTON_CONVO": "conversations"
+      "PILL_BUTTON_NOTES": "نوٹ",
+      "PILL_BUTTON_EVENTS": "تقریبات",
+      "PILL_BUTTON_CONVO": "مکالمات"
     }
   },
   "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",
+    "ADD_BUTTON_TEXT": "صفات شامل کریں۔",
+    "BUTTON": "حسب ضرورت صفات شامل کریں۔",
+    "NOT_AVAILABLE": "اس رابطے کے لیے کوئی حسب ضرورت صفات دستیاب نہیں ہیں۔.",
+    "COPY_SUCCESSFUL": "کامیابی کے ساتھ کلپ بورڈ پر کاپی ہو گیا۔",
     "ACTIONS": {
-      "COPY": "Copy attribute",
-      "DELETE": "Delete attribute",
-      "EDIT": "Edit attribute"
+      "COPY": "صفات کاپی کریں۔",
+      "DELETE": "صفات کو حذف کریں۔",
+      "EDIT": "صفات میں ترمیم کریں۔"
     },
     "ADD": {
-      "TITLE": "Create custom attribute",
-      "DESC": "Add custom information to this contact."
+      "TITLE": "حسب ضرورت صفات بنائیں",
+      "DESC": "اس کانٹیکٹ میں حسب ضرورت معلومات شامل کریں۔."
     },
     "FORM": {
-      "CREATE": "Add attribute",
-      "CANCEL": "Cancel",
+      "CREATE": "صفات شامل کریں۔",
+      "CANCEL": "منسوخ کریں۔",
       "NAME": {
-        "LABEL": "Custom attribute name",
+        "LABEL": "حسب ضرورت صفات کا نام",
         "PLACEHOLDER": "Eg: shopify id",
         "ERROR": "Invalid custom attribute name"
       },
@@ -288,7 +288,7 @@
         "ERROR": "Unable to delete attribute. Please try again later"
       },
       "ATTRIBUTE_SELECT": {
-        "TITLE": "Add attributes",
+        "TITLE": "صفات شامل کریں۔",
         "PLACEHOLDER": "Search attributes",
         "NO_RESULT": "No attributes found"
       },
@@ -309,30 +309,30 @@
     "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"
+      "TITLE": "بنیادی رابطہ",
+      "HELP_LABEL": "رکھا جائے ۔"
     },
     "CHILD": {
-      "TITLE": "Contact to merge",
-      "PLACEHOLDER": "Search for a contact",
-      "HELP_LABEL": "To be deleted"
+      "TITLE": "کانٹیکٹ کو زم کریں",
+      "PLACEHOLDER": "کانٹیکٹ تلاش کریں",
+      "HELP_LABEL": "حذف کیا جائے۔"
     },
     "SUMMARY": {
-      "TITLE": "Summary",
-      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
-      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+      "TITLE": "خلاصہ",
+      "DELETE_WARNING": "<strong>%{childContactName}</strong> کا کانٹیکٹ حذف کر دیا جائے گا۔.",
+      "ATTRIBUTE_WARNING": "<strong>%{childContactName}</strong> کے کانٹیکٹ کی تفصیلات <strong>%{primaryContactName}</strong> پر کاپی کی جائیں گی۔."
     },
     "SEARCH": {
-      "ERROR": "ERROR_MESSAGE"
+      "ERROR": "خامی کا پیغام"
     },
     "FORM": {
-      "SUBMIT": " Merge contacts",
-      "CANCEL": "Cancel",
+      "SUBMIT": " کانٹیکٹ ضم کریں۔",
+      "CANCEL": "منسوخ کریں۔",
       "CHILD_CONTACT": {
-        "ERROR": "Select a child contact to merge"
+        "ERROR": "ضم کرنے کے لیے چائلڈ کانٹیکٹ منتخب کریں۔"
       },
-      "SUCCESS_MESSAGE": "Contact merged successfully",
-      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+      "SUCCESS_MESSAGE": "کانٹیکٹ کامیابی سے ضم ہو گیا۔",
+      "ERROR_MESSAGE": "کانٹیکٹ کو ضم نہیں کیا جا سکا، دوبارہ کوشش کریں!"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/contactFilters.json b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
index bd58ccf3e..61f92a379 100644
--- a/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ur/contactFilters.json
@@ -5,8 +5,8 @@
         "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",
+        "SUBMIT_BUTTON_LABEL": "جمع کرائیں",
+        "CANCEL_BUTTON_LABEL": "منسوخ کریں۔",
         "CLEAR_BUTTON_LABEL": "Clear Filters",
         "EMPTY_VALUE_ERROR": "Value is required",
         "TOOLTIP_LABEL": "Filter contacts",
@@ -26,19 +26,19 @@
             "days_before": "Is x days before"
         },
         "ATTRIBUTES": {
-            "NAME": "Name",
+            "NAME": "نام",
             "EMAIL": "Email",
             "PHONE_NUMBER": "Phone number",
             "IDENTIFIER": "Identifier",
-            "CITY": "City",
-            "COUNTRY": "Country",
+            "CITY": "شہر",
+            "COUNTRY": "ملک",
             "CUSTOM_ATTRIBUTE_LIST": "List",
             "CUSTOM_ATTRIBUTE_TEXT": "Text",
             "CUSTOM_ATTRIBUTE_NUMBER": "Number",
             "CUSTOM_ATTRIBUTE_LINK": "Link",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
             "CREATED_AT": "Created At",
-            "LAST_ACTIVITY": "Last Activity"
+            "LAST_ACTIVITY": "آخری سرگرمی"
         },
         "GROUPS": {
             "STANDARD_FILTERS": "Standard Filters",
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index ac25a5aed..f3aa63d28 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -1,46 +1,46 @@
 {
   "CONVERSATION": {
-    "404": "Please select a conversation from left pane",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
-    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
-    "NO_MESSAGE_2": " to send a message to your page!",
-    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
-    "NO_INBOX_2": " to get started",
-    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
-    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "404": "براہ کرم بائیں پین سے گفتگو کا انتخاب کریں۔",
+    "UNVERIFIED_SESSION": "اس صارف کی شناخت کی تصدیق نہیں ہوئی ہے۔",
+    "NO_MESSAGE_1": "اوہ! ایسا لگتا ہے کہ آپ کے ان باکس میں صارفین کی جانب سے کوئی پیغامات نہیں ہیں۔.",
+    "NO_MESSAGE_2": " اپنے صفحہ پر پیغام بھیجنے کے لیے!",
+    "NO_INBOX_1": "ہیلو! ایسا لگتا ہے کہ آپ نے ابھی تک کوئی ان باکس شامل نہیں کیا ہے۔.",
+    "NO_INBOX_2": " شروع کرنے کے لیے",
+    "NO_INBOX_AGENT": "اوہ! ایسا لگتا ہے کہ آپ کسی ان باکس کا حصہ نہیں ہیں۔ براہ کرم اپنے منتظم سے رابطہ کریں۔",
+    "SEARCH_MESSAGES": "مکالمات میں پیغامات تلاش کریں۔",
     "SEARCH": {
-      "TITLE": "Search messages",
-      "RESULT_TITLE": "Search Results",
-      "LOADING_MESSAGE": "Crunching data...",
-      "PLACEHOLDER": "Type any text to search messages",
-      "NO_MATCHING_RESULTS": "No results found."
+      "TITLE": "پیغامات تلاش کریں۔",
+      "RESULT_TITLE": "تلاش کے نتائج",
+      "LOADING_MESSAGE": "کرنچنگ ڈیٹا...",
+      "PLACEHOLDER": "پیغامات تلاش کرنے کے لیے کوئی بھی متن ٹائپ کریں۔",
+      "NO_MATCHING_RESULTS": "کوئی نتیجہ نہیں."
     },
-    "UNREAD_MESSAGES": "Unread Messages",
-    "UNREAD_MESSAGE": "Unread Message",
-    "CLICK_HERE": "Click here",
-    "LOADING_INBOXES": "Loading inboxes",
-    "LOADING_CONVERSATIONS": "Loading Conversations",
-    "CANNOT_REPLY": "You cannot reply due to",
-    "24_HOURS_WINDOW": "24 hour message window restriction",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
-    "ASSIGN_TO_ME": "Assign to me",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
-    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
-    "REPLYING_TO": "You are replying to:",
-    "REMOVE_SELECTION": "Remove Selection",
-    "DOWNLOAD": "Download",
-    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
-    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
-    "NO_RESPONSE": "No response",
-    "RATING_TITLE": "Rating",
-    "FEEDBACK_TITLE": "Feedback",
+    "UNREAD_MESSAGES": "بغیر پڑھے ہوئے پیغامات",
+    "UNREAD_MESSAGE": "بغیر پڑھا ہوا پیغام",
+    "CLICK_HERE": "یہاں کلک کریں",
+    "LOADING_INBOXES": "یہ ان باکس لوڈ ہورہے ہیں",
+    "LOADING_CONVERSATIONS": "مکالمات لوڈ ہو رہے ہیں",
+    "CANNOT_REPLY": "کی وجہ سے آپ جواب نہیں دے سکتے",
+    "24_HOURS_WINDOW": "24 گھنٹے میسج ونڈو کی پابندی",
+    "NOT_ASSIGNED_TO_YOU": "یہ گفتگو آپ کو تفویض نہیں کی گئی ہے۔ کیا آپ یہ گفتگو اپنے آپ کو تفویض کرنا چاہیں گے?",
+    "ASSIGN_TO_ME": "مجھے تفویض کریں۔",
+    "TWILIO_WHATSAPP_CAN_REPLY": "آپ اس بات چیت کا جواب صرف ایک ٹیمپلیٹ پیغام کا استعمال کرتے ہوئے دے سکتے ہیں, کيونکہ‎",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 گھنٹے میسج ونڈو کی پابندی",
+    "SELECT_A_TWEET_TO_REPLY": "براہ کرم جواب دینے کے لیے ایک ٹویٹ منتخب کریں۔.",
+    "REPLYING_TO": "آپ جواب دے رہے ہیں:",
+    "REMOVE_SELECTION": "انتخاب کو ہٹا دیں۔",
+    "DOWNLOAD": "ڈاؤن لوڈ کریں",
+    "UPLOADING_ATTACHMENTS": "منسلکات اپ لوڈ ہو رہی ہیں...",
+    "SUCCESS_DELETE_MESSAGE": "پیغام کامیابی سے حذف ہو گیا۔",
+    "FAIL_DELETE_MESSSAGE": "پیغام کو حذف نہیں کیا جا سکا! دوبارہ کوشش کریں",
+    "NO_RESPONSE": "کوئی ردعمل نہیں",
+    "RATING_TITLE": "درجہ بندی",
+    "FEEDBACK_TITLE": "فیڈ بیک",
     "HEADER": {
-      "RESOLVE_ACTION": "Resolve",
-      "REOPEN_ACTION": "Reopen",
-      "OPEN_ACTION": "Open",
-      "OPEN": "More",
+      "RESOLVE_ACTION": "حل کریں۔",
+      "REOPEN_ACTION": "دوبارہ کھولیں۔",
+      "OPEN_ACTION": "کھولیں۔",
+      "OPEN": "مزید",
       "CLOSE": "Close",
       "DETAILS": "details",
       "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
@@ -113,14 +113,14 @@
     },
     "CONTEXT_MENU": {
       "COPY": "Copy",
-      "DELETE": "Delete"
+      "DELETE": "حذف کریں۔"
     }
   },
   "EMAIL_TRANSCRIPT": {
     "TITLE": "Send conversation transcript",
     "DESC": "Send a copy of the conversation transcript to the specified email address",
-    "SUBMIT": "Submit",
-    "CANCEL": "Cancel",
+    "SUBMIT": "جمع کرائیں",
+    "CANCEL": "منسوخ کریں۔",
     "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
     "SEND_EMAIL_ERROR": "There was an error, please try again",
     "FORM": {
@@ -167,10 +167,10 @@
     "ACCORDION": {
       "CONTACT_DETAILS": "Contact Details",
       "CONVERSATION_ACTIONS": "Conversation Actions",
-      "CONVERSATION_LABELS": "Conversation Labels",
+      "CONVERSATION_LABELS": "گفتگو کے لیبلز",
       "CONVERSATION_INFO": "Conversation Information",
       "CONTACT_ATTRIBUTES": "Contact Attributes",
-      "PREVIOUS_CONVERSATION": "Previous Conversations"
+      "PREVIOUS_CONVERSATION": "پچھلی بات چیت"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
@@ -180,7 +180,7 @@
       "ERROR": "Unable to update attribute. Please try again later"
     },
     "ADD": {
-      "TITLE": "Add",
+      "TITLE": "شامل کریں۔",
       "SUCCESS": "Attribute added successfully",
       "ERROR": "Unable to add attribute. Please try again later"
     },
@@ -189,14 +189,14 @@
       "ERROR": "Unable to delete attribute. Please try again later"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
+      "TITLE": "صفات شامل کریں۔",
       "PLACEHOLDER": "Search attributes",
       "NO_RESULT": "No attributes found"
     }
   },
   "EMAIL_HEADER": {
     "FROM": "From",
-    "TO": "To",
+    "TO": "کو",
     "BCC": "Bcc",
     "CC": "Cc",
     "SUBJECT": "Subject"
diff --git a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
index 5a0c4f7d7..5890c467d 100644
--- a/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/generalSettings.json
@@ -71,9 +71,9 @@
       "LOADING_MESSAGE": "Loading notifications...",
       "404": "No Notifications",
       "TABLE_HEADER": [
-        "Name",
+        "نام",
         "Phone Number",
-        "Conversations",
+        "مکالمات",
         "Last Contacted"
       ]
     },
diff --git a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
index bda8ea1ef..608cc19b7 100644
--- a/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/inboxMgmt.json
@@ -301,7 +301,7 @@
         "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
       },
       "AGENTS": {
-        "TITLE": "Agents",
+        "TITLE": "ایجنٹ",
         "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"
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
         "ERROR_MESSAGE": "Could not update widget color. Please try again later."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Enabled",
-        "DISABLED": "Disabled"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Enabled",
         "DISABLED": "Disabled"
@@ -366,14 +362,14 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
       "CONFIRM": {
-        "TITLE": "Confirm Deletion",
-        "MESSAGE": "Are you sure to delete ",
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
+        "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
         "PLACE_HOLDER": "Please type {inboxName} to confirm",
-        "YES": "Yes, Delete ",
-        "NO": "No, Keep "
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       },
       "API": {
         "SUCCESS_MESSAGE": "Inbox deleted successfully",
@@ -400,8 +396,10 @@
     "SETTINGS_POPUP": {
       "MESSENGER_HEADING": "Messenger Script",
       "MESSENGER_SUB_HEAD": "Place this button inside your body tag",
-      "INBOX_AGENTS": "Agents",
+      "INBOX_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",
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrationApps.json b/app/javascript/dashboard/i18n/locale/ur/integrationApps.json
index a80ecb837..7cd49e52e 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrationApps.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrationApps.json
@@ -22,17 +22,17 @@
         "INBOX": "Yes, Delete",
         "ACCOUNT": "Yes, Disconnect"
       },
-      "CANCEL_BUTTON_TEXT": "Cancel",
+      "CANCEL_BUTTON_TEXT": "منسوخ کریں۔",
       "API": {
         "SUCCESS_MESSAGE": "Hook deleted successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "LIST": {
       "FETCHING": "Fetching integration hooks",
-      "INBOX": "Inbox",
+      "INBOX": "ان باکس",
       "DELETE": {
-        "BUTTON_TEXT": "Delete"
+        "BUTTON_TEXT": "حذف کریں۔"
       }
     },
     "ADD": {
@@ -42,11 +42,11 @@
           "PLACEHOLDER": "Select Inbox"
         },
         "SUBMIT": "Create",
-        "CANCEL": "Cancel"
+        "CANCEL": "منسوخ کریں۔"
       },
       "API": {
         "SUCCESS_MESSAGE": "Integration hook added successfully",
-        "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
       }
     },
     "CONNECT": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/integrations.json b/app/javascript/dashboard/i18n/locale/ur/integrations.json
index 774514a9d..816d50225 100644
--- a/app/javascript/dashboard/i18n/locale/ur/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ur/integrations.json
@@ -4,7 +4,7 @@
     "WEBHOOK": {
       "SUBSCRIBED_EVENTS": "Subscribed Events",
       "FORM": {
-        "CANCEL": "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",
@@ -30,42 +30,42 @@
       "HEADER": "Webhook settings",
       "HEADER_BTN_TXT": "Add new webhook",
       "LOADING": "Fetching attached webhooks",
-      "SEARCH_404": "There are no items matching this query",
+      "SEARCH_404": "اس سوال سے مماثل کوئی آئٹمز نہیں ہیں۔",
       "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",
+        "BUTTON_TEXT": "ترمیم",
         "TITLE": "Edit webhook",
         "API": {
           "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
         }
       },
       "ADD": {
-        "CANCEL": "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"
+          "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
         }
       },
       "DELETE": {
-        "BUTTON_TEXT": "Delete",
+        "BUTTON_TEXT": "حذف کریں۔",
         "API": {
           "SUCCESS_MESSAGE": "Webhook deleted successfully",
-          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+          "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
         },
         "CONFIRM": {
-          "TITLE": "Confirm Deletion",
+          "TITLE": "حذف کرنے کی تصدیق کریں۔",
           "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
-          "YES": "Yes, Delete ",
+          "YES": "ہاں، حذف کریں۔ ",
           "NO": "No, Keep it"
         }
       }
@@ -77,7 +77,7 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "API": {
         "SUCCESS_MESSAGE": "Integration deleted successfully"
       }
diff --git a/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json
index db12fa32a..6780b0449 100644
--- a/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ur/labelsMgmt.json
@@ -3,14 +3,14 @@
     "HEADER": "Labels",
     "HEADER_BTN_TXT": "Add label",
     "LOADING": "Fetching labels",
-    "SEARCH_404": "There are no items matching this query",
+    "SEARCH_404": "اس سوال سے مماثل کوئی آئٹمز نہیں ہیں۔",
     "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"
       ]
@@ -33,10 +33,10 @@
       "SHOW_ON_SIDEBAR": {
         "LABEL": "Show label on sidebar"
       },
-      "EDIT": "Edit",
+      "EDIT": "ترمیم",
       "CREATE": "Create",
-      "DELETE": "Delete",
-      "CANCEL": "Cancel"
+      "DELETE": "حذف کریں۔",
+      "CANCEL": "منسوخ کریں۔"
     },
     "ADD": {
       "TITLE": "Add label",
@@ -54,16 +54,16 @@
       }
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "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 "
+        "TITLE": "حذف کرنے کی تصدیق کریں۔",
+        "MESSAGE": "کیا آپ کو یقینی طور پر حذف کرنا ہے۔ ",
+        "YES": "ہاں، حذف کریں۔ ",
+        "NO": "نہیں ، رہنے دیں "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ur/login.json b/app/javascript/dashboard/i18n/locale/ur/login.json
index 30f667052..2de7f339e 100644
--- a/app/javascript/dashboard/i18n/locale/ur/login.json
+++ b/app/javascript/dashboard/i18n/locale/ur/login.json
@@ -11,7 +11,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Login Successful",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں",
       "UNAUTH": "Username / Password Incorrect. Please try again"
     },
     "FORGOT_PASSWORD": "Forgot your password?",
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
index 566099afe..33175eec0 100644
--- a/app/javascript/dashboard/i18n/locale/ur/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -1,12 +1,12 @@
 {
   "REPORT": {
-    "HEADER": "Conversations",
+    "HEADER": "مکالمات",
     "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",
+        "NAME": "مکالمات",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -123,7 +123,7 @@
     "FILTER_DROPDOWN_LABEL": "Select Agent",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "مکالمات",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -190,7 +190,7 @@
     "FILTER_DROPDOWN_LABEL": "Select Label",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "مکالمات",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -257,7 +257,7 @@
     "FILTER_DROPDOWN_LABEL": "Select Inbox",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "مکالمات",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -324,7 +324,7 @@
     "FILTER_DROPDOWN_LABEL": "Select Team",
     "METRICS": {
       "CONVERSATIONS": {
-        "NAME": "Conversations",
+        "NAME": "مکالمات",
         "DESC": "( Total )"
       },
       "INCOMING_MESSAGES": {
@@ -395,7 +395,7 @@
       "HEADER": {
         "CONTACT_NAME": "Contact",
         "AGENT_NAME": "Assigned agent",
-        "RATING": "Rating",
+        "RATING": "درجہ بندی",
         "FEEDBACK_TEXT": "Feedback comment"
       }
     },
@@ -420,19 +420,19 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
       "LOADING_MESSAGE": "Loading conversation metrics...",
-      "OPEN": "Open",
+      "OPEN": "کھولیں۔",
       "UNATTENDED": "Unattended",
-      "UNASSIGNED": "Unassigned"
+      "UNASSIGNED": "نا مقرر کیا ہوا"
     },
     "AGENT_CONVERSATIONS": {
       "HEADER": "Conversations by agents",
       "LOADING_MESSAGE": "Loading agent metrics...",
       "NO_AGENTS": "There are no conversations by agents",
       "TABLE_HEADER": {
-        "AGENT": "Agent",
+        "AGENT": "ایجنٹ",
         "OPEN": "OPEN",
         "UNATTENDED": "Unattended",
-        "STATUS": "Status"
+        "STATUS": "اسٹیٹس"
       }
     },
     "AGENT_STATUS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/resetPassword.json b/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
index bb678e809..1008b3ab0 100644
--- a/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur/resetPassword.json
@@ -1,6 +1,6 @@
 {
   "RESET_PASSWORD": {
-    "TITLE": "Reset Password",
+    "TITLE": "پاس ورڈ دوبارہ مرتب کریں",
     "EMAIL": {
       "LABEL": "Email",
       "PLACEHOLDER": "Please enter your email",
@@ -8,8 +8,8 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Password reset link has been sent to your email",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "جمع کرائیں"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
index ec2d94744..1fafb2a96 100644
--- a/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/ur/setNewPassword.json
@@ -13,11 +13,11 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Successfully changed the password",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
     },
     "CAPTCHA": {
       "ERROR": "Verification expired. Please solve captcha again."
     },
-    "SUBMIT": "Submit"
+    "SUBMIT": "جمع کرائیں"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index 00a18d8ed..fad2a9db1 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -136,11 +136,11 @@
       "SHOW_LESS": "Show Less"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "ڈاؤن لوڈ کریں",
       "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "جمع کرائیں"
     }
   },
   "CONFIRM_EMAIL": "Verifying...",
@@ -152,17 +152,17 @@
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Currently viewing:",
     "SWITCH": "Switch",
-    "CONVERSATIONS": "Conversations",
+    "CONVERSATIONS": "مکالمات",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "تذکرہ",
     "REPORTS": "Reports",
     "SETTINGS": "Settings",
-    "CONTACTS": "Contacts",
+    "CONTACTS": "کانٹیکٹس",
     "HOME": "Home",
-    "AGENTS": "Agents",
+    "AGENTS": "ایجنٹ",
     "INBOXES": "Inboxes",
     "NOTIFICATIONS": "Notifications",
-    "CANNED_RESPONSES": "Canned Responses",
+    "CANNED_RESPONSES": "محفوظ کردہ جوابات",
     "INTEGRATIONS": "Integrations",
     "PROFILE_SETTINGS": "Profile Settings",
     "ACCOUNT_SETTINGS": "Account Settings",
@@ -178,14 +178,14 @@
     "NEW_LABEL": "New label",
     "NEW_TEAM": "New team",
     "NEW_INBOX": "New inbox",
-    "REPORTS_CONVERSATION": "Conversations",
+    "REPORTS_CONVERSATION": "مکالمات",
     "CSAT": "CSAT",
     "CAMPAIGNS": "Campaigns",
     "ONGOING": "Ongoing",
     "ONE_OFF": "One off",
-    "REPORTS_AGENT": "Agents",
+    "REPORTS_AGENT": "ایجنٹ",
     "REPORTS_LABEL": "Labels",
-    "REPORTS_INBOX": "Inbox",
+    "REPORTS_INBOX": "ان باکس",
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
@@ -198,14 +198,14 @@
     "API": {
       "SUCCESS_MESSAGE": "Account created successfully",
       "EXIST_MESSAGE": "Account already exists",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
     },
     "FORM": {
       "NAME": {
         "LABEL": "Account Name",
         "PLACEHOLDER": "Wayne Enterprises"
       },
-      "SUBMIT": "Submit"
+      "SUBMIT": "جمع کرائیں"
     }
   },
   "KEYBOARD_SHORTCUTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ur/signup.json b/app/javascript/dashboard/i18n/locale/ur/signup.json
index 8dd5c0d4e..ca5b5eceb 100644
--- a/app/javascript/dashboard/i18n/locale/ur/signup.json
+++ b/app/javascript/dashboard/i18n/locale/ur/signup.json
@@ -31,9 +31,9 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Registration Successfull",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
     },
-    "SUBMIT": "Submit",
+    "SUBMIT": "جمع کرائیں",
     "HAVE_AN_ACCOUNT": "Already have an account?"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json
index f9ecaaaae..34ca8d2a8 100644
--- a/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/teamsSettings.json
@@ -69,7 +69,7 @@
     },
     "AGENTS": {
       "AGENT": "AGENT",
-      "EMAIL": "EMAIL",
+      "EMAIL": "ای میل",
       "BUTTON_TEXT": "Add agents",
       "ADD_AGENTS": "Adding Agents to your Team...",
       "SELECT": "select",
@@ -91,7 +91,7 @@
       "BUTTON_TEXT": "Finish"
     },
     "DELETE": {
-      "BUTTON_TEXT": "Delete",
+      "BUTTON_TEXT": "حذف کریں۔",
       "API": {
         "SUCCESS_MESSAGE": "Team deleted successfully.",
         "ERROR_MESSAGE": "Couldn't delete the team. Try again."
@@ -101,7 +101,7 @@
         "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"
+        "NO": "منسوخ کریں۔"
       }
     },
     "SETTINGS": "Settings",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ur_IN/advancedFilters.json
new file mode 100644
index 000000000..46a573c42
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/agentMgmt.json
new file mode 100644
index 000000000..0f965c717
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
new file mode 100644
index 000000000..ff4904c34
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/attributesMgmt.json
@@ -0,0 +1,99 @@
+{
+  "ATTRIBUTES_MGMT": {
+    "HEADER": "Custom Attributes",
+    "HEADER_BTN_TXT": "Add Custom Attribute",
+    "LOADING": "Fetching custom attributes",
+    "SIDEBAR_TXT": "<p><b>Custom Attributes</b> <p>A custom attribute tracks facts about your contacts/conversation — like the subscription plan, or when they ordered the first item etc. <br /><br />For creating a Custom Attribute, just click on the <b>Add Custom Attribute.</b> You can also edit or delete an existing  Custom Attribute by clicking on the Edit or Delete button.</p>",
+    "ADD": {
+      "TITLE": "Add Custom Attribute",
+      "SUBMIT": "Create",
+      "CANCEL_BUTTON_TEXT": "Cancel",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Display Name",
+          "PLACEHOLDER": "Enter custom attribute display name",
+          "ERROR": "Name is required"
+        },
+        "DESC": {
+          "LABEL": "Description",
+          "PLACEHOLDER": "Enter custom attribute description",
+          "ERROR": "Description is required"
+        },
+        "MODEL": {
+          "LABEL": "Applies to",
+          "PLACEHOLDER": "Please select one",
+          "ERROR": "Model is required"
+        },
+        "TYPE": {
+          "LABEL": "Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Type is required",
+          "LIST": {
+            "LABEL": "List Values",
+            "PLACEHOLDER": "Please enter value and press enter key",
+            "ERROR": "Must have at least one value"
+          }
+        },
+        "KEY": {
+          "LABEL": "Key",
+          "PLACEHOLDER": "Enter custom attribute key",
+          "ERROR": "Key is required",
+          "IN_VALID": "Invalid key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
+        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
+        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+      },
+      "CONFIRM": {
+        "TITLE": "Are you sure want to delete - %{attributeName}",
+        "PLACE_HOLDER": "Please type {attributeName} to confirm",
+        "MESSAGE": "Deleting will remove the custom attribute",
+        "YES": "Delete ",
+        "NO": "Cancel"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Edit Custom Attribute",
+      "UPDATE_BUTTON_TEXT": "Update",
+      "TYPE": {
+        "LIST": {
+          "LABEL": "List Values",
+          "PLACEHOLDER": "Please enter values and press enter key"
+        }
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
+        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+      }
+    },
+    "TABS": {
+      "HEADER": "Custom Attributes",
+      "CONVERSATION": "Conversation",
+      "CONTACT": "Contact"
+    },
+    "LIST": {
+      "TABLE_HEADER": [
+        "Name",
+        "Description",
+        "Type",
+        "Key"
+      ],
+      "BUTTONS": {
+        "EDIT": "Edit",
+        "DELETE": "Delete"
+      },
+      "EMPTY_RESULT": {
+        "404": "There are no custom attributes created",
+        "NOT_FOUND": "There are no custom attributes configured"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/automation.json b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json
new file mode 100644
index 000000000..5d291814e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/automation.json
@@ -0,0 +1,116 @@
+{
+  "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"
+    },
+    "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": "Succesfully Uploaded",
+      "LABEL_UPLOAD_FAILED": "Upload Failed"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/campaign.json b/app/javascript/dashboard/i18n/locale/ur_IN/campaign.json
new file mode 100644
index 000000000..bbcc463ee
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/cannedMgmt.json
new file mode 100644
index 000000000..9c14f5a52
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/chatlist.json b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
new file mode 100644
index 000000000..e3d637b71
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
@@ -0,0 +1,87 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "Fetching conversations",
+    "LOAD_MORE_CONVERSATIONS": "Load more conversations",
+    "EOF": "All conversations loaded 🎉",
+    "LIST": {
+      "404": "There are no active conversations in this group."
+    },
+    "TAB_HEADING": "Conversations",
+    "MENTION_HEADING": "Mentions",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "FILTER_ALL": "All",
+    "STATUS_TABS": [
+      {
+        "NAME": "Open",
+        "KEY": "openCount"
+      },
+      {
+        "NAME": "Resolved",
+        "KEY": "allConvCount"
+      }
+    ],
+    "ASSIGNEE_TYPE_TABS": [
+      {
+        "NAME": "Mine",
+        "KEY": "me",
+        "COUNT_KEY": "mineCount"
+      },
+      {
+        "NAME": "Unassigned",
+        "KEY": "unassigned",
+        "COUNT_KEY": "unAssignedCount"
+      },
+      {
+        "NAME": "All",
+        "KEY": "all",
+        "COUNT_KEY": "allCount"
+      }
+    ],
+    "CHAT_STATUS_FILTER_ITEMS": {
+      "open": {
+        "TEXT": "Open"
+      },
+      "resolved": {
+        "TEXT": "Resolved"
+      },
+      "pending": {
+        "TEXT": "Pending"
+      },
+      "snoozed": {
+        "TEXT": "Snoozed"
+      }
+    },
+    "ATTACHMENTS": {
+      "image": {
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "CONTENT": "has shared a url"
+      }
+    },
+    "RECEIVED_VIA_EMAIL": "Received via email",
+    "VIEW_TWEET_IN_TWITTER": "View tweet in Twitter",
+    "REPLY_TO_TWEET": "Reply to this tweet",
+    "LINK_TO_STORY": "Go to instagram story",
+    "SENT": "Sent 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/ur_IN/contact.json b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
new file mode 100644
index 000000000..2257b4573
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contact.json
@@ -0,0 +1,338 @@
+{
+  "CONTACT_PANEL": {
+    "NOT_AVAILABLE": "Not Available",
+    "EMAIL_ADDRESS": "Email Address",
+    "PHONE_NUMBER": "Phone number",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "COMPANY": "Company",
+    "LOCATION": "Location",
+    "CONVERSATION_TITLE": "Conversation Details",
+    "VIEW_PROFILE": "View Profile",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "IP_ADDRESS": "IP Address",
+    "NEW_MESSAGE": "New message",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "CONTACT": {
+        "TITLE": "Contact Labels",
+        "ERROR": "Couldn't update labels"
+      },
+      "CONVERSATION": {
+        "TITLE": "Conversation Labels",
+        "ADD_BUTTON": "Add Labels"
+      },
+      "LABEL_SELECT": {
+        "TITLE": "Add Labels",
+        "PLACEHOLDER": "Search labels",
+        "NO_RESULT": "No labels found"
+      }
+    },
+    "MERGE_CONTACT": "Merge contact",
+    "CONTACT_ACTIONS": "Contact actions",
+    "MUTE_CONTACT": "Mute Conversation",
+    "UNMUTE_CONTACT": "Unmute Conversation",
+    "MUTED_SUCCESS": "This conversation is muted for 6 hours",
+    "UNMUTED_SUCCESS": "This conversation is unmuted",
+    "SEND_TRANSCRIPT": "Send Transcript",
+    "EDIT_LABEL": "Edit",
+    "SIDEBAR_SECTIONS": {
+      "CUSTOM_ATTRIBUTES": "Custom Attributes",
+      "CONTACT_LABELS": "Contact Labels",
+      "PREVIOUS_CONVERSATIONS": "Previous Conversations"
+    }
+  },
+  "EDIT_CONTACT": {
+    "BUTTON_LABEL": "Edit Contact",
+    "TITLE": "Edit contact",
+    "DESC": "Edit contact details"
+  },
+  "CREATE_CONTACT": {
+    "BUTTON_LABEL": "New Contact",
+    "TITLE": "Create new contact",
+    "DESC": "Add basic information details about the contact."
+  },
+  "IMPORT_CONTACTS": {
+    "BUTTON_LABEL": "Import",
+    "TITLE": "Import Contacts",
+    "DESC": "Import contacts through a CSV file.",
+    "DOWNLOAD_LABEL": "Download a sample csv.",
+    "FORM": {
+      "LABEL": "CSV File",
+      "SUBMIT": "Import",
+      "CANCEL": "Cancel"
+    },
+    "SUCCESS_MESSAGE": "Contacts saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "DELETE_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."
+      },
+      "PHONE_NUMBER": {
+        "PLACEHOLDER": "Enter the phone number of the contact",
+        "LABEL": "Phone Number",
+        "HELP": "Phone number should be of E.164 format eg: +1415555555 [+][country code][area code][local phone number]",
+        "ERROR": "Phone number should be either empty or of E.164 format",
+        "DUPLICATE": "This phone number is in use for another contact."
+      },
+      "LOCATION": {
+        "PLACEHOLDER": "Enter the location of the contact",
+        "LABEL": "Location"
+      },
+      "COMPANY_NAME": {
+        "PLACEHOLDER": "Enter the company name",
+        "LABEL": "Company Name"
+      },
+      "SOCIAL_PROFILES": {
+        "FACEBOOK": {
+          "PLACEHOLDER": "Enter the Facebook username",
+          "LABEL": "Facebook"
+        },
+        "TWITTER": {
+          "PLACEHOLDER": "Enter the Twitter username",
+          "LABEL": "Twitter"
+        },
+        "LINKEDIN": {
+          "PLACEHOLDER": "Enter the LinkedIn username",
+          "LABEL": "LinkedIn"
+        },
+        "GITHUB": {
+          "PLACEHOLDER": "Enter the Github username",
+          "LABEL": "Github"
+        }
+      }
+    },
+    "SUCCESS_MESSAGE": "Contact saved successfully",
+    "ERROR_MESSAGE": "There was an error, please try again"
+  },
+  "NEW_CONVERSATION": {
+    "BUTTON_LABEL": "Start conversation",
+    "TITLE": "New conversation",
+    "DESC": "Start a new conversation by sending a new message.",
+    "NO_INBOX": "Couldn't find an inbox to initiate a new conversation with this contact.",
+    "FORM": {
+      "TO": {
+        "LABEL": "To"
+      },
+      "INBOX": {
+        "LABEL": "Inbox",
+        "ERROR": "Select an inbox"
+      },
+      "SUBJECT": {
+        "LABEL": "Subject",
+        "PLACEHOLDER": "Subject",
+        "ERROR": "Subject can't be empty"
+      },
+      "MESSAGE": {
+        "LABEL": "Message",
+        "PLACEHOLDER": "Write your message here",
+        "ERROR": "Message can't be empty"
+      },
+      "SUBMIT": "Send message",
+      "CANCEL": "Cancel",
+      "SUCCESS_MESSAGE": "Message sent!",
+      "GO_TO_CONVERSATION": "View",
+      "ERROR_MESSAGE": "Couldn't send! try again"
+    }
+  },
+  "CONTACTS_PAGE": {
+    "HEADER": "Contacts",
+    "FIELDS": "Contact fields",
+    "SEARCH_BUTTON": "Search",
+    "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
+    "FILTER_CONTACTS": "Filter",
+    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "LIST": {
+      "LOADING_MESSAGE": "Loading contacts...",
+      "404": "No contacts matches your search 🔍",
+      "NO_CONTACTS": "There are no available contacts",
+      "TABLE_HEADER": {
+        "NAME": "Name",
+        "PHONE_NUMBER": "Phone Number",
+        "CONVERSATIONS": "Conversations",
+        "LAST_ACTIVITY": "Last Activity",
+        "COUNTRY": "Country",
+        "CITY": "City",
+        "SOCIAL_PROFILES": "Social Profiles",
+        "COMPANY": "Company",
+        "EMAIL_ADDRESS": "Email Address"
+      },
+      "VIEW_DETAILS": "View details"
+    }
+  },
+  "CONTACT_PROFILE": {
+    "BACK_BUTTON": "Contacts",
+    "LOADING": "Loading contact profile..."
+  },
+  "REMINDER": {
+    "ADD_BUTTON": {
+      "BUTTON": "Add",
+      "TITLE": "Shift + Enter to create a task"
+    },
+    "FOOTER": {
+      "DUE_DATE": "Due date",
+      "LABEL_TITLE": "Set type"
+    }
+  },
+  "NOTES": {
+    "FETCHING_NOTES": "Fetching notes...",
+    "NOT_AVAILABLE": "There are no notes created for this contact",
+    "HEADER": {
+      "TITLE": "Notes"
+    },
+    "LIST": {
+      "LABEL": "added a note"
+    },
+    "ADD": {
+      "BUTTON": "Add",
+      "PLACEHOLDER": "Add a note",
+      "TITLE": "Shift + Enter to create a note"
+    },
+    "CONTENT_HEADER": {
+      "DELETE": "Delete note"
+    }
+  },
+  "EVENTS": {
+    "HEADER": {
+      "TITLE": "Activities"
+    },
+    "BUTTON": {
+      "PILL_BUTTON_NOTES": "notes",
+      "PILL_BUTTON_EVENTS": "events",
+      "PILL_BUTTON_CONVO": "conversations"
+    }
+  },
+  "CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Add attributes",
+    "BUTTON": "Add custom attribute",
+    "NOT_AVAILABLE": "There are no custom attributes available for this contact.",
+    "COPY_SUCCESSFUL": "Copied to clipboard successfully",
+    "ACTIONS": {
+      "COPY": "Copy attribute",
+      "DELETE": "Delete attribute",
+      "EDIT": "Edit attribute"
+    },
+    "ADD": {
+      "TITLE": "Create custom attribute",
+      "DESC": "Add custom information to this contact."
+    },
+    "FORM": {
+      "CREATE": "Add attribute",
+      "CANCEL": "Cancel",
+      "NAME": {
+        "LABEL": "Custom attribute name",
+        "PLACEHOLDER": "Eg: shopify id",
+        "ERROR": "Invalid custom attribute name"
+      },
+      "VALUE": {
+        "LABEL": "Attribute value",
+        "PLACEHOLDER": "Eg: 11901 "
+      },
+      "ADD": {
+        "TITLE": "Create new attribute ",
+        "SUCCESS": "Attribute added successfully",
+        "ERROR": "Unable to add attribute. Please try again later"
+      },
+      "UPDATE": {
+        "SUCCESS": "Attribute updated successfully",
+        "ERROR": "Unable to update attribute. Please try again later"
+      },
+      "DELETE": {
+        "SUCCESS": "Attribute deleted successfully",
+        "ERROR": "Unable to delete attribute. Please try again later"
+      },
+      "ATTRIBUTE_SELECT": {
+        "TITLE": "Add attributes",
+        "PLACEHOLDER": "Search attributes",
+        "NO_RESULT": "No attributes found"
+      },
+      "ATTRIBUTE_TYPE": {
+        "LIST": {
+          "PLACEHOLDER": "Select value",
+          "SEARCH_INPUT_PLACEHOLDER": "Search value",
+          "NO_RESULT": "No result found"
+        }
+      }
+    },
+    "VALIDATIONS": {
+      "REQUIRED": "Valid value is required",
+      "INVALID_URL": "Invalid URL"
+    }
+  },
+  "MERGE_CONTACTS": {
+    "TITLE": "Merge contacts",
+    "DESCRIPTION": "Merge contacts to combine two profiles into one, including all attributes and conversations. In case of conflict, the Primary contact’ s attributes will take precedence.",
+    "PRIMARY": {
+      "TITLE": "Primary contact",
+      "HELP_LABEL": "To be kept"
+    },
+    "CHILD": {
+      "TITLE": "Contact to merge",
+      "PLACEHOLDER": "Search for a contact",
+      "HELP_LABEL": "To be deleted"
+    },
+    "SUMMARY": {
+      "TITLE": "Summary",
+      "DELETE_WARNING": "Contact of <strong>%{childContactName}</strong> will be deleted.",
+      "ATTRIBUTE_WARNING": "Contact details of <strong>%{childContactName}</strong> will be copied to <strong>%{primaryContactName}</strong>."
+    },
+    "SEARCH": {
+      "ERROR": "ERROR_MESSAGE"
+    },
+    "FORM": {
+      "SUBMIT": " Merge contacts",
+      "CANCEL": "Cancel",
+      "CHILD_CONTACT": {
+        "ERROR": "Select a child contact to merge"
+      },
+      "SUCCESS_MESSAGE": "Contact merged successfully",
+      "ERROR_MESSAGE": "Could not merge contacts, try again!"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/contactFilters.json b/app/javascript/dashboard/i18n/locale/ur_IN/contactFilters.json
new file mode 100644
index 000000000..bd58ccf3e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/contactFilters.json
@@ -0,0 +1,49 @@
+{
+    "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"
+        },
+        "GROUPS": {
+            "STANDARD_FILTERS": "Standard Filters",
+            "ADDITIONAL_FILTERS": "Additional Filters",
+            "CUSTOM_ATTRIBUTES": "Custom Attributes"
+        }
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
new file mode 100644
index 000000000..ac25a5aed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -0,0 +1,204 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "NO_MESSAGE_1": "Uh oh! Looks like there are no messages from customers in your inbox.",
+    "NO_MESSAGE_2": " to send a message to your page!",
+    "NO_INBOX_1": "Hola! Looks like you haven't added any inboxes yet.",
+    "NO_INBOX_2": " to get started",
+    "NO_INBOX_AGENT": "Uh Oh! Looks like you are not part of any inbox. Please contact your administrator",
+    "SEARCH_MESSAGES": "Search for messages in conversations",
+    "SEARCH": {
+      "TITLE": "Search messages",
+      "RESULT_TITLE": "Search Results",
+      "LOADING_MESSAGE": "Crunching data...",
+      "PLACEHOLDER": "Type any text to search messages",
+      "NO_MATCHING_RESULTS": "No results found."
+    },
+    "UNREAD_MESSAGES": "Unread Messages",
+    "UNREAD_MESSAGE": "Unread Message",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "CANNOT_REPLY": "You cannot reply due to",
+    "24_HOURS_WINDOW": "24 hour message window restriction",
+    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "ASSIGN_TO_ME": "Assign to me",
+    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hour message window restriction",
+    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "REPLYING_TO": "You are replying to:",
+    "REMOVE_SELECTION": "Remove Selection",
+    "DOWNLOAD": "Download",
+    "UPLOADING_ATTACHMENTS": "Uploading attachments...",
+    "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
+    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "NO_RESPONSE": "No response",
+    "RATING_TITLE": "Rating",
+    "FEEDBACK_TITLE": "Feedback",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN_ACTION": "Open",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details",
+      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+    },
+    "RESOLVE_DROPDOWN": {
+      "MARK_PENDING": "Mark as pending",
+      "SNOOZE": {
+        "TITLE": "Snooze until",
+        "NEXT_REPLY": "Next reply",
+        "TOMORROW": "Tomorrow",
+        "NEXT_WEEK": "Next week"
+      }
+    },
+    "FOOTER": {
+      "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",
+      "ENTER_TO_SEND": "Enter to send",
+      "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"
+        }
+      }
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed",
+    "CHANGE_TEAM": "Conversation team changed",
+    "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "SENT_BY": "Sent by:",
+    "BOT": "Bot",
+    "SEND_FAILED": "Couldn't send message! Try again",
+    "TRY_AGAIN": "retry",
+    "ASSIGNMENT": {
+      "SELECT_AGENT": "Select Agent",
+      "REMOVE": "Remove",
+      "ASSIGN": "Assign"
+    },
+    "CONTEXT_MENU": {
+      "COPY": "Copy",
+      "DELETE": "Delete"
+    }
+  },
+  "EMAIL_TRANSCRIPT": {
+    "TITLE": "Send conversation transcript",
+    "DESC": "Send a copy of the conversation transcript to the specified email address",
+    "SUBMIT": "Submit",
+    "CANCEL": "Cancel",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again",
+    "FORM": {
+      "SEND_TO_CONTACT": "Send the transcript to the customer",
+      "SEND_TO_AGENT": "Send the transcript to the assigned agent",
+      "SEND_TO_OTHER_EMAIL_ADDRESS": "Send the transcript to another email address",
+      "EMAIL": {
+        "PLACEHOLDER": "Enter an email address",
+        "ERROR": "Please enter a valid email address"
+      }
+    }
+  },
+  "ONBOARDING": {
+    "TITLE": "Hey 👋, Welcome to %{installationName}!",
+    "DESCRIPTION": "Thanks for signing up. We want you to get the most out of %{installationName}. Here are a few things you can do in %{installationName} to make the experience delightful.",
+    "READ_LATEST_UPDATES": "Read our latest updates",
+    "ALL_CONVERSATION": {
+      "TITLE": "All your conversations in one place",
+      "DESCRIPTION": "View all the conversations from your customers in one single dashboard. You can filter the conversations by the incoming channel, label and status."
+    },
+    "TEAM_MEMBERS": {
+      "TITLE": "Invite your team members",
+      "DESCRIPTION": "Since you are getting ready to talk to your customer, bring in your teammates to assist you. You can invite your teammates by adding their email addresses to the agent list.",
+      "NEW_LINK": "Click here to invite a team member"
+    },
+    "INBOXES": {
+      "TITLE": "Connect Inboxes",
+      "DESCRIPTION": "Connect various channels through which your customers would be talking to you. It can be a website live-chat, your Facebook or Twitter page or even your WhatsApp number.",
+      "NEW_LINK": "Click here to create an inbox"
+    },
+    "LABELS": {
+      "TITLE": "Organize conversations with labels",
+      "DESCRIPTION": "Labels provide an easier way to categorize your conversation. Create some labels like #support-enquiry, #billing-question etc., so that you can use them in a conversation later.",
+      "NEW_LINK": "Click here to create tags"
+    }
+  },
+  "CONVERSATION_SIDEBAR": {
+    "ASSIGNEE_LABEL": "Assigned Agent",
+    "SELF_ASSIGN": "Assign to me",
+    "TEAM_LABEL": "Assigned Team",
+    "SELECT": {
+      "PLACEHOLDER": "None"
+    },
+    "ACCORDION": {
+      "CONTACT_DETAILS": "Contact Details",
+      "CONVERSATION_ACTIONS": "Conversation Actions",
+      "CONVERSATION_LABELS": "Conversation Labels",
+      "CONVERSATION_INFO": "Conversation Information",
+      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "PREVIOUS_CONVERSATION": "Previous Conversations"
+    }
+  },
+  "CONVERSATION_CUSTOM_ATTRIBUTES": {
+    "ADD_BUTTON_TEXT": "Create attribute",
+    "UPDATE": {
+      "SUCCESS": "Attribute updated successfully",
+      "ERROR": "Unable to update attribute. Please try again later"
+    },
+    "ADD": {
+      "TITLE": "Add",
+      "SUCCESS": "Attribute added successfully",
+      "ERROR": "Unable to add attribute. Please try again later"
+    },
+    "DELETE": {
+      "SUCCESS": "Attribute deleted successfully",
+      "ERROR": "Unable to delete attribute. Please try again later"
+    },
+    "ATTRIBUTE_SELECT": {
+      "TITLE": "Add attributes",
+      "PLACEHOLDER": "Search attributes",
+      "NO_RESULT": "No attributes found"
+    }
+  },
+  "EMAIL_HEADER": {
+    "FROM": "From",
+    "TO": "To",
+    "BCC": "Bcc",
+    "CC": "Cc",
+    "SUBJECT": "Subject"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/csatMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/csatMgmt.json
new file mode 100644
index 000000000..d7d2efc2a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/csatMgmt.json
@@ -0,0 +1,6 @@
+{
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "PLACEHOLDER": "Tell us more..."
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
new file mode 100644
index 000000000..5a0c4f7d7
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/generalSettings.json
@@ -0,0 +1,140 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Account settings",
+    "SUBMIT": "Update settings",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Could not update settings, try again!",
+      "SUCCESS": "Successfully updated account settings"
+    },
+    "FORM": {
+      "ERROR": "Please fix form errors",
+      "GENERAL_SECTION": {
+        "TITLE": "General settings",
+        "NOTE": ""
+      },
+      "ACCOUNT_ID": {
+        "TITLE": "Account ID",
+        "NOTE": "This ID is required if you are building an API based integration"
+      },
+      "NAME": {
+        "LABEL": "Account name",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": "Please enter a valid account name"
+      },
+      "LANGUAGE": {
+        "LABEL": "Site language (Beta)",
+        "PLACEHOLDER": "Your account name",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Incoming Email Domain",
+        "PLACEHOLDER": "The domain where you will receive the emails",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "AUTO_RESOLVE_DURATION": {
+        "LABEL": "Number of days after a ticket should auto resolve if there is no activity",
+        "PLACEHOLDER": "30",
+        "ERROR": "Please enter a valid auto resolve duration (minimum 1 day and maximum 999 days)"
+      },
+      "FEATURES": {
+        "INBOUND_EMAIL_ENABLED": "Conversation continuity with emails is enabled for your account.",
+        "CUSTOM_EMAIL_DOMAIN_ENABLED": "You can receive emails in your custom domain now."
+      }
+    },
+    "UPDATE_CHATWOOT": "An update %{latestChatwootVersion} for Chatwoot is available. Please update your instance.",
+    "LEARN_MORE": "Learn more"
+  },
+  "FORMS": {
+    "MULTISELECT": {
+      "ENTER_TO_SELECT": "Press enter to select",
+      "ENTER_TO_REMOVE": "Press enter to remove",
+      "SELECT_ONE": "Select one"
+    }
+  },
+  "NOTIFICATIONS_PAGE": {
+    "HEADER": "Notifications",
+    "MARK_ALL_DONE": "Mark All Done",
+    "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",
+      "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"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
new file mode 100644
index 000000000..e9ee9c5b8
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/inboxMgmt.json
@@ -0,0 +1,543 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inboxes",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> When you connect a website or a facebook Page to Chatwoot, it is called an <b>Inbox</b>. You can have unlimited inboxes in your Chatwoot account. </p><p> Click on <b>Add Inbox</b> to connect a website or a Facebook Page. </p><p> In the Dashboard, you can see all the conversations from all your inboxes in a single place and respond to them under the `Conversations` tab. </p><p> You can also see conversations specific to an inbox by clicking on the inbox name on the left pane of the dashboard. </p>",
+    "LIST": {
+      "404": "There are no inboxes attached to this account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Choose Channel",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Create Inbox",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Add Agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "You are all set to go!"
+      }
+    ],
+    "ADD": {
+      "CHANNEL_NAME": {
+        "LABEL": "Inbox Name",
+        "PLACEHOLDER": "Enter your inbox name (eg: Acme Inc)"
+      },
+      "WEBSITE_NAME": {
+        "LABEL": "Website Name",
+        "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+      },
+      "FB": {
+        "HELP": "PS: By signing in, we only get access to your Page's messages. Your private messages can never be accessed by Chatwoot.",
+        "CHOOSE_PAGE": "Choose Page",
+        "CHOOSE_PLACEHOLDER": "Select a page from the list",
+        "INBOX_NAME": "Inbox Name",
+        "ADD_NAME": "Add a name for your inbox",
+        "PICK_NAME": "Pick A Name Your Inbox",
+        "PICK_A_VALUE": "Pick a value"
+      },
+      "TWITTER": {
+        "HELP": "To add your Twitter profile as a channel, you need to authenticate your Twitter Profile by clicking on 'Sign in with Twitter' ",
+        "ERROR_MESSAGE": "There was an error connecting to Twitter, please try again",
+        "TWEETS": {
+          "ENABLE": "Create conversations from mentioned Tweets"
+        }
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Website channel",
+        "DESC": "Create a channel for your website and start supporting your customers via our website widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "PLACEHOLDER": "Enter your Webhook URL",
+          "ERROR": "Please enter a valid URL"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Website Domain",
+          "PLACEHOLDER": "Enter your website domain (eg: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Welcome Heading",
+          "PLACEHOLDER": "Hi there !"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Welcome Tagline",
+          "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc typically replies in a few hours."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "REPLY_TIME": {
+          "TITLE": "Set Reply time",
+          "IN_A_FEW_MINUTES": "In a few minutes",
+          "IN_A_FEW_HOURS": "In a few hours",
+          "IN_A_DAY": "In a day",
+          "HELP_TEXT": "This reply time will be displayed on the live chat widget"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget Color",
+          "PLACEHOLDER": "Update the widget color used in widget"
+        },
+        "SUBMIT_BUTTON": "Create inbox"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/WhatsApp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or WhatsApp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Account SID",
+          "PLACEHOLDER": "Please enter your Twilio Account SID",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Please enter your Twilio Auth Token",
+          "ERROR": "This field is required"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter a inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Create Twilio Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to authenticate Twilio credentials, please try again"
+        }
+      },
+      "SMS": {
+        "TITLE": "SMS Channel",
+        "DESC": "Start supporting your customers via SMS.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "BANDWIDTH": "Bandwidth"
+        },
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the SMS channel"
+        },
+        "BANDWIDTH": {
+          "ACCOUNT_ID": {
+            "LABEL": "Account ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Account ID",
+            "ERROR": "This field is required"
+          },
+          "API_KEY": {
+            "LABEL": "API Key",
+            "PLACEHOLDER": "Please enter your Bandwith API Key",
+            "ERROR": "This field is required"
+          },
+          "API_SECRET": {
+            "LABEL": "API Secret",
+            "PLACEHOLDER": "Please enter your Bandwith API Secret",
+            "ERROR": "This field is required"
+          },
+          "APPLICATION_ID": {
+            "LABEL": "Application ID",
+            "PLACEHOLDER": "Please enter your Bandwidth Application ID",
+            "ERROR": "This field is required"
+          },
+          "INBOX_NAME": {
+            "LABEL": "Inbox Name",
+            "PLACEHOLDER": "Please enter a inbox name",
+            "ERROR": "This field is required"
+          },
+          "PHONE_NUMBER": {
+            "LABEL": "Phone number",
+            "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+            "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+          },
+          "SUBMIT_BUTTON": "Create Bandwidth Channel",
+          "API": {
+            "ERROR_MESSAGE": "We were not able to authenticate Bandwidth credentials, please try again"
+          },
+          "API_CALLBACK": {
+            "TITLE": "Callback URL",
+            "SUBTITLE": "You have to configure the message callback URL in Bandwidth with the URL mentioned here."
+          }
+        }
+      },
+      "WHATSAPP": {
+        "TITLE": "WhatsApp Channel",
+        "DESC": "Start supporting your customers via WhatsApp.",
+        "PROVIDERS": {
+          "LABEL": "API Provider",
+          "TWILIO": "Twilio",
+          "360_DIALOG": "360Dialog"
+        },
+        "INBOX_NAME": {
+          "LABEL": "Inbox Name",
+          "PLACEHOLDER": "Please enter an inbox name",
+          "ERROR": "This field is required"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Phone number",
+          "PLACEHOLDER": "Please enter the phone number from which message will be sent.",
+          "ERROR": "Please enter a valid value. Phone number should start with `+` sign."
+        },
+        "API_KEY": {
+          "LABEL": "API key",
+          "SUBTITLE": "Configure the WhatsApp API key.",
+          "PLACEHOLDER": "API key",
+          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
+          "ERROR": "Please enter a valid value."
+        },
+        "SUBMIT_BUTTON": "Create WhatsApp Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the WhatsApp channel"
+        }
+      },
+      "API_CHANNEL": {
+        "TITLE": "API Channel",
+        "DESC": "Integrate with API channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "WEBHOOK_URL": {
+          "LABEL": "Webhook URL",
+          "SUBTITLE": "Configure the URL where you want to recieve callbacks on events.",
+          "PLACEHOLDER": "Webhook URL"
+        },
+        "SUBMIT_BUTTON": "Create API Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the api channel"
+        }
+      },
+      "EMAIL_CHANNEL": {
+        "TITLE": "Email Channel",
+        "DESC": "Integrate you email inbox.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "EMAIL": {
+          "LABEL": "Email",
+          "SUBTITLE": "Email where your customers sends you support tickets",
+          "PLACEHOLDER": "Email"
+        },
+        "SUBMIT_BUTTON": "Create Email Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the email channel"
+        },
+        "FINISH_MESSAGE": "Start forwarding your emails to the following email address."
+      },
+      "LINE_CHANNEL": {
+        "TITLE": "LINE Channel",
+        "DESC": "Integrate with LINE channel and start supporting your customers.",
+        "CHANNEL_NAME": {
+          "LABEL": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel name",
+          "ERROR": "This field is required"
+        },
+        "LINE_CHANNEL_ID": {
+          "LABEL": "LINE Channel ID",
+          "PLACEHOLDER": "LINE Channel ID"
+        },
+        "LINE_CHANNEL_SECRET": {
+          "LABEL": "LINE Channel Secret",
+          "PLACEHOLDER": "LINE Channel Secret"
+        },
+        "LINE_CHANNEL_TOKEN": {
+          "LABEL": "LINE Channel Token",
+          "PLACEHOLDER": "LINE Channel Token"
+        },
+        "SUBMIT_BUTTON": "Create LINE Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the LINE channel"
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the webhook URL in LINE application with the URL mentioned here."
+        }
+      },
+      "TELEGRAM_CHANNEL": {
+        "TITLE": "Telegram Channel",
+        "DESC": "Integrate with Telegram channel and start supporting your customers.",
+        "BOT_TOKEN": {
+          "LABEL": "Bot Token",
+          "SUBTITLE": "Configure the bot token you have obtained from Telegram BotFather.",
+          "PLACEHOLDER": "Bot Token"
+        },
+        "SUBMIT_BUTTON": "Create Telegram Channel",
+        "API": {
+          "ERROR_MESSAGE": "We were not able to save the telegram channel"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Choose a channel",
+        "DESC": "Chatwoot supports live-chat widget, Facebook page, Twitter profile, WhatsApp, Email etc., as channels. If you want to build a custom channel, you can create it using the API channel. Select one channel from the options below to proceed."
+      },
+      "AGENTS": {
+        "TITLE": "Agents",
+        "DESC": "Here you can add agents to manage your newly created inbox. Only these selected agents will have access to your inbox. Agents which are not part of this inbox will not be able to see or respond to messages in this inbox when they login. <br> <b>PS:</b> As an administrator, if you need access to all inboxes, you should add yourself as agent to all inboxes that you create.",
+        "VALIDATION_ERROR": "Add atleast one agent to your new Inbox",
+        "PICK_AGENTS": "Pick agents for the inbox"
+      },
+      "DETAILS": {
+        "TITLE": "Inbox Details",
+        "DESC": "From the dropdown below, select the Facebook Page you want to connect to Chatwoot. You can also give a custom name to your inbox for better identification."
+      },
+      "FINISH": {
+        "TITLE": "Nailed It!",
+        "DESC": "You have successfully finished integrating your Facebook Page with Chatwoot. Next time a customer messages your Page, the conversation will automatically appear on your inbox.<br>We are also providing you with a widget script that you can easily add to your website. Once this is live on your website, customers can message you right from your website without the help of any external tool and the conversation will appear right here, on Chatwoot.<br>Cool, huh? Well, we sure try to be :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Authenticating you with Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Creating your Inbox...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Add agents",
+      "ADD_AGENTS": "Adding Agents to your Inbox..."
+    },
+    "FINISH": {
+      "TITLE": "Your Inbox is ready!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "BUTTON_TEXT": "Take me there",
+      "MORE_SETTINGS": "More settings",
+      "WEBSITE_SUCCESS": "You have successfully finished creating a website channel. Copy the code shown below and paste it on your website. Next time a customer use the live chat, the conversation will automatically appear on your inbox."
+    },
+    "REAUTH": "Reauthorize",
+    "VIEW": "View",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Auto assignment updated successfully",
+        "ERROR_MESSAGE": "Could not update widget color. Please try again later."
+      },
+      "EMAIL_COLLECT_BOX": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CSAT": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ALLOW_MESSAGES_AFTER_RESOLVED": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_CONTINUITY_VIA_EMAIL": {
+        "ENABLED": "Enabled",
+        "DISABLED": "Disabled"
+      },
+      "ENABLE_HMAC": {
+        "LABEL": "Enable"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "AVATAR_DELETE_BUTTON_TEXT": "Delete Avatar",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "PLACE_HOLDER": "Please type {inboxName} to confirm",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later.",
+        "AVATAR_SUCCESS_MESSAGE": "Inbox avatar deleted successfully",
+        "AVATAR_ERROR_MESSAGE": "Could not delete the inbox avatar. Please try again later."
+      }
+    },
+    "TABS": {
+      "SETTINGS": "Settings",
+      "COLLABORATORS": "Collaborators",
+      "CONFIGURATION": "Configuration",
+      "CAMPAIGN": "Campaigns",
+      "PRE_CHAT_FORM": "Pre Chat Form",
+      "BUSINESS_HOURS": "Business Hours"
+    },
+    "SETTINGS": "Settings",
+    "FEATURES": {
+      "LABEL": "Features",
+      "DISPLAY_FILE_PICKER": "Display file picker on the widget",
+      "DISPLAY_EMOJI_PICKER": "Display emoji picker on the widget",
+      "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.",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox.",
+      "HMAC_VERIFICATION": "User Identity Validation",
+      "HMAC_DESCRIPTION": "Inorder to validate the user's identity, the SDK allows you to pass an `identifier_hash` for each user. You can generate HMAC using 'sha256' with the key shown here.",
+      "HMAC_MANDATORY_VERIFICATION": "Enforce User Identity Validation",
+      "HMAC_MANDATORY_DESCRIPTION": "If enabled, Chatwoot SDKs setUser method will not work unless the `identifier_hash` is provided for each user.",
+      "INBOX_IDENTIFIER": "Inbox Identifier",
+      "INBOX_IDENTIFIER_SUB_TEXT": "Use the `inbox_identifier` token shown here to authentication your API clients.",
+      "FORWARD_EMAIL_TITLE": "Forward to Email",
+      "FORWARD_EMAIL_SUB_TEXT": "Start forwarding your emails to the following email address.",
+      "ALLOW_MESSAGES_AFTER_RESOLVED": "Allow messages after conversation resolved",
+      "ALLOW_MESSAGES_AFTER_RESOLVED_SUB_TEXT": "Allow the end-users to send messages even after the conversation is resolved."
+    },
+    "FACEBOOK_REAUTHORIZE": {
+      "TITLE": "Reauthorize",
+      "SUBTITLE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services",
+      "MESSAGE_SUCCESS": "Reconnection successful",
+      "MESSAGE_ERROR": "There was an error, please try again"
+    },
+    "PRE_CHAT_FORM": {
+      "DESCRIPTION": "Pre chat forms enable you to capture user information before they start conversation with you.",
+      "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"
+    },
+    "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: "
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/integrationApps.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrationApps.json
new file mode 100644
index 000000000..a80ecb837
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/integrations.json b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
new file mode 100644
index 000000000..774514a9d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/integrations.json
@@ -0,0 +1,89 @@
+{
+  "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"
+          }
+        },
+        "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>"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ur_IN/labelsMgmt.json
new file mode 100644
index 000000000..db12fa32a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/login.json b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Login to Chatwoot",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Email eg: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Login Successful",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later",
+      "UNAUTH": "Username / Password Incorrect. Please try again"
+    },
+    "FORGOT_PASSWORD": "Forgot your password?",
+    "CREATE_NEW_ACCOUNT": "Create new account",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/report.json b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
new file mode 100644
index 000000000..566099afe
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
@@ -0,0 +1,445 @@
+{
+  "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",
+    "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.",
+    "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"
+    },
+    "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"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json b/app/javascript/dashboard/i18n/locale/ur_IN/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ur_IN/setNewPassword.json
new file mode 100644
index 000000000..ec2d94744
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
new file mode 100644
index 000000000..00a18d8ed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -0,0 +1,236 @@
+{
+  "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."
+      },
+      "MESSAGE_SIGNATURE_SECTION": {
+        "TITLE": "Personal message signature",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "BTN_TEXT": "Save message signature",
+        "API_ERROR": "Couldn't save signature! Try again",
+        "API_SUCCESS": "Signature saved successfully"
+      },
+      "MESSAGE_SIGNATURE": {
+        "LABEL": "Message Signature",
+        "ERROR": "Message Signature cannot be empty",
+        "PLACEHOLDER": "Insert your personal message signature here."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices.",
+        "BTN_TEXT": "Change password"
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "AUDIO_NOTIFICATIONS_SECTION": {
+        "TITLE": "Audio Notifications",
+        "NOTE": "Enable audio notifications in dashboard for new messages and conversations.",
+        "NONE": "None",
+        "ASSIGNED": "Assigned Conversations",
+        "ALL_CONVERSATIONS": "All Conversations"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Email Notifications",
+        "NOTE": "Update your email notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send email notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send email notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send email notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send email notifications when a new message is created in an assigned conversation"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
+        "UPDATE_ERROR": "There is an error while updating the preferences, please try again"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Push Notifications",
+        "NOTE": "Update your push notification preferences here",
+        "CONVERSATION_ASSIGNMENT": "Send push notifications when a conversation is assigned to me",
+        "CONVERSATION_CREATION": "Send push notifications when a new conversation is created",
+        "CONVERSATION_MENTION": "Send push notifications when you are mentioned in a conversation",
+        "ASSIGNED_CONVERSATION_NEW_MESSAGE": "Send push notifications when a new message is created in an assigned conversation",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your full name",
+        "ERROR": "Please enter a valid full name",
+        "PLACEHOLDER": "Please enter your full name"
+      },
+      "DISPLAY_NAME": {
+        "LABEL": "Display name",
+        "ERROR": "Please enter a valid display name",
+        "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          "Online",
+          "Busy",
+          "Offline"
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Your email address",
+        "ERROR": "Please enter a valid email address",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "CURRENT_PASSWORD": {
+        "LABEL": "Current password",
+        "ERROR": "Please enter the current password",
+        "PLACEHOLDER": "Please enter the current password"
+      },
+      "PASSWORD": {
+        "LABEL": "New password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your new password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_AVAILABILITY_STATUS": "Change",
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "CONTACT_SUPPORT": "Contact Support",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "KEYBOARD_SHORTCUTS": "Keyboard Shortcuts",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now",
+    "DELETED_USER": "Deleted User"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "SHOW_MORE_BLOCK": {
+      "SHOW_MORE": "Show More",
+      "SHOW_LESS": "Show Less"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "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",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "CONTACTS": "Contacts",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "NOTIFICATIONS": "Notifications",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "APPLICATIONS": "Applications",
+    "LABELS": "Labels",
+    "CUSTOM_ATTRIBUTES": "Custom Attributes",
+    "AUTOMATION": "Automation",
+    "TEAMS": "Teams",
+    "CUSTOM_VIEWS_FOLDER": "Folders",
+    "CUSTOM_VIEWS_SEGMENTS": "Segments",
+    "ALL_CONTACTS": "All Contacts",
+    "TAGGED_WITH": "Tagged with",
+    "NEW_LABEL": "New label",
+    "NEW_TEAM": "New team",
+    "NEW_INBOX": "New inbox",
+    "REPORTS_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"
+  },
+  "CREATE_ACCOUNT": {
+    "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
+    "NEW_ACCOUNT": "New Account",
+    "SELECTOR_SUBTITLE": "Create a new account",
+    "API": {
+      "SUCCESS_MESSAGE": "Account created successfully",
+      "EXIST_MESSAGE": "Account already exists",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Account Name",
+        "PLACEHOLDER": "Wayne Enterprises"
+      },
+      "SUBMIT": "Submit"
+    }
+  },
+  "KEYBOARD_SHORTCUTS": {
+    "TITLE": {
+      "OPEN_CONVERSATION": "Open conversation",
+      "RESOLVE_AND_NEXT": "Resolve and move to next",
+      "NAVIGATE_DROPDOWN": "Navigate dropdown items",
+      "RESOLVE_CONVERSATION": "Resolve Conversation",
+      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
+      "ADD_ATTACHMENT": "Add Attachment",
+      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "TOGGLE_SIDEBAR": "Toggle Sidebar",
+      "GO_TO_REPORTS_SIDEBAR": "Go to Reports sidebar",
+      "MOVE_TO_NEXT_TAB": "Move to next tab in conversation list",
+      "GO_TO_SETTINGS": "Go to Settings",
+      "SWITCH_CONVERSATION_STATUS": "Switch to the next conversation status",
+      "SWITCH_TO_PRIVATE_NOTE": "Switch to Private Note",
+      "TOGGLE_RICH_CONTENT_EDITOR": "Toggle Rich Content editor",
+      "SWITCH_TO_REPLY": "Switch to Reply",
+      "TOGGLE_SNOOZE_DROPDOWN": "Toggle snooze dropdown"
+    },
+    "KEYS": {
+      "WINDOWS_KEY_AND_COMMAND_KEY": "Win / ⌘",
+      "ALT_OR_OPTION_KEY": "Alt / ⌥",
+      "FORWARD_SLASH_KEY": "/"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/signup.json b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
new file mode 100644
index 000000000..8dd5c0d4e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/signup.json
@@ -0,0 +1,39 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Register an account",
+    "TITLE": "Register",
+    "TERMS_ACCEPT": "By signing up, you agree to our <a href=\"https://www.chatwoot.com/terms\">T & C</a> and <a href=\"https://www.chatwoot.com/privacy-policy\">Privacy policy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Account name",
+      "PLACEHOLDER": "Enter an account name. eg: Wayne Enterprises",
+      "ERROR": "Account name is too short"
+    },
+    "FULL_NAME": {
+      "LABEL": "Full name",
+      "PLACEHOLDER": "Enter your full name. eg: Bruce Wayne",
+      "ERROR": "Full name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Work email",
+      "PLACEHOLDER": "Enter your work email address. eg: bruce@wayne.enterprises",
+      "ERROR": "Email address is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short",
+      "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": "Submit",
+    "HAVE_AN_ACCOUNT": "Already have an account?"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ur_IN/teamsSettings.json
new file mode 100644
index 000000000..f9ecaaaae
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/ur_IN/webhooks.json b/app/javascript/dashboard/i18n/locale/ur_IN/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
index 93d9fb2e3..fb51c9ea9 100644
--- a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Đã cập nhật thành công bài tập tự động",
         "ERROR_MESSAGE": "Không thể cập nhật màu tiện ích. Vui lòng thử lại sau."
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "Bật",
-        "DISABLED": "Không bật"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "Bật",
         "DISABLED": "Không bật"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "Đặt nút này bên trong thẻ body của bạn",
       "INBOX_AGENTS": "Nhà cung cấp",
       "INBOX_AGENTS_SUB_TEXT": "Thêm hoặc xóa tác nhân khỏi hộp thư đến này",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "Cập nhật",
       "ENABLE_EMAIL_COLLECT_BOX": "Bật hộp thu thập email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Bật hoặc tắt hộp thu thập email trên cuộc trò chuyện mới",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
index 8af6a47a9..6e11b666c 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "自动分配成功更新",
         "ERROR_MESSAGE": "无法更新部件颜色。请稍后再试。"
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "已启用",
-        "DISABLED": "已禁用"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "已启用",
         "DISABLED": "已禁用"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "将此按钮放置在窗体标签中",
       "INBOX_AGENTS": "客服代理们",
       "INBOX_AGENTS_SUB_TEXT": "添加或删除此收件箱中的客服",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "更新",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
index 99d36a2d8..33f939139 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/inboxMgmt.json
@@ -341,10 +341,6 @@
         "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "自動分配成功更新",
         "ERROR_MESSAGE": "無法更新元件顏色。請稍後再試。"
       },
-      "AUTO_ASSIGNMENT": {
-        "ENABLED": "已啟用",
-        "DISABLED": "已停用"
-      },
       "EMAIL_COLLECT_BOX": {
         "ENABLED": "已啟用",
         "DISABLED": "已停用"
@@ -402,6 +398,8 @@
       "MESSENGER_SUB_HEAD": "將此按鈕放置在視窗標籤中",
       "INBOX_AGENTS": "客服",
       "INBOX_AGENTS_SUB_TEXT": "新增或刪除此收件匣中的客服",
+      "AGENT_ASSIGNMENT": "Conversation Assignment",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
       "UPDATE": "更新",
       "ENABLE_EMAIL_COLLECT_BOX": "Enable email collect box",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Enable or disable email collect box on new conversation",
diff --git a/app/javascript/survey/i18n/locale/ur.json b/app/javascript/survey/i18n/locale/ur.json
index 2473f114e..152b6c7c1 100644
--- a/app/javascript/survey/i18n/locale/ur.json
+++ b/app/javascript/survey/i18n/locale/ur.json
@@ -12,7 +12,7 @@
     },
     "API": {
       "SUCCESS_MESSAGE": "Survey updated successfully",
-      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+      "ERROR_MESSAGE": "ووٹ سرور کے ساتھ رابطہ ممکن نہی ہوسکا ، براہ کرم کچھ دیر بعد کوشش کریں"
     }
   },
   "POWERED_BY": "Powered by Chatwoot"
diff --git a/app/javascript/survey/i18n/locale/ur_IN.json b/app/javascript/survey/i18n/locale/ur_IN.json
new file mode 100644
index 000000000..2473f114e
--- /dev/null
+++ b/app/javascript/survey/i18n/locale/ur_IN.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/ur.json b/app/javascript/widget/i18n/locale/ur.json
index ef4149191..a721235fe 100644
--- a/app/javascript/widget/i18n/locale/ur.json
+++ b/app/javascript/widget/i18n/locale/ur.json
@@ -1,11 +1,11 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Download",
+      "DOWNLOAD": "ڈاؤن لوڈ کریں",
       "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "جمع کرائیں"
     },
     "MESSAGE_BUBBLE": {
       "RETRY": "Send message again",
@@ -47,7 +47,7 @@
         "REQUIRED_ERROR": "Full Name is required"
       },
       "EMAIL_ADDRESS": {
-        "LABEL": "Email Address",
+        "LABEL": "ای میل اڈریس",
         "PLACEHOLDER": "Please enter your email address",
         "REQUIRED_ERROR": "Email Address is required",
         "VALID_ERROR": "Please enter a valid email address"
diff --git a/app/javascript/widget/i18n/locale/ur_IN.json b/app/javascript/widget/i18n/locale/ur_IN.json
new file mode 100644
index 000000000..ef4149191
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ur_IN.json
@@ -0,0 +1,86 @@
+{
+  "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"
+  },
+  "FILE_SIZE_LIMIT": "File exceeds the {MAXIMUM_FILE_UPLOAD_SIZE} attachment limit",
+  "CHAT_FORM": {
+    "INVALID": {
+      "FIELD": "Invalid field"
+    }
+  },
+  "CSAT": {
+    "TITLE": "Rate your conversation",
+    "SUBMITTED_TITLE": "Thank you for submitting the rating",
+    "PLACEHOLDER": "Tell us more..."
+  },
+  "EMAIL_TRANSCRIPT": {
+    "BUTTON_TEXT": "Request a conversation transcript",
+    "SEND_EMAIL_SUCCESS": "The chat transcript was sent successfully",
+    "SEND_EMAIL_ERROR": "There was an error, please try again"
+  }
+}
diff --git a/config/locales/devise.ur_IN.yml b/config/locales/devise.ur_IN.yml
new file mode 100644
index 000000000..48a1f8396
--- /dev/null
+++ b/config/locales/devise.ur_IN.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ur:
+  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/ur_IN.yml b/config/locales/ur_IN.yml
new file mode 100644
index 000000000..65c47be7d
--- /dev/null
+++ b/config/locales/ur_IN.yml
@@ -0,0 +1,108 @@
+#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.
+ur:
+  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:
+    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
+    contacts:
+      import:
+        failed: File is blank
+  reports:
+    period: Reporting period %{since} to %{until}
+    agent_csv:
+      agent_name: Agent name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    team_csv:
+      team_name: Team name
+      conversations_count: Conversations count
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    default_group_by: day
+  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: "
+      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}>'
+      email_subject: "New messages on this conversation"
+      transcript_subject: "Conversation Transcript"
+    survey:
+      response: "Please rate this conversation, %{link}"
+  contacts:
+    online:
+      delete: "%{contact_name} is Online, please try again later"
+  integration_apps:
+    slack:
+      name: "Slack"
+      description: "Slack is a chat tool that brings all your communication together in one place. By integrating Slack, you can get notified of all the new conversations in your account right inside your Slack."
+    webhooks:
+      name: "Webhooks"
+      description: "Webhook events provide you the realtime information about what's happening in your account. You can make use of the webhooks to communicate the events to your favourite apps like Slack or Github. Click on Configure to set up your webhooks."
+    dialogflow:
+      name: "Dialogflow"
+      description: "Build chatbots using Dialogflow and connect them to your inbox quickly. Let the bots handle the queries before handing them off to a customer service agent."
+    fullcontact:
+      name: "Fullcontact"
+      description: "FullContact integration helps to enrich visitor profiles. Identify the users as soon as they share their email address and offer them tailored customer service. Connect your FullContact to your account by sharing the FullContact API Key."

From 2060f270d3b6b8149ba6062e2a25327484c9264c Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Fri, 13 May 2022 17:26:26 +0530
Subject: [PATCH 112/177] Bump version to 2.5.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 d370e1d74..1ea45235d 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.4.1'
+  version: '2.5.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index 8bfdaf74a..d418d0b68 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue} --fix",

From 45e2cd4903c0697f6d7c37a1714da2aa69ce8ffb Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 16 May 2022 11:29:05 +0530
Subject: [PATCH 113/177] fix: Render links with target attribute (#4685)

---
 app/javascript/packs/application.js               |  4 +++-
 app/javascript/packs/widget.js                    |  3 ++-
 app/javascript/shared/helpers/HTMLSanitizer.js    | 12 ++++++++++++
 app/javascript/shared/helpers/MessageFormatter.js |  6 ++----
 package.json                                      |  2 +-
 yarn.lock                                         |  8 ++++----
 6 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index b0e081f98..184c7c6df 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -39,6 +39,7 @@ import {
 } from '../dashboard/helper/scriptHelpers';
 import FluentIcon from 'shared/components/FluentIcon/DashboardIcon';
 import VueDOMPurifyHTML from 'vue-dompurify-html';
+import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 
 Vue.config.env = process.env;
 
@@ -55,7 +56,8 @@ if (window.analyticsConfig) {
     api_host: window.analyticsConfig.host,
   });
 }
-Vue.use(VueDOMPurifyHTML);
+
+Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 Vue.use(VueRouter);
 Vue.use(VueI18n);
 Vue.use(WootUiKit);
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index 3b9661bc7..6eab2db8b 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -9,9 +9,10 @@ import ActionCableConnector from '../widget/helpers/actionCable';
 import i18n from '../widget/i18n';
 import { isPhoneE164OrEmpty } from 'shared/helpers/Validators';
 import router from '../widget/router';
+import { domPurifyConfig } from '../shared/helpers/HTMLSanitizer';
 Vue.use(VueI18n);
 Vue.use(Vuelidate);
-Vue.use(VueDOMPurifyHTML);
+Vue.use(VueDOMPurifyHTML, domPurifyConfig);
 
 const i18nConfig = new VueI18n({
   locale: 'en',
diff --git a/app/javascript/shared/helpers/HTMLSanitizer.js b/app/javascript/shared/helpers/HTMLSanitizer.js
index b119b3681..889948c0b 100644
--- a/app/javascript/shared/helpers/HTMLSanitizer.js
+++ b/app/javascript/shared/helpers/HTMLSanitizer.js
@@ -6,3 +6,15 @@ export const escapeHtml = (unsafe = '') => {
     .replace(/"/g, '&quot;')
     .replace(/'/g, '&#039;');
 };
+
+export const afterSanitizeAttributes = currentNode => {
+  if ('target' in currentNode) {
+    currentNode.setAttribute('target', '_blank');
+  }
+};
+
+export const domPurifyConfig = {
+  hooks: {
+    afterSanitizeAttributes,
+  },
+};
diff --git a/app/javascript/shared/helpers/MessageFormatter.js b/app/javascript/shared/helpers/MessageFormatter.js
index 260436da4..c4d0bb62e 100644
--- a/app/javascript/shared/helpers/MessageFormatter.js
+++ b/app/javascript/shared/helpers/MessageFormatter.js
@@ -1,6 +1,6 @@
 import { marked } from 'marked';
 import DOMPurify from 'dompurify';
-import { escapeHtml } from './HTMLSanitizer';
+import { escapeHtml, afterSanitizeAttributes } from './HTMLSanitizer';
 
 const TWITTER_USERNAME_REGEX = /(^|[^@\w])@(\w{1,15})\b/g;
 const TWITTER_USERNAME_REPLACEMENT =
@@ -48,9 +48,7 @@ class MessageFormatter {
       const markedDownOutput = marked(withHash);
       return markedDownOutput;
     }
-    DOMPurify.addHook('afterSanitizeAttributes', node => {
-      if ('target' in node) node.setAttribute('target', '_blank');
-    });
+    DOMPurify.addHook('afterSanitizeAttributes', afterSanitizeAttributes);
     return DOMPurify.sanitize(
       marked(this.message, { breaks: true, gfm: true })
     );
diff --git a/package.json b/package.json
index d418d0b68..f862e0fbe 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "vue-chartjs": "3.5.1",
     "vue-clickaway": "~2.1.0",
     "vue-color": "2.8.1",
-    "vue-dompurify-html": "^2.5.1",
+    "vue-dompurify-html": "^2.5.2",
     "vue-easytable": "2.5.5",
     "vue-i18n": "8.24.3",
     "vue-loader": "15.9.6",
diff --git a/yarn.lock b/yarn.lock
index 82d266618..fa46ddb37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15284,10 +15284,10 @@ vue-docgen-loader@^1.5.0:
     loader-utils "^1.2.3"
     querystring "^0.2.0"
 
-vue-dompurify-html@^2.5.1:
-  version "2.5.1"
-  resolved "https://registry.npmjs.org/vue-dompurify-html/-/vue-dompurify-html-2.5.1.tgz#a754f4ac7b18eb8fe41f461cb2bb1c4956a9bd2d"
-  integrity sha512-B8rQj2jAPJJhtKHHa6jg5B3/RoKBmmUl/awP/GxWXGu75j4Y7+MHqv0DG52v0Uz0taEpHyZun34KEYMAfrPWnA==
+vue-dompurify-html@^2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/vue-dompurify-html/-/vue-dompurify-html-2.5.2.tgz#f547d4eacae4640f95eb0e9308e7ef8e223887c6"
+  integrity sha512-G6I135+BhlACJ9xftqK7fvhXyjNrgHCI594qHnUW5e2Bmp8BOTV1kz7cxwI37b4BJnHkj9IY10RwMPOtJqw+pw==
   dependencies:
     dompurify "^2.3.4"
 

From f620bdec542eba61f60f800516df8e06d154ac4d Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 16 May 2022 12:45:45 +0530
Subject: [PATCH 114/177] chore: Update translations (#4682)

---
 app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json | 4 ++--
 app/javascript/dashboard/i18n/locale/ar/settings.json  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
index da5e213e9..2b590b411 100644
--- a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "ضع هذا الكود داخل وسم الـ body في موقعك",
       "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": "تمكين أو تعطيل مربع جمع البريد الإلكتروني في محادثة جديدة",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 45ea1db14..9b779f25c 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -151,7 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "مشاهدة حاليا:",
-    "SWITCH": "Switch",
+    "SWITCH": "تبديل",
     "CONVERSATIONS": "المحادثات",
     "ALL_CONVERSATIONS": "كل المحادثات",
     "MENTIONED_CONVERSATIONS": "الإشارات",

From 938fb887c4269ff3eb25afe1222e6196da5fb5b6 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 16 May 2022 13:59:59 +0530
Subject: [PATCH 115/177] feat: Portal endpoint (#4633)

---
 .../{kbase => }/categories_controller.rb      |   7 +-
 .../api/v1/accounts/kbase/base_controller.rb  |   9 --
 .../{kbase => }/portals_controller.rb         |  10 +-
 app/models/account.rb                         |   6 +-
 app/models/{kbase => }/article.rb             |   4 +-
 app/models/{kbase => }/category.rb            |   7 +-
 app/models/{kbase => }/folder.rb              |   4 +-
 app/models/{kbase => }/portal.rb              |   8 +-
 app/models/user.rb                            |   1 +
 .../categories/_category.json.jbuilder        |   0
 .../categories/create.json.jbuilder           |   0
 .../categories/index.json.jbuilder            |   0
 .../categories/update.json.jbuilder           |   0
 .../accounts/portals}/_portal.json.jbuilder   |   1 +
 .../{kbase => }/portals/create.json.jbuilder  |   0
 .../{kbase => }/portals/index.json.jbuilder   |   0
 .../{kbase => }/portals/show.json.jbuilder    |   0
 .../{kbase => }/portals/update.json.jbuilder  |   0
 .../{kbase => }/_category.json.jbuilder       |   0
 .../api/v1/models}/_portal.json.jbuilder      |   0
 config/routes.rb                              |  13 +-
 ...6061540_change_kbase_portals_to_portals.rb |   5 +
 ...64938_create_portals_members_join_table.rb |   9 ++
 ...7_change_kbase_categories_to_categories.rb |   5 +
 ...6080338_change_kbase_folders_to_folders.rb |   5 +
 ...80429_change_kbase_articles_to_articles.rb |   5 +
 ...0511072655_add_archive_column_to_portal.rb |   5 +
 db/schema.rb                                  | 112 ++++++++++--------
 .../{kbase => }/categories_controller_spec.rb |  34 +++---
 .../{kbase => }/portals_controller_spec.rb    |  58 ++++++---
 spec/factories/{kbase => }/articles.rb        |   2 +-
 spec/factories/{kbase => }/categories.rb      |   4 +-
 spec/factories/{kbase => }/folders.rb         |   2 +-
 spec/factories/{kbase => }/portals.rb         |   2 +-
 spec/models/account_spec.rb                   |   4 +-
 spec/models/{kbase => }/article_spec.rb       |   2 +-
 spec/models/{kbase => }/category_spec.rb      |   2 +-
 spec/models/{kbase => }/folder_spec.rb        |   2 +-
 spec/models/{kbase => }/portal_spec.rb        |   2 +-
 39 files changed, 198 insertions(+), 132 deletions(-)
 rename app/controllers/api/v1/accounts/{kbase => }/categories_controller.rb (72%)
 delete mode 100644 app/controllers/api/v1/accounts/kbase/base_controller.rb
 rename app/controllers/api/v1/accounts/{kbase => }/portals_controller.rb (58%)
 rename app/models/{kbase => }/article.rb (92%)
 rename app/models/{kbase => }/category.rb (79%)
 rename app/models/{kbase => }/folder.rb (87%)
 rename app/models/{kbase => }/portal.rb (80%)
 rename app/views/api/v1/accounts/{kbase => }/categories/_category.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/categories/create.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/categories/index.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/categories/update.json.jbuilder (100%)
 rename app/views/{public/api/v1/models/kbase => api/v1/accounts/portals}/_portal.json.jbuilder (89%)
 rename app/views/api/v1/accounts/{kbase => }/portals/create.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/portals/index.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/portals/show.json.jbuilder (100%)
 rename app/views/api/v1/accounts/{kbase => }/portals/update.json.jbuilder (100%)
 rename app/views/public/api/v1/models/{kbase => }/_category.json.jbuilder (100%)
 rename app/views/{api/v1/accounts/kbase/portals => public/api/v1/models}/_portal.json.jbuilder (100%)
 create mode 100644 db/migrate/20220506061540_change_kbase_portals_to_portals.rb
 create mode 100644 db/migrate/20220506064938_create_portals_members_join_table.rb
 create mode 100644 db/migrate/20220506072007_change_kbase_categories_to_categories.rb
 create mode 100644 db/migrate/20220506080338_change_kbase_folders_to_folders.rb
 create mode 100644 db/migrate/20220506080429_change_kbase_articles_to_articles.rb
 create mode 100644 db/migrate/20220511072655_add_archive_column_to_portal.rb
 rename spec/controllers/api/v1/accounts/{kbase => }/categories_controller_spec.rb (61%)
 rename spec/controllers/api/v1/accounts/{kbase => }/portals_controller_spec.rb (60%)
 rename spec/factories/{kbase => }/articles.rb (81%)
 rename spec/factories/{kbase => }/categories.rb (70%)
 rename spec/factories/{kbase => }/folders.rb (71%)
 rename spec/factories/{kbase => }/portals.rb (66%)
 rename spec/models/{kbase => }/article_spec.rb (91%)
 rename spec/models/{kbase => }/category_spec.rb (89%)
 rename spec/models/{kbase => }/folder_spec.rb (90%)
 rename spec/models/{kbase => }/portal_spec.rb (90%)

diff --git a/app/controllers/api/v1/accounts/kbase/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
similarity index 72%
rename from app/controllers/api/v1/accounts/kbase/categories_controller.rb
rename to app/controllers/api/v1/accounts/categories_controller.rb
index a40053dd2..246eeb2a2 100644
--- a/app/controllers/api/v1/accounts/kbase/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -1,4 +1,5 @@
-class Api::V1::Accounts::Kbase::CategoriesController < Api::V1::Accounts::Kbase::BaseController
+class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseController
+  before_action :portal
   before_action :fetch_category, except: [:index, :create]
 
   def index
@@ -24,6 +25,10 @@ class Api::V1::Accounts::Kbase::CategoriesController < Api::V1::Accounts::Kbase:
     @category = @portal.categories.find(params[:id])
   end
 
+  def portal
+    @portal ||= Current.account.portals.find_by(slug: params[:portal_id])
+  end
+
   def category_params
     params.require(:category).permit(
       :name, :description, :position
diff --git a/app/controllers/api/v1/accounts/kbase/base_controller.rb b/app/controllers/api/v1/accounts/kbase/base_controller.rb
deleted file mode 100644
index 4f62cd858..000000000
--- a/app/controllers/api/v1/accounts/kbase/base_controller.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Api::V1::Accounts::Kbase::BaseController < Api::V1::Accounts::BaseController
-  before_action :portal
-
-  private
-
-  def portal
-    @portal ||= Current.account.kbase_portals.find_by(slug: params[:portal_id])
-  end
-end
diff --git a/app/controllers/api/v1/accounts/kbase/portals_controller.rb b/app/controllers/api/v1/accounts/portals_controller.rb
similarity index 58%
rename from app/controllers/api/v1/accounts/kbase/portals_controller.rb
rename to app/controllers/api/v1/accounts/portals_controller.rb
index 5ec1b4a83..75ffc35e9 100644
--- a/app/controllers/api/v1/accounts/kbase/portals_controller.rb
+++ b/app/controllers/api/v1/accounts/portals_controller.rb
@@ -1,14 +1,14 @@
-class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::BaseController
+class Api::V1::Accounts::PortalsController < Api::V1::Accounts::BaseController
   before_action :fetch_portal, except: [:index, :create]
 
   def index
-    @portals = Current.account.kbase_portals
+    @portals = Current.account.portals
   end
 
   def show; end
 
   def create
-    @portal = Current.account.kbase_portals.create!(portal_params)
+    @portal = Current.account.portals.create!(portal_params)
   end
 
   def update
@@ -23,7 +23,7 @@ class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::BaseContr
   private
 
   def fetch_portal
-    @portal = Current.account.kbase_portals.find_by(slug: permitted_params[:id])
+    @portal = Current.account.portals.find_by(slug: permitted_params[:id])
   end
 
   def permitted_params
@@ -32,7 +32,7 @@ class Api::V1::Accounts::Kbase::PortalsController < Api::V1::Accounts::BaseContr
 
   def portal_params
     params.require(:portal).permit(
-      :account_id, :color, :custom_domain, :header_text, :homepage_link, :name, :page_title, :slug
+      :account_id, :color, :custom_domain, :header_text, :homepage_link, :name, :page_title, :slug, :archived
     )
   end
 end
diff --git a/app/models/account.rb b/app/models/account.rb
index 22aeefcaf..b14887957 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -51,9 +51,9 @@ class Account < ApplicationRecord
   has_many :facebook_pages, dependent: :destroy_async, class_name: '::Channel::FacebookPage'
   has_many :hooks, dependent: :destroy_async, class_name: 'Integrations::Hook'
   has_many :inboxes, dependent: :destroy_async
-  has_many :kbase_articles, dependent: :destroy_async, class_name: '::Kbase::Article'
-  has_many :kbase_categories, dependent: :destroy_async, class_name: '::Kbase::Category'
-  has_many :kbase_portals, dependent: :destroy_async, class_name: '::Kbase::Portal'
+  has_many :articles, dependent: :destroy_async, class_name: '::Article'
+  has_many :categories, dependent: :destroy_async, class_name: '::Category'
+  has_many :portals, dependent: :destroy_async, class_name: '::Portal'
   has_many :labels, dependent: :destroy_async
   has_many :line_channels, dependent: :destroy_async, class_name: '::Channel::Line'
   has_many :mentions, dependent: :destroy_async
diff --git a/app/models/kbase/article.rb b/app/models/article.rb
similarity index 92%
rename from app/models/kbase/article.rb
rename to app/models/article.rb
index 0f14f6709..750e3a4fd 100644
--- a/app/models/kbase/article.rb
+++ b/app/models/article.rb
@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: kbase_articles
+# Table name: articles
 #
 #  id          :bigint           not null, primary key
 #  content     :text
@@ -16,7 +16,7 @@
 #  folder_id   :integer
 #  portal_id   :integer          not null
 #
-class Kbase::Article < ApplicationRecord
+class Article < ApplicationRecord
   belongs_to :account
   belongs_to :category
   belongs_to :portal
diff --git a/app/models/kbase/category.rb b/app/models/category.rb
similarity index 79%
rename from app/models/kbase/category.rb
rename to app/models/category.rb
index d2b270306..2fb5815f2 100644
--- a/app/models/kbase/category.rb
+++ b/app/models/category.rb
@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: kbase_categories
+# Table name: categories
 #
 #  id          :bigint           not null, primary key
 #  description :text
@@ -14,9 +14,10 @@
 #
 # Indexes
 #
-#  index_kbase_categories_on_locale_and_account_id  (locale,account_id)
+#  index_categories_on_locale                 (locale)
+#  index_categories_on_locale_and_account_id  (locale,account_id)
 #
-class Kbase::Category < ApplicationRecord
+class Category < ApplicationRecord
   belongs_to :account
   belongs_to :portal
   has_many :folders, dependent: :destroy_async
diff --git a/app/models/kbase/folder.rb b/app/models/folder.rb
similarity index 87%
rename from app/models/kbase/folder.rb
rename to app/models/folder.rb
index 887522b5d..315d1f340 100644
--- a/app/models/kbase/folder.rb
+++ b/app/models/folder.rb
@@ -1,6 +1,6 @@
 # == Schema Information
 #
-# Table name: kbase_folders
+# Table name: folders
 #
 #  id          :bigint           not null, primary key
 #  name        :string
@@ -9,7 +9,7 @@
 #  account_id  :integer          not null
 #  category_id :integer          not null
 #
-class Kbase::Folder < ApplicationRecord
+class Folder < ApplicationRecord
   belongs_to :account
   belongs_to :category
   has_many :articles, dependent: :nullify
diff --git a/app/models/kbase/portal.rb b/app/models/portal.rb
similarity index 80%
rename from app/models/kbase/portal.rb
rename to app/models/portal.rb
index c381e5c46..8774820be 100644
--- a/app/models/kbase/portal.rb
+++ b/app/models/portal.rb
@@ -1,8 +1,9 @@
 # == Schema Information
 #
-# Table name: kbase_portals
+# Table name: portals
 #
 #  id            :bigint           not null, primary key
+#  archived      :boolean          default(FALSE)
 #  color         :string
 #  config        :jsonb
 #  custom_domain :string
@@ -17,13 +18,14 @@
 #
 # Indexes
 #
-#  index_kbase_portals_on_slug  (slug) UNIQUE
+#  index_portals_on_slug  (slug) UNIQUE
 #
-class Kbase::Portal < ApplicationRecord
+class Portal < ApplicationRecord
   belongs_to :account
   has_many :categories, dependent: :destroy_async
   has_many :folders,  through: :categories
   has_many :articles, dependent: :destroy_async
+  has_many :users, through: :portals_members
 
   validates :account_id, presence: true
   validates :name, presence: true
diff --git a/app/models/user.rb b/app/models/user.rb
index 3b7a74672..6c3349473 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -90,6 +90,7 @@ class User < ApplicationRecord
   has_many :notifications, dependent: :destroy_async
   has_many :team_members, dependent: :destroy_async
   has_many :teams, through: :team_members
+  has_many :portals, through: :portals_members
 
   before_validation :set_password_and_uid, on: :create
 
diff --git a/app/views/api/v1/accounts/kbase/categories/_category.json.jbuilder b/app/views/api/v1/accounts/categories/_category.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/categories/_category.json.jbuilder
rename to app/views/api/v1/accounts/categories/_category.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/categories/create.json.jbuilder b/app/views/api/v1/accounts/categories/create.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/categories/create.json.jbuilder
rename to app/views/api/v1/accounts/categories/create.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/categories/index.json.jbuilder b/app/views/api/v1/accounts/categories/index.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/categories/index.json.jbuilder
rename to app/views/api/v1/accounts/categories/index.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/categories/update.json.jbuilder b/app/views/api/v1/accounts/categories/update.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/categories/update.json.jbuilder
rename to app/views/api/v1/accounts/categories/update.json.jbuilder
diff --git a/app/views/public/api/v1/models/kbase/_portal.json.jbuilder b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
similarity index 89%
rename from app/views/public/api/v1/models/kbase/_portal.json.jbuilder
rename to app/views/api/v1/accounts/portals/_portal.json.jbuilder
index d612f5265..1f828d4ad 100644
--- a/app/views/public/api/v1/models/kbase/_portal.json.jbuilder
+++ b/app/views/api/v1/accounts/portals/_portal.json.jbuilder
@@ -6,4 +6,5 @@ json.homepage_link portal.homepage_link
 json.name portal.name
 json.page_title portal.page_title
 json.slug portal.slug
+json.archived portal.archived
 json.config portal.config
diff --git a/app/views/api/v1/accounts/kbase/portals/create.json.jbuilder b/app/views/api/v1/accounts/portals/create.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/portals/create.json.jbuilder
rename to app/views/api/v1/accounts/portals/create.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/portals/index.json.jbuilder b/app/views/api/v1/accounts/portals/index.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/portals/index.json.jbuilder
rename to app/views/api/v1/accounts/portals/index.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/portals/show.json.jbuilder b/app/views/api/v1/accounts/portals/show.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/portals/show.json.jbuilder
rename to app/views/api/v1/accounts/portals/show.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/portals/update.json.jbuilder b/app/views/api/v1/accounts/portals/update.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/portals/update.json.jbuilder
rename to app/views/api/v1/accounts/portals/update.json.jbuilder
diff --git a/app/views/public/api/v1/models/kbase/_category.json.jbuilder b/app/views/public/api/v1/models/_category.json.jbuilder
similarity index 100%
rename from app/views/public/api/v1/models/kbase/_category.json.jbuilder
rename to app/views/public/api/v1/models/_category.json.jbuilder
diff --git a/app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder b/app/views/public/api/v1/models/_portal.json.jbuilder
similarity index 100%
rename from app/views/api/v1/accounts/kbase/portals/_portal.json.jbuilder
rename to app/views/public/api/v1/models/_portal.json.jbuilder
diff --git a/config/routes.rb b/config/routes.rb
index 7ed667160..aa23be1e7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -154,14 +154,15 @@ Rails.application.routes.draw do
           end
           resources :working_hours, only: [:update]
 
-          namespace :kbase do
-            resources :portals do
-              resources :categories do
-                resources :folders
-              end
-              resources :articles
+          resources :portals do
+            member do
+              post :archive
+            end
+            resources :categories do
+              resources :folders
             end
           end
+          resources :articles
         end
       end
       # end of account scoped api routes
diff --git a/db/migrate/20220506061540_change_kbase_portals_to_portals.rb b/db/migrate/20220506061540_change_kbase_portals_to_portals.rb
new file mode 100644
index 000000000..c9765abbb
--- /dev/null
+++ b/db/migrate/20220506061540_change_kbase_portals_to_portals.rb
@@ -0,0 +1,5 @@
+class ChangeKbasePortalsToPortals < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :kbase_portals, :portals
+  end
+end
diff --git a/db/migrate/20220506064938_create_portals_members_join_table.rb b/db/migrate/20220506064938_create_portals_members_join_table.rb
new file mode 100644
index 000000000..a24bb7356
--- /dev/null
+++ b/db/migrate/20220506064938_create_portals_members_join_table.rb
@@ -0,0 +1,9 @@
+class CreatePortalsMembersJoinTable < ActiveRecord::Migration[6.1]
+  def change
+    create_join_table :portals, :users, table_name: :portals_members do |t|
+      t.index :portal_id
+      t.index :user_id
+      t.index [:portal_id, :user_id], unique: true
+    end
+  end
+end
diff --git a/db/migrate/20220506072007_change_kbase_categories_to_categories.rb b/db/migrate/20220506072007_change_kbase_categories_to_categories.rb
new file mode 100644
index 000000000..b527e3e80
--- /dev/null
+++ b/db/migrate/20220506072007_change_kbase_categories_to_categories.rb
@@ -0,0 +1,5 @@
+class ChangeKbaseCategoriesToCategories < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :kbase_categories, :categories
+  end
+end
diff --git a/db/migrate/20220506080338_change_kbase_folders_to_folders.rb b/db/migrate/20220506080338_change_kbase_folders_to_folders.rb
new file mode 100644
index 000000000..8e0ba6642
--- /dev/null
+++ b/db/migrate/20220506080338_change_kbase_folders_to_folders.rb
@@ -0,0 +1,5 @@
+class ChangeKbaseFoldersToFolders < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :kbase_folders, :folders
+  end
+end
diff --git a/db/migrate/20220506080429_change_kbase_articles_to_articles.rb b/db/migrate/20220506080429_change_kbase_articles_to_articles.rb
new file mode 100644
index 000000000..ba041ca84
--- /dev/null
+++ b/db/migrate/20220506080429_change_kbase_articles_to_articles.rb
@@ -0,0 +1,5 @@
+class ChangeKbaseArticlesToArticles < ActiveRecord::Migration[6.1]
+  def change
+    rename_table :kbase_articles, :articles
+  end
+end
diff --git a/db/migrate/20220511072655_add_archive_column_to_portal.rb b/db/migrate/20220511072655_add_archive_column_to_portal.rb
new file mode 100644
index 000000000..b3a504e97
--- /dev/null
+++ b/db/migrate/20220511072655_add_archive_column_to_portal.rb
@@ -0,0 +1,5 @@
+class AddArchiveColumnToPortal < ActiveRecord::Migration[6.1]
+  def change
+    add_column :portals, :archived, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 157e2ac2f..32f7dbefb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_05_06_163839) do
+ActiveRecord::Schema.define(version: 2022_05_11_072655) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -111,6 +111,21 @@ ActiveRecord::Schema.define(version: 2022_05_06_163839) do
     t.index ["account_id"], name: "index_agent_bots_on_account_id"
   end
 
+  create_table "articles", force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "portal_id", null: false
+    t.integer "category_id"
+    t.integer "folder_id"
+    t.integer "author_id"
+    t.string "title"
+    t.text "description"
+    t.text "content"
+    t.integer "status"
+    t.integer "views"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "attachments", id: :serial, force: :cascade do |t|
     t.integer "file_type", default: 0
     t.string "external_url"
@@ -169,6 +184,19 @@ ActiveRecord::Schema.define(version: 2022_05_06_163839) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "categories", force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "portal_id", null: false
+    t.string "name"
+    t.text "description"
+    t.integer "position"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.string "locale", default: "en"
+    t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
+    t.index ["locale"], name: "index_categories_on_locale"
+  end
+
   create_table "channel_api", force: :cascade do |t|
     t.integer "account_id", null: false
     t.string "webhook_url"
@@ -434,6 +462,14 @@ ActiveRecord::Schema.define(version: 2022_05_06_163839) do
     t.index ["name", "account_id"], name: "index_email_templates_on_name_and_account_id", unique: true
   end
 
+  create_table "folders", force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.integer "category_id", null: false
+    t.string "name"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "inbox_members", id: :serial, force: :cascade do |t|
     t.integer "user_id", null: false
     t.integer "inbox_id", null: false
@@ -486,56 +522,6 @@ ActiveRecord::Schema.define(version: 2022_05_06_163839) do
     t.jsonb "settings", default: {}
   end
 
-  create_table "kbase_articles", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "portal_id", null: false
-    t.integer "category_id"
-    t.integer "folder_id"
-    t.integer "author_id"
-    t.string "title"
-    t.text "description"
-    t.text "content"
-    t.integer "status"
-    t.integer "views"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "kbase_categories", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "portal_id", null: false
-    t.string "name"
-    t.text "description"
-    t.integer "position"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.string "locale", default: "en"
-    t.index ["locale", "account_id"], name: "index_kbase_categories_on_locale_and_account_id"
-  end
-
-  create_table "kbase_folders", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.integer "category_id", null: false
-    t.string "name"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-  end
-
-  create_table "kbase_portals", force: :cascade do |t|
-    t.integer "account_id", null: false
-    t.string "name", null: false
-    t.string "slug", null: false
-    t.string "custom_domain"
-    t.string "color"
-    t.string "homepage_link"
-    t.string "page_title"
-    t.text "header_text"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
-    t.jsonb "config", default: {"allowed_locales"=>["en"]}
-    t.index ["slug"], name: "index_kbase_portals_on_slug", unique: true
-  end
-
   create_table "labels", force: :cascade do |t|
     t.string "title"
     t.text "description"
@@ -653,6 +639,30 @@ ActiveRecord::Schema.define(version: 2022_05_06_163839) do
     t.datetime "updated_at", precision: 6, null: false
   end
 
+  create_table "portals", force: :cascade do |t|
+    t.integer "account_id", null: false
+    t.string "name", null: false
+    t.string "slug", null: false
+    t.string "custom_domain"
+    t.string "color"
+    t.string "homepage_link"
+    t.string "page_title"
+    t.text "header_text"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.jsonb "config", default: {"allowed_locales"=>["en"]}
+    t.boolean "archived", default: false
+    t.index ["slug"], name: "index_portals_on_slug", unique: true
+  end
+
+  create_table "portals_members", id: false, force: :cascade do |t|
+    t.bigint "portal_id", null: false
+    t.bigint "user_id", null: false
+    t.index ["portal_id", "user_id"], name: "index_portals_members_on_portal_id_and_user_id", unique: true
+    t.index ["portal_id"], name: "index_portals_members_on_portal_id"
+    t.index ["user_id"], name: "index_portals_members_on_user_id"
+  end
+
   create_table "reporting_events", force: :cascade do |t|
     t.string "name"
     t.float "value"
diff --git a/spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
similarity index 61%
rename from spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb
rename to spec/controllers/api/v1/accounts/categories_controller_spec.rb
index 4d98cd898..a1b767166 100644
--- a/spec/controllers/api/v1/accounts/kbase/categories_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
@@ -1,15 +1,15 @@
 require 'rails_helper'
 
-RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
+RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let!(:portal) { create(:kbase_portal, name: 'test_portal', account_id: account.id) }
-  let!(:category) { create(:kbase_category, name: 'category', portal: portal, account_id: account.id) }
+  let!(:portal) { create(:portal, name: 'test_portal', account_id: account.id) }
+  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id) }
 
-  describe 'POST /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories' do
+  describe 'POST /api/v1/accounts/{account.id}/portals/{portal.slug}/categories' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories", params: {}
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -23,7 +23,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
             position: 1
           }
         }
-        post "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories",
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
              params: category_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
@@ -33,10 +33,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
     end
   end
 
-  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories/{category.id}' do
+  describe 'PUT /api/v1/accounts/{account.id}/portals/{portal.slug}/categories/{category.id}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}", params: {}
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories/#{category.id}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -53,7 +53,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
 
         expect(category.name).not_to eql(category_params[:category][:name])
 
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}",
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories/#{category.id}",
             params: category_params,
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
@@ -63,39 +63,39 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Categories', type: :request do
     end
   end
 
-  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories/{category.id}' do
+  describe 'DELETE /api/v1/accounts/{account.id}/portals/{portal.slug}/categories/{category.id}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}", params: {}
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories/#{category.id}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'deletes category' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories/#{category.id}",
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories/#{category.id}",
                headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        deleted_category = Kbase::Category.find_by(id: category.id)
+        deleted_category = Category.find_by(id: category.id)
         expect(deleted_category).to be nil
       end
     end
   end
 
-  describe 'GET /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}/categories' do
+  describe 'GET /api/v1/accounts/{account.id}/portals/{portal.slug}/categories' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories"
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories"
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'get all portals' do
-        category2 = create(:kbase_category, name: 'test_category_2', portal: portal)
+        category2 = create(:category, name: 'test_category_2', portal: portal)
         expect(category2.id).not_to be nil
 
-        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}/categories",
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
diff --git a/spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
similarity index 60%
rename from spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb
rename to spec/controllers/api/v1/accounts/portals_controller_spec.rb
index eae356930..d4c923d58 100644
--- a/spec/controllers/api/v1/accounts/kbase/portals_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/portals_controller_spec.rb
@@ -1,23 +1,23 @@
 require 'rails_helper'
 
-RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
+RSpec.describe 'Api::V1::Accounts::Portals', type: :request do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let!(:portal) { create(:kbase_portal, slug: 'portal-1', name: 'test_portal', account_id: account.id) }
+  let!(:portal) { create(:portal, slug: 'portal-1', name: 'test_portal', account_id: account.id) }
 
-  describe 'GET /api/v1/accounts/{account.id}/kbase/portals' do
+  describe 'GET /api/v1/accounts/{account.id}/portals' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals"
+        get "/api/v1/accounts/#{account.id}/portals"
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'get all portals' do
-        portal2 = create(:kbase_portal, name: 'test_portal_2', account_id: account.id, slug: 'portal-2')
+        portal2 = create(:portal, name: 'test_portal_2', account_id: account.id, slug: 'portal-2')
         expect(portal2.id).not_to be nil
-        get "/api/v1/accounts/#{account.id}/kbase/portals",
+        get "/api/v1/accounts/#{account.id}/portals",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
@@ -26,17 +26,17 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
     end
   end
 
-  describe 'GET /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
+  describe 'GET /api/v1/accounts/{account.id}/portals/{portal.slug}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals"
+        get "/api/v1/accounts/#{account.id}/portals"
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'get one portals' do
-        get "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
@@ -45,10 +45,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
     end
   end
 
-  describe 'POST /api/v1/accounts/{account.id}/kbase/portals' do
+  describe 'POST /api/v1/accounts/{account.id}/portals' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        post "/api/v1/accounts/#{account.id}/kbase/portals", params: {}
+        post "/api/v1/accounts/#{account.id}/portals", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -61,7 +61,7 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
             slug: 'test_kbase'
           }
         }
-        post "/api/v1/accounts/#{account.id}/kbase/portals",
+        post "/api/v1/accounts/#{account.id}/portals",
              params: portal_params,
              headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
@@ -71,10 +71,10 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
     end
   end
 
-  describe 'PUT /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
+  describe 'PUT /api/v1/accounts/{account.id}/portals/{portal.slug}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}", params: {}
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -89,30 +89,50 @@ RSpec.describe 'Api::V1::Accounts::Kbase::Portals', type: :request do
 
         expect(portal.name).to eql('test_portal')
 
-        put "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
             params: portal_params,
             headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
         expect(json_response['name']).to eql(portal_params[:portal][:name])
       end
+
+      it 'archive portal' do
+        portal_params = {
+          portal: {
+            archived: true
+          }
+        }
+
+        expect(portal.archived).to be_falsy
+
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
+            params: portal_params,
+            headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['archived']).to eql(portal_params[:portal][:archived])
+
+        portal.reload
+        expect(portal.archived).to be_truthy
+      end
     end
   end
 
-  describe 'DELETE /api/v1/accounts/{account.id}/kbase/portals/{portal.slug}' do
+  describe 'DELETE /api/v1/accounts/{account.id}/portals/{portal.slug}' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}", params: {}
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}", params: {}
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
       it 'deletes portal' do
-        delete "/api/v1/accounts/#{account.id}/kbase/portals/#{portal.slug}",
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}",
                headers: agent.create_new_auth_token
         expect(response).to have_http_status(:success)
-        deleted_portal = Kbase::Portal.find_by(id: portal.slug)
+        deleted_portal = Portal.find_by(id: portal.slug)
         expect(deleted_portal).to be nil
       end
     end
diff --git a/spec/factories/kbase/articles.rb b/spec/factories/articles.rb
similarity index 81%
rename from spec/factories/kbase/articles.rb
rename to spec/factories/articles.rb
index 9c19d7c9e..3f0c94c47 100644
--- a/spec/factories/kbase/articles.rb
+++ b/spec/factories/articles.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :kbase_article, class: 'Kbase::Article' do
+  factory :article, class: 'Article' do
     account_id { 1 }
     category_id { 1 }
     folder_id { 1 }
diff --git a/spec/factories/kbase/categories.rb b/spec/factories/categories.rb
similarity index 70%
rename from spec/factories/kbase/categories.rb
rename to spec/factories/categories.rb
index 6b4c47ce4..f7becf8fc 100644
--- a/spec/factories/kbase/categories.rb
+++ b/spec/factories/categories.rb
@@ -1,6 +1,6 @@
 FactoryBot.define do
-  factory :kbase_category, class: 'Kbase::Category' do
-    portal { kbase_portal }
+  factory :category, class: 'Category' do
+    portal { portal }
     name { 'MyString' }
     description { 'MyText' }
     position { 1 }
diff --git a/spec/factories/kbase/folders.rb b/spec/factories/folders.rb
similarity index 71%
rename from spec/factories/kbase/folders.rb
rename to spec/factories/folders.rb
index 00cbabedd..62be3d263 100644
--- a/spec/factories/kbase/folders.rb
+++ b/spec/factories/folders.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :kbase_folder, class: 'Kbase::Folder' do
+  factory :folder, class: 'Folder' do
     account_id { 1 }
     name { 'MyString' }
     description { 'MyText' }
diff --git a/spec/factories/kbase/portals.rb b/spec/factories/portals.rb
similarity index 66%
rename from spec/factories/kbase/portals.rb
rename to spec/factories/portals.rb
index fb37b8b56..d49de096a 100644
--- a/spec/factories/kbase/portals.rb
+++ b/spec/factories/portals.rb
@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :kbase_portal, class: 'Kbase::Portal' do
+  factory :portal, class: 'Portal' do
     account
     name { Faker::Book.name }
     slug { SecureRandom.hex }
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index ff5f9cca5..e9906f131 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -19,8 +19,8 @@ RSpec.describe Account do
   it { is_expected.to have_many(:webhooks).dependent(:destroy_async) }
   it { is_expected.to have_many(:notification_settings).dependent(:destroy_async) }
   it { is_expected.to have_many(:reporting_events) }
-  it { is_expected.to have_many(:kbase_portals).dependent(:destroy_async) }
-  it { is_expected.to have_many(:kbase_categories).dependent(:destroy_async) }
+  it { is_expected.to have_many(:portals).dependent(:destroy_async) }
+  it { is_expected.to have_many(:categories).dependent(:destroy_async) }
   it { is_expected.to have_many(:teams).dependent(:destroy_async) }
 
   describe 'usage_limits' do
diff --git a/spec/models/kbase/article_spec.rb b/spec/models/article_spec.rb
similarity index 91%
rename from spec/models/kbase/article_spec.rb
rename to spec/models/article_spec.rb
index 14729b1ed..ee1e7f618 100644
--- a/spec/models/kbase/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Kbase::Article, type: :model do
+RSpec.describe Article, type: :model do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:category_id) }
diff --git a/spec/models/kbase/category_spec.rb b/spec/models/category_spec.rb
similarity index 89%
rename from spec/models/kbase/category_spec.rb
rename to spec/models/category_spec.rb
index 4b84cb352..55bad9a14 100644
--- a/spec/models/kbase/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Kbase::Category, type: :model do
+RSpec.describe Category, type: :model do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:name) }
diff --git a/spec/models/kbase/folder_spec.rb b/spec/models/folder_spec.rb
similarity index 90%
rename from spec/models/kbase/folder_spec.rb
rename to spec/models/folder_spec.rb
index 4af97a644..47c9adf06 100644
--- a/spec/models/kbase/folder_spec.rb
+++ b/spec/models/folder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Kbase::Folder, type: :model do
+RSpec.describe Folder, type: :model do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:category_id) }
diff --git a/spec/models/kbase/portal_spec.rb b/spec/models/portal_spec.rb
similarity index 90%
rename from spec/models/kbase/portal_spec.rb
rename to spec/models/portal_spec.rb
index 67f79bf81..e7fe633bc 100644
--- a/spec/models/kbase/portal_spec.rb
+++ b/spec/models/portal_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Kbase::Portal, type: :model do
+RSpec.describe Portal, type: :model do
   context 'with validations' do
     it { is_expected.to validate_presence_of(:account_id) }
     it { is_expected.to validate_presence_of(:slug) }

From b8f25d77bf59a6ba012b524e19c17a2e65c0a98d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 16 May 2022 16:41:40 +0530
Subject: [PATCH 116/177] chore: Enable New Message Button on Contact Panel
 (#4681)

Fixes: #4653
---
 .../dashboard/contacts/components/ContactInfoPanel.vue       | 1 -
 .../routes/dashboard/conversation/contact/ContactInfo.vue    | 5 -----
 .../routes/dashboard/conversation/contact/EditContact.vue    | 4 ++++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
index 985179d83..3a3076e9c 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/ContactInfoPanel.vue
@@ -8,7 +8,6 @@
     </span>
     <contact-info
       :show-avatar="showAvatar"
-      show-new-message
       :contact="contact"
       @panel-close="onClose"
     />
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
index 24aeeff88..db20d7043 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ContactInfo.vue
@@ -65,7 +65,6 @@
       </div>
       <div class="contact-actions">
         <woot-button
-          v-if="showNewMessage"
           v-tooltip="$t('CONTACT_PANEL.NEW_MESSAGE')"
           title="$t('CONTACT_PANEL.NEW_MESSAGE')"
           class="new-message"
@@ -172,10 +171,6 @@ export default {
       type: String,
       default: '',
     },
-    showNewMessage: {
-      type: Boolean,
-      default: false,
-    },
     showAvatar: {
       type: Boolean,
       default: true,
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
index afb2144ec..ddf42fd3b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/EditContact.vue
@@ -52,6 +52,10 @@ export default {
     },
     async onSubmit(contactItem) {
       await this.$store.dispatch('contacts/update', contactItem);
+      await this.$store.dispatch(
+        'contacts/fetchContactableInbox',
+        this.contact.id
+      );
     },
   },
 };

From 47f04ee3fec88e2b839b6019f226e1fb533d644c Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 17 May 2022 21:01:45 +0530
Subject: [PATCH 117/177] chore: Add an option to download CSAT Reports (#4694)

---
 .../csat_survey_responses_controller.rb       |  8 +++-
 app/javascript/dashboard/api/csatReports.js   | 11 ++++++
 .../dashboard/api/specs/csatReports.spec.js   | 18 +++++++++
 .../{downloadCsvFile.js => downloadHelper.js} |  6 +++
 ...CsvFile.spec.js => downloadHelper.spec.js} | 10 ++++-
 .../dashboard/i18n/locale/en/report.json      |  1 +
 .../settings/reports/CsatResponses.vue        | 27 +++++++++++--
 .../reports/components/FilterSelector.vue     |  9 ++++-
 .../reports/components/WootReports.vue        | 32 ++++++----------
 .../dashboard/store/modules/csat.js           |  6 +++
 .../dashboard/store/modules/reports.js        |  2 +-
 app/policies/csat_survey_response_policy.rb   |  4 ++
 .../csat_survey_responses/download.csv.erb    | 38 +++++++++++++++++++
 config/locales/en.yml                         | 10 +++++
 config/routes.rb                              |  1 +
 .../csat_survey_responses_controller_spec.rb  | 34 +++++++++++++++++
 16 files changed, 189 insertions(+), 28 deletions(-)
 rename app/javascript/dashboard/helper/{downloadCsvFile.js => downloadHelper.js} (51%)
 rename app/javascript/dashboard/helper/specs/{downloadCsvFile.spec.js => downloadHelper.spec.js} (68%)
 create mode 100644 app/views/api/v1/accounts/csat_survey_responses/download.csv.erb

diff --git a/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb b/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
index 347f028f7..7b5c51d6e 100644
--- a/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
+++ b/app/controllers/api/v1/accounts/csat_survey_responses_controller.rb
@@ -5,7 +5,7 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
   RESULTS_PER_PAGE = 25
 
   before_action :check_authorization
-  before_action :set_csat_survey_responses, only: [:index, :metrics]
+  before_action :set_csat_survey_responses, only: [:index, :metrics, :download]
   before_action :set_current_page, only: [:index]
   before_action :set_current_page_surveys, only: [:index]
   before_action :set_total_sent_messages_count, only: [:metrics]
@@ -19,6 +19,12 @@ class Api::V1::Accounts::CsatSurveyResponsesController < Api::V1::Accounts::Base
     @ratings_count = @csat_survey_responses.group(:rating).count
   end
 
+  def download
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = 'attachment; filename=csat_report.csv'
+    render layout: false, template: 'api/v1/accounts/csat_survey_responses/download.csv.erb', format: 'csv'
+  end
+
   private
 
   def set_total_sent_messages_count
diff --git a/app/javascript/dashboard/api/csatReports.js b/app/javascript/dashboard/api/csatReports.js
index cc0271d7d..4decc8de3 100644
--- a/app/javascript/dashboard/api/csatReports.js
+++ b/app/javascript/dashboard/api/csatReports.js
@@ -18,6 +18,17 @@ class CSATReportsAPI extends ApiClient {
     });
   }
 
+  download({ from, to, user_ids } = {}) {
+    return axios.get(`${this.url}/download`, {
+      params: {
+        since: from,
+        until: to,
+        sort: '-created_at',
+        user_ids,
+      },
+    });
+  }
+
   getMetrics({ from, to, user_ids } = {}) {
     return axios.get(`${this.url}/metrics`, {
       params: { since: from, until: to, user_ids },
diff --git a/app/javascript/dashboard/api/specs/csatReports.spec.js b/app/javascript/dashboard/api/specs/csatReports.spec.js
index 0022a91ad..a1d6e50f2 100644
--- a/app/javascript/dashboard/api/specs/csatReports.spec.js
+++ b/app/javascript/dashboard/api/specs/csatReports.spec.js
@@ -33,5 +33,23 @@ describe('#Reports API', () => {
         }
       );
     });
+    it('#download', () => {
+      csatReportsAPI.download({
+        from: 1622485800,
+        to: 1623695400,
+        user_ids: 1,
+      });
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/csat_survey_responses/download',
+        {
+          params: {
+            since: 1622485800,
+            until: 1623695400,
+            user_ids: 1,
+            sort: '-created_at',
+          },
+        }
+      );
+    });
   });
 });
diff --git a/app/javascript/dashboard/helper/downloadCsvFile.js b/app/javascript/dashboard/helper/downloadHelper.js
similarity index 51%
rename from app/javascript/dashboard/helper/downloadCsvFile.js
rename to app/javascript/dashboard/helper/downloadHelper.js
index f0a13a1fd..150ac1fd8 100644
--- a/app/javascript/dashboard/helper/downloadCsvFile.js
+++ b/app/javascript/dashboard/helper/downloadHelper.js
@@ -1,6 +1,12 @@
+import fromUnixTime from 'date-fns/fromUnixTime';
+import format from 'date-fns/format';
+
 export const downloadCsvFile = (fileName, fileContent) => {
   const link = document.createElement('a');
   link.download = fileName;
   link.href = `data:text/csv;charset=utf-8,` + encodeURI(fileContent);
   link.click();
 };
+
+export const generateFileName = ({ type, to }) =>
+  `${type}-report-${format(fromUnixTime(to), 'dd-MM-yyyy')}.csv`;
diff --git a/app/javascript/dashboard/helper/specs/downloadCsvFile.spec.js b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
similarity index 68%
rename from app/javascript/dashboard/helper/specs/downloadCsvFile.spec.js
rename to app/javascript/dashboard/helper/specs/downloadHelper.spec.js
index d05b0a841..b294dfe16 100644
--- a/app/javascript/dashboard/helper/specs/downloadCsvFile.spec.js
+++ b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
@@ -1,4 +1,4 @@
-import { downloadCsvFile } from '../downloadCsvFile';
+import { downloadCsvFile, generateFileName } from '../downloadHelper';
 
 const fileName = 'test.csv';
 const fileData = `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
@@ -19,3 +19,11 @@ describe('#downloadCsvFile', () => {
     expect(link.click).toHaveBeenCalledTimes(1);
   });
 });
+
+describe('#generateFileName', () => {
+  it('should generate the correct file name', () => {
+    expect(generateFileName({ type: 'csat', to: 1652812199 })).toEqual(
+      'csat-report-17-05-2022.csv'
+    );
+  });
+});
diff --git a/app/javascript/dashboard/i18n/locale/en/report.json b/app/javascript/dashboard/i18n/locale/en/report.json
index 35a349b56..5f2c6ae48 100644
--- a/app/javascript/dashboard/i18n/locale/en/report.json
+++ b/app/javascript/dashboard/i18n/locale/en/report.json
@@ -354,6 +354,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
index 4498ead8a..735c173ef 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/CsatResponses.vue
@@ -3,9 +3,18 @@
     <report-filter-selector
       agents-filter
       :agents-filter-items-list="agentList"
+      :show-business-hours-switch="false"
       @date-range-change="onDateRangeChange"
       @agents-filter-change="onAgentsFilterChange"
     />
+    <woot-button
+      color-scheme="success"
+      class-names="button--fixed-right-top"
+      icon="arrow-download"
+      @click="downloadReports"
+    >
+      {{ $t('CSAT_REPORTS.DOWNLOAD') }}
+    </woot-button>
     <csat-metrics />
     <csat-table :page-index="pageIndex" @page-change="onPageNumberChange" />
   </div>
@@ -15,6 +24,7 @@ import CsatMetrics from './components/CsatMetrics';
 import CsatTable from './components/CsatTable';
 import ReportFilterSelector from './components/FilterSelector';
 import { mapGetters } from 'vuex';
+import { generateFileName } from '../../../../helper/downloadHelper';
 
 export default {
   name: 'CsatResponses',
@@ -24,7 +34,7 @@ export default {
     ReportFilterSelector,
   },
   data() {
-    return { pageIndex: 1, from: 0, to: 0, user_ids: [] };
+    return { pageIndex: 1, from: 0, to: 0, userIds: [] };
   },
   computed: {
     ...mapGetters({
@@ -39,7 +49,7 @@ export default {
       this.$store.dispatch('csat/getMetrics', {
         from: this.from,
         to: this.to,
-        user_ids: this.user_ids,
+        user_ids: this.userIds,
       });
       this.getResponses();
     },
@@ -48,7 +58,7 @@ export default {
         page: this.pageIndex,
         from: this.from,
         to: this.to,
-        user_ids: this.user_ids,
+        user_ids: this.userIds,
       });
     },
     onPageNumberChange(pageIndex) {
@@ -61,9 +71,18 @@ export default {
       this.getAllData();
     },
     onAgentsFilterChange(agents) {
-      this.user_ids = agents.map(el => el.id);
+      this.userIds = agents.map(el => el.id);
       this.getAllData();
     },
+    downloadReports() {
+      const type = 'csat';
+      this.$store.dispatch('csat/downloadCSATReports', {
+        from: this.from,
+        to: this.to,
+        user_ids: this.userIds,
+        fileName: generateFileName({ type, to: this.to }),
+      });
+    },
   },
 };
 </script>
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 cadf4078e..848555a4d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/FilterSelector.vue
@@ -61,7 +61,10 @@
         @input="handleAgentsFilterSelection"
       />
     </div>
-    <div class="small-12 medium-3 business-hours">
+    <div
+      v-if="showBusinessHoursSwitch"
+      class="small-12 medium-3 business-hours"
+    >
       <span class="business-hours-text margin-right-small">
         {{ $t('REPORT.BUSINESS_HOURS') }}
       </span>
@@ -105,6 +108,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    showBusinessHoursSwitch: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
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 6d8b49c62..34188a12a 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -61,6 +61,7 @@ import format from 'date-fns/format';
 import { GROUP_BY_FILTER, METRIC_CHART } from '../constants';
 import reportMixin from '../../../../../mixins/reportMixin';
 import { formatTime } from '@chatwoot/utils';
+import { generateFileName } from '../../../../../helper/downloadHelper';
 
 const REPORTS_KEYS = {
   CONVERSATIONS: 'conversations_count',
@@ -250,26 +251,17 @@ export default {
       });
     },
     downloadReports() {
-      const { from, to } = this;
-      const fileName = `${this.type}-report-${format(
-        fromUnixTime(to),
-        'dd-MM-yyyy'
-      )}.csv`;
-      switch (this.type) {
-        case 'agent':
-          this.$store.dispatch('downloadAgentReports', { from, to, fileName });
-          break;
-        case 'label':
-          this.$store.dispatch('downloadLabelReports', { from, to, fileName });
-          break;
-        case 'inbox':
-          this.$store.dispatch('downloadInboxReports', { from, to, fileName });
-          break;
-        case 'team':
-          this.$store.dispatch('downloadTeamReports', { from, to, fileName });
-          break;
-        default:
-          break;
+      const { from, to, type } = this;
+      const dispatchMethods = {
+        agent: 'downloadAgentReports',
+        label: 'downloadLabelReports',
+        inbox: 'downloadInboxReports',
+        team: 'downloadTeamReports',
+      };
+      if (dispatchMethods[type]) {
+        const fileName = generateFileName({ type, to });
+        const params = { from, to, fileName };
+        this.$store.dispatch(dispatchMethods[type], params);
       }
     },
     changeSelection(index) {
diff --git a/app/javascript/dashboard/store/modules/csat.js b/app/javascript/dashboard/store/modules/csat.js
index 7bc1dad6d..2557e2698 100644
--- a/app/javascript/dashboard/store/modules/csat.js
+++ b/app/javascript/dashboard/store/modules/csat.js
@@ -1,6 +1,7 @@
 import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 import types from '../mutation-types';
 import CSATReports from '../../api/csatReports';
+import { downloadCsvFile } from '../../helper/downloadHelper';
 
 const computeDistribution = (value, total) =>
   ((value * 100) / total).toFixed(2);
@@ -107,6 +108,11 @@ export const actions = {
       commit(types.SET_CSAT_RESPONSE_UI_FLAG, { isFetchingMetrics: false });
     }
   },
+  downloadCSATReports(_, params) {
+    return CSATReports.download(params).then(response => {
+      downloadCsvFile(params.fileName, response.data);
+    });
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index dc9a6c33b..9ae571803 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -5,7 +5,7 @@ import * as types from '../mutation-types';
 import Report from '../../api/reports';
 import Vue from 'vue';
 
-import { downloadCsvFile } from '../../helper/downloadCsvFile';
+import { downloadCsvFile } from '../../helper/downloadHelper';
 
 const state = {
   fetchingStatus: false,
diff --git a/app/policies/csat_survey_response_policy.rb b/app/policies/csat_survey_response_policy.rb
index c0ce8821b..afcce00e9 100644
--- a/app/policies/csat_survey_response_policy.rb
+++ b/app/policies/csat_survey_response_policy.rb
@@ -6,4 +6,8 @@ class CsatSurveyResponsePolicy < ApplicationPolicy
   def metrics?
     @account_user.administrator?
   end
+
+  def download?
+    @account_user.administrator?
+  end
 end
diff --git a/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb b/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb
new file mode 100644
index 000000000..8b694ed35
--- /dev/null
+++ b/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb
@@ -0,0 +1,38 @@
+<%=
+  CSV.generate_line([
+    I18n.t('reports.csat.headers.agent_name'),
+    I18n.t('reports.csat.headers.rating'),
+    I18n.t('reports.csat.headers.feedback'),
+    I18n.t('reports.csat.headers.contact_name'),
+    I18n.t('reports.csat.headers.contact_email_address'),
+    I18n.t('reports.csat.headers.contact_phone_number'),
+    I18n.t('reports.csat.headers.link_to_the_conversation'),
+    I18n.t('reports.csat.headers.recorded_at')
+  ])
+-%>
+<% @csat_survey_responses.each do |csat_response| %>
+<% assigned_agent = csat_response.assigned_agent %>
+<% contact = csat_response.contact %>
+<% conversation = csat_response.conversation %>
+<%=
+  CSV.generate_line([
+    assigned_agent ? "#{assigned_agent.name} (#{assigned_agent.email})" : nil,
+    csat_response.rating,
+    csat_response.feedback_message.present? ? csat_response.feedback_message : nil,
+    contact&.name.present? ? contact&.name: nil,
+    contact&.email.present? ? contact&.email: nil,
+    contact&.phone_number.present? ? contact&.phone_number: nil,
+    conversation ? app_account_conversation_url(account_id: Current.account.id, id: conversation.display_id): nil,
+    csat_response.created_at,
+  ])
+-%>
+<% end %>
+<%=
+  CSV.generate_line([
+    I18n.t(
+      'reports.period',
+      since: Date.strptime(params[:since], '%s'),
+      until: Date.strptime(params[:until], '%s')
+    )
+  ])
+-%>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0c92c32eb..bd7829b53 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,6 +60,16 @@ en:
       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:
diff --git a/config/routes.rb b/config/routes.rb
index aa23be1e7..a80f6ca39 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -106,6 +106,7 @@ Rails.application.routes.draw do
           resources :csat_survey_responses, only: [:index] do
             collection do
               get :metrics
+              get :download
             end
           end
           resources :custom_attribute_definitions, only: [:index, :show, :create, :update, :destroy]
diff --git a/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb b/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
index abb4231d9..f431f0ed5 100644
--- a/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/csat_survey_responses_controller_spec.rb
@@ -148,4 +148,38 @@ RSpec.describe 'CSAT Survey Responses API', type: :request do
       end
     end
   end
+
+  describe 'GET /api/v1/accounts/{account.id}/csat_survey_responses/download' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/csat_survey_responses/download"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:params) { { since: 5.days.ago.to_time.to_i.to_s, until: Time.zone.tomorrow.to_time.to_i.to_s } }
+
+      it 'returns unauthorized for agents' do
+        get "/api/v1/accounts/#{account.id}/csat_survey_responses/download",
+            params: params,
+            headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+
+      it 'returns summary' do
+        get "/api/v1/accounts/#{account.id}/csat_survey_responses/download",
+            params: params,
+            headers: administrator.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+
+        content = CSV.parse(response.body)
+        # Check rating from CSAT Row
+        expect(content[1][1]).to eq '1'
+        expect(content.length).to eq 3
+      end
+    end
+  end
 end

From 20565d09c0771a3d229edc795affa2aef66268b4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 18 May 2022 12:15:30 +0530
Subject: [PATCH 118/177] fix: Update report method to fix issues with special
 characters (#4697)

---
 .../dashboard/helper/downloadHelper.js        | 11 ++-
 .../helper/specs/downloadHelper.spec.js       | 22 +-----
 .../modules/specs/reports/actions.spec.js     | 77 ++++++++-----------
 .../csat_survey_responses/download.csv.erb    |  2 +-
 .../api/v2/accounts/reports/agents.csv.erb    |  4 +-
 .../api/v2/accounts/reports/inboxes.csv.erb   |  6 +-
 .../api/v2/accounts/reports/labels.csv.erb    |  4 +-
 .../api/v2/accounts/reports/teams.csv.erb     |  4 +-
 8 files changed, 51 insertions(+), 79 deletions(-)

diff --git a/app/javascript/dashboard/helper/downloadHelper.js b/app/javascript/dashboard/helper/downloadHelper.js
index 150ac1fd8..68c3b5cee 100644
--- a/app/javascript/dashboard/helper/downloadHelper.js
+++ b/app/javascript/dashboard/helper/downloadHelper.js
@@ -1,11 +1,16 @@
 import fromUnixTime from 'date-fns/fromUnixTime';
 import format from 'date-fns/format';
 
-export const downloadCsvFile = (fileName, fileContent) => {
+export const downloadCsvFile = (fileName, content) => {
+  const contentType = 'data:text/csv;charset=utf-8;';
+  const blob = new Blob([content], { type: contentType });
+  const url = URL.createObjectURL(blob);
+
   const link = document.createElement('a');
-  link.download = fileName;
-  link.href = `data:text/csv;charset=utf-8,` + encodeURI(fileContent);
+  link.setAttribute('download', fileName);
+  link.setAttribute('href', url);
   link.click();
+  return link;
 };
 
 export const generateFileName = ({ type, to }) =>
diff --git a/app/javascript/dashboard/helper/specs/downloadHelper.spec.js b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
index b294dfe16..6cdec4160 100644
--- a/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
@@ -1,24 +1,4 @@
-import { downloadCsvFile, generateFileName } from '../downloadHelper';
-
-const fileName = 'test.csv';
-const fileData = `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
-Pranav,36,114,28411`;
-
-describe('#downloadCsvFile', () => {
-  it('should download the csv file', () => {
-    const link = {
-      click: jest.fn(),
-    };
-    jest.spyOn(document, 'createElement').mockImplementation(() => link);
-
-    downloadCsvFile(fileName, fileData);
-    expect(link.download).toEqual(fileName);
-    expect(link.href).toEqual(
-      `data:text/csv;charset=utf-8,${encodeURI(fileData)}`
-    );
-    expect(link.click).toHaveBeenCalledTimes(1);
-  });
-});
+import { generateFileName } from '../downloadHelper';
 
 describe('#generateFileName', () => {
   it('should generate the correct file name', () => {
diff --git a/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js b/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
index 0ba89ff81..a6e87e1a1 100644
--- a/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/reports/actions.spec.js
@@ -1,102 +1,89 @@
 import axios from 'axios';
 import { actions } from '../../reports';
-
+import DownloadHelper from 'dashboard/helper/downloadHelper';
 global.open = jest.fn();
 global.axios = axios;
 jest.mock('axios');
 
-const createElementSpy = () => {
-  const element = document.createElement('a');
-  jest.spyOn(document, 'createElement').mockImplementation(() => element);
-  return element;
-};
+jest.mock('dashboard/helper/downloadHelper', () => ({
+  downloadCsvFile: jest.fn(),
+}));
 
 describe('#actions', () => {
-  afterEach(() => {
-    jest.restoreAllMocks();
-  });
-
   describe('#downloadAgentReports', () => {
     it('open CSV download prompt if API is success', async () => {
-      axios.get.mockResolvedValue({
-        data: `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
-        Pranav,36,114,28411`,
-      });
+      const data = `Agent name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
+      Pranav,36,114,28411`;
+      axios.get.mockResolvedValue({ data });
+
       const param = {
         from: 1630504922510,
         to: 1630504922510,
         fileName: 'agent-report-01-09-2021.csv',
       };
-      const mockAgentDownloadElement = createElementSpy();
       await actions.downloadAgentReports(1, param);
-      expect(mockAgentDownloadElement.href).toEqual(
-        'data:text/csv;charset=utf-8,Agent%20name,Conversations%20count,Avg%20first%20response%20time%20(Minutes),Avg%20resolution%20time%20(Minutes)%0A%20%20%20%20%20%20%20%20Pranav,36,114,28411'
+      expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
+        param.fileName,
+        data
       );
-      expect(mockAgentDownloadElement.download).toEqual(param.fileName);
     });
   });
 
   describe('#downloadLabelReports', () => {
     it('open CSV download prompt if API is success', async () => {
-      axios.get.mockResolvedValue({
-        data: `Label Title,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
-        website,0,0,0`,
-      });
+      const data = `Label Title,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
+      website,0,0,0`;
+      axios.get.mockResolvedValue({ data });
       const param = {
         from: 1632335400,
         to: 1632853800,
         type: 'label',
         fileName: 'label-report-01-09-2021.csv',
       };
-      const mockLabelDownloadElement = createElementSpy();
       await actions.downloadLabelReports(1, param);
-      expect(mockLabelDownloadElement.href).toEqual(
-        'data:text/csv;charset=utf-8,Label%20Title,Conversations%20count,Avg%20first%20response%20time%20(Minutes),Avg%20resolution%20time%20(Minutes)%0A%20%20%20%20%20%20%20%20website,0,0,0'
+      expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
+        param.fileName,
+        data
       );
-      expect(mockLabelDownloadElement.download).toEqual(param.fileName);
     });
   });
 
   describe('#downloadInboxReports', () => {
     it('open CSV download prompt if API is success', async () => {
-      axios.get.mockResolvedValue({
-        data: `Inbox name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
-        Fayaz,2,127,0
-        EMa,0,0,0
-        Twillio WA,0,0,0`,
-      });
+      const data = `Inbox name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
+      Fayaz,2,127,0
+      EMa,0,0,0
+      Twillio WA,0,0,0`;
+      axios.get.mockResolvedValue({ data });
       const param = {
         from: 1631039400,
         to: 1635013800,
         fileName: 'inbox-report-24-10-2021.csv',
       };
-      const mockInboxDownloadElement = createElementSpy();
       await actions.downloadInboxReports(1, param);
-      expect(mockInboxDownloadElement.href).toEqual(
-        'data:text/csv;charset=utf-8,Inbox%20name,Conversations%20count,Avg%20first%20response%20time%20(Minutes),Avg%20resolution%20time%20(Minutes)%0A%20%20%20%20%20%20%20%20Fayaz,2,127,0%0A%20%20%20%20%20%20%20%20EMa,0,0,0%0A%20%20%20%20%20%20%20%20Twillio%20WA,0,0,0'
+      expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
+        param.fileName,
+        data
       );
-      expect(mockInboxDownloadElement.download).toEqual(param.fileName);
     });
   });
 
   describe('#downloadTeamReports', () => {
     it('open CSV download prompt if API is success', async () => {
-      axios.get.mockResolvedValue({
-        data: `Team name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
-        sales team,0,0,0
-        Reporting period 2021-09-23 to 2021-09-29`,
-      });
+      const data = `Team name,Conversations count,Avg first response time (Minutes),Avg resolution time (Minutes)
+      sales team,0,0,0
+      Reporting period 2021-09-23 to 2021-09-29`;
+      axios.get.mockResolvedValue({ data });
       const param = {
         from: 1631039400,
         to: 1635013800,
         fileName: 'inbox-report-24-10-2021.csv',
       };
-      const mockInboxDownloadElement = createElementSpy();
       await actions.downloadInboxReports(1, param);
-      expect(mockInboxDownloadElement.href).toEqual(
-        'data:text/csv;charset=utf-8,Team%20name,Conversations%20count,Avg%20first%20response%20time%20(Minutes),Avg%20resolution%20time%20(Minutes)%0A%20%20%20%20%20%20%20%20sales%20team,0,0,0%0A%20%20%20%20%20%20%20%20Reporting%20period%202021-09-23%20to%202021-09-29'
+      expect(DownloadHelper.downloadCsvFile).toBeCalledWith(
+        param.fileName,
+        data
       );
-      expect(mockInboxDownloadElement.download).toEqual(param.fileName);
     });
   });
 });
diff --git a/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb b/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb
index 8b694ed35..5c0524480 100644
--- a/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb
+++ b/app/views/api/v1/accounts/csat_survey_responses/download.csv.erb
@@ -24,7 +24,7 @@
     contact&.phone_number.present? ? contact&.phone_number: nil,
     conversation ? app_account_conversation_url(account_id: Current.account.id, id: conversation.display_id): nil,
     csat_response.created_at,
-  ])
+]).html_safe
 -%>
 <% end %>
 <%=
diff --git a/app/views/api/v2/accounts/reports/agents.csv.erb b/app/views/api/v2/accounts/reports/agents.csv.erb
index 6738fe51b..9c8f1f814 100644
--- a/app/views/api/v2/accounts/reports/agents.csv.erb
+++ b/app/views/api/v2/accounts/reports/agents.csv.erb
@@ -5,7 +5,7 @@
     I18n.t('reports.agent_csv.avg_resolution_time')
   ]
 %>
-<%= CSV.generate_line headers %>
+<%= CSV.generate_line headers -%>
 <% Current.account.users.each do |agent| %>
   <% agent_report = V2::ReportBuilder.new(Current.account, {
         type: :agent,
@@ -14,6 +14,6 @@
         until: params[:until]
       }).summary %>
   <% row = [ agent.name, agent_report[:conversations_count], (agent_report[:avg_first_response_time]/60).to_i, (agent_report[:avg_resolution_time]/60).to_i ] %>
-  <%= CSV.generate_line row %>
+<%= CSV.generate_line row -%>
 <% end %>
 <%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>
diff --git a/app/views/api/v2/accounts/reports/inboxes.csv.erb b/app/views/api/v2/accounts/reports/inboxes.csv.erb
index 24548449a..c82be2df4 100644
--- a/app/views/api/v2/accounts/reports/inboxes.csv.erb
+++ b/app/views/api/v2/accounts/reports/inboxes.csv.erb
@@ -1,5 +1,5 @@
 <% headers = ['Inbox name', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
-<%= CSV.generate_line headers %>
+<%= CSV.generate_line headers -%>
 <% Current.account.inboxes.each do |inbox| %>
   <% inbox_report = V2::ReportBuilder.new(Current.account, {
         type: :inbox,
@@ -8,5 +8,5 @@
         until: params[:until]
       }).summary %>
   <% row = [ inbox.name, inbox_report[:conversations_count], (inbox_report[:avg_first_response_time]/60).to_i, (inbox_report[:avg_resolution_time]/60).to_i ] %>
-<%=   CSV.generate_line row %>
-<% end %>
\ No newline at end of file
+<%= CSV.generate_line row -%>
+<% end %>
diff --git a/app/views/api/v2/accounts/reports/labels.csv.erb b/app/views/api/v2/accounts/reports/labels.csv.erb
index 70ebbdf35..dcbc2b974 100644
--- a/app/views/api/v2/accounts/reports/labels.csv.erb
+++ b/app/views/api/v2/accounts/reports/labels.csv.erb
@@ -1,5 +1,5 @@
 <% headers = ['Label Title', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
-<%= CSV.generate_line headers %>
+<%= CSV.generate_line headers -%>
 <% Current.account.labels.each do |label| %>
   <% label_report = V2::ReportBuilder.new(Current.account, {
         type: :label,
@@ -8,5 +8,5 @@
         until: params[:until]
       }).summary %>
   <% row = [ label.title, label_report[:conversations_count], (label_report[:avg_first_response_time]/60).to_i, (label_report[:avg_resolution_time]/60).to_i ] %>
-<%=   CSV.generate_line row %>
+<%= CSV.generate_line row -%>
 <% end %>
diff --git a/app/views/api/v2/accounts/reports/teams.csv.erb b/app/views/api/v2/accounts/reports/teams.csv.erb
index 55c679273..f7b82cb1d 100644
--- a/app/views/api/v2/accounts/reports/teams.csv.erb
+++ b/app/views/api/v2/accounts/reports/teams.csv.erb
@@ -5,7 +5,7 @@
     I18n.t('reports.team_csv.avg_resolution_time')
   ]
 %>
-<%= CSV.generate_line headers %>
+<%= CSV.generate_line headers -%>
 <% Current.account.teams.each do |team| %>
   <% team_report = V2::ReportBuilder.new(Current.account, {
         type: :team,
@@ -14,6 +14,6 @@
         until: params[:until]
       }).summary %>
   <% row = [ team.name, team_report[:conversations_count], (team_report[:avg_first_response_time]/60).to_i, (team_report[:avg_resolution_time]/60).to_i ] %>
-  <%= CSV.generate_line row %>
+<%= CSV.generate_line row -%>
 <% end %>
 <%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>

From 8538660bbd69e43109d1c3292ad2b47261f02c30 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Thu, 19 May 2022 09:46:33 +0530
Subject: [PATCH 119/177] Add first_reply_created event in conversation (#4576)

---
 ...conversations_first_reply_scheduler_job.rb | 17 +++++++
 app/listeners/reporting_event_listener.rb     |  3 ++
 app/models/conversation.rb                    | 44 +++++++++--------
 ...first_reply_activity_at_to_conversation.rb | 23 +++++++++
 db/schema.rb                                  |  4 +-
 ...rsations_first_reply_scheduler_job_spec.rb | 48 +++++++++++++++++++
 6 files changed, 117 insertions(+), 22 deletions(-)
 create mode 100644 app/jobs/migration/conversations_first_reply_scheduler_job.rb
 create mode 100644 db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb
 create mode 100644 spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb

diff --git a/app/jobs/migration/conversations_first_reply_scheduler_job.rb b/app/jobs/migration/conversations_first_reply_scheduler_job.rb
new file mode 100644
index 000000000..509357c1e
--- /dev/null
+++ b/app/jobs/migration/conversations_first_reply_scheduler_job.rb
@@ -0,0 +1,17 @@
+# Delete migration and spec after 2 consecutive releases.
+class Migration::ConversationsFirstReplySchedulerJob < ApplicationJob
+  queue_as :scheduled_jobs
+
+  def perform(account)
+    account.conversations.each do |conversation|
+      # rubocop:disable Rails/SkipsModelValidations
+      if conversation.messages.outgoing.where("(additional_attributes->'campaign_id') is null").count.positive?
+        conversation.update_columns(first_reply_created_at: conversation.messages.outgoing.where("(additional_attributes->'campaign_id') is null")
+        .first.created_at)
+      else
+        conversation.update_columns(first_reply_created_at: nil)
+      end
+      # rubocop:enable Rails/SkipsModelValidations
+    end
+  end
+end
diff --git a/app/listeners/reporting_event_listener.rb b/app/listeners/reporting_event_listener.rb
index d87b6574b..abd28ad32 100644
--- a/app/listeners/reporting_event_listener.rb
+++ b/app/listeners/reporting_event_listener.rb
@@ -36,6 +36,9 @@ class ReportingEventListener < BaseListener
       event_start_time: conversation.created_at,
       event_end_time: message.created_at
     )
+    # rubocop:disable Rails/SkipsModelValidations
+    conversation.update_columns(first_reply_created_at: message.created_at)
+    # rubocop:enable Rails/SkipsModelValidations
     reporting_event.save
   end
 end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index ac02260a5..643f8fa56 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -2,27 +2,28 @@
 #
 # Table name: conversations
 #
-#  id                    :integer          not null, primary key
-#  additional_attributes :jsonb
-#  agent_last_seen_at    :datetime
-#  assignee_last_seen_at :datetime
-#  contact_last_seen_at  :datetime
-#  custom_attributes     :jsonb
-#  identifier            :string
-#  last_activity_at      :datetime         not null
-#  snoozed_until         :datetime
-#  status                :integer          default("open"), not null
-#  uuid                  :uuid             not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
-#  account_id            :integer          not null
-#  assignee_id           :integer
-#  campaign_id           :bigint
-#  contact_id            :bigint
-#  contact_inbox_id      :bigint
-#  display_id            :integer          not null
-#  inbox_id              :integer          not null
-#  team_id               :bigint
+#  id                     :integer          not null, primary key
+#  additional_attributes  :jsonb
+#  agent_last_seen_at     :datetime
+#  assignee_last_seen_at  :datetime
+#  contact_last_seen_at   :datetime
+#  custom_attributes      :jsonb
+#  first_reply_created_at :datetime
+#  identifier             :string
+#  last_activity_at       :datetime         not null
+#  snoozed_until          :datetime
+#  status                 :integer          default("open"), not null
+#  uuid                   :uuid             not null
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#  account_id             :integer          not null
+#  assignee_id            :integer
+#  campaign_id            :bigint
+#  contact_id             :bigint
+#  contact_inbox_id       :bigint
+#  display_id             :integer          not null
+#  inbox_id               :integer          not null
+#  team_id                :bigint
 #
 # Indexes
 #
@@ -31,6 +32,7 @@
 #  index_conversations_on_assignee_id_and_account_id  (assignee_id,account_id)
 #  index_conversations_on_campaign_id                 (campaign_id)
 #  index_conversations_on_contact_inbox_id            (contact_inbox_id)
+#  index_conversations_on_first_reply_created_at      (first_reply_created_at)
 #  index_conversations_on_last_activity_at            (last_activity_at)
 #  index_conversations_on_status_and_account_id       (status,account_id)
 #  index_conversations_on_team_id                     (team_id)
diff --git a/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb b/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb
new file mode 100644
index 000000000..9afb58feb
--- /dev/null
+++ b/db/migrate/20220513145010_add_first_reply_activity_at_to_conversation.rb
@@ -0,0 +1,23 @@
+class AddFirstReplyActivityAtToConversation < ActiveRecord::Migration[6.1]
+  def change
+    add_column :conversations, :first_reply_created_at, :datetime
+    add_index :conversations, :first_reply_created_at
+
+    # rubocop:disable Rails/SkipsModelValidations
+    ::Conversation.update_all(first_reply_created_at: Time.now.utc)
+    # rubocop:enable Rails/SkipsModelValidations
+
+    backfill_first_reply_activity_at_to_conversations
+  end
+
+  private
+
+  def backfill_first_reply_activity_at_to_conversations
+    ::Account.find_in_batches do |account_batch|
+      Rails.logger.info "Migrated till #{account_batch.first.id}\n"
+      account_batch.each do |account|
+        Migration::ConversationsFirstReplySchedulerJob.perform_later(account)
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 32f7dbefb..e7382572e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_05_11_072655) do
+ActiveRecord::Schema.define(version: 2022_05_13_145010) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -385,11 +385,13 @@ ActiveRecord::Schema.define(version: 2022_05_11_072655) do
     t.datetime "snoozed_until"
     t.jsonb "custom_attributes", default: {}
     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"], 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"
     t.index ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
+    t.index ["first_reply_created_at"], name: "index_conversations_on_first_reply_created_at"
     t.index ["last_activity_at"], name: "index_conversations_on_last_activity_at"
     t.index ["status", "account_id"], name: "index_conversations_on_status_and_account_id"
     t.index ["team_id"], name: "index_conversations_on_team_id"
diff --git a/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb b/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb
new file mode 100644
index 000000000..f16b51a3a
--- /dev/null
+++ b/spec/jobs/migration/conversations_first_reply_scheduler_job_spec.rb
@@ -0,0 +1,48 @@
+require 'rails_helper'
+
+RSpec.describe Migration::ConversationsFirstReplySchedulerJob, type: :job do
+  subject(:job) { described_class.perform_later }
+
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:user) { create(:user, account: account) }
+
+  it 'enqueues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .on_queue('scheduled_jobs')
+  end
+
+  context 'when there is an outgoing message in conversation' do
+    let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
+    let!(:message) do
+      create(:message, content: 'Hi', message_type: 'outgoing', account: account, inbox: inbox,
+                       conversation: conversation)
+    end
+
+    it 'updates the conversation first reply with the first outgoing message created time' do
+      create(:message, content: 'Hello', message_type: 'outgoing', account: account, inbox: inbox,
+                       conversation: conversation)
+
+      described_class.perform_now(account)
+      conversation.reload
+
+      expect(conversation.messages.count).to eq 2
+      expect(conversation.first_reply_created_at.to_i).to eq message.created_at.to_i
+    end
+  end
+
+  context 'when there is no outgoing message in conversation' do
+    let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
+
+    it 'updates the conversation first reply with nil' do
+      create(:message, content: 'Hello', message_type: 'incoming', account: account, inbox: inbox,
+                       conversation: conversation)
+
+      described_class.perform_now(account)
+      conversation.reload
+
+      expect(conversation.messages.count).to eq 1
+      expect(conversation.first_reply_created_at).to be_nil
+    end
+  end
+end

From 11ea8a3032a7199c71308fbcc5d52056d73412a9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 19 May 2022 21:43:23 +0530
Subject: [PATCH 120/177] chore: Update the documentation for configuring
 webhooks in the account (#4703)

---
 swagger/definitions/index.yml                 |   8 +-
 .../webhooks/create_update_payload.yml        |  18 ++
 swagger/definitions/resource/webhook.yml      |  24 +++
 swagger/index.yml                             |  17 +-
 swagger/parameters/index.yml                  |   3 +
 swagger/parameters/webhook_id.yml             |   5 +
 swagger/paths/application/webhooks/create.yml |  19 ++
 swagger/paths/application/webhooks/delete.yml |  12 ++
 swagger/paths/application/webhooks/index.yml  |  15 ++
 swagger/paths/application/webhooks/update.yml |  19 ++
 swagger/paths/index.yml                       |  17 ++
 swagger/swagger.json                          | 201 +++++++++++++++++-
 12 files changed, 340 insertions(+), 18 deletions(-)
 create mode 100644 swagger/definitions/request/webhooks/create_update_payload.yml
 create mode 100644 swagger/definitions/resource/webhook.yml
 create mode 100644 swagger/parameters/webhook_id.yml
 create mode 100644 swagger/paths/application/webhooks/create.yml
 create mode 100644 swagger/paths/application/webhooks/delete.yml
 create mode 100644 swagger/paths/application/webhooks/index.yml
 create mode 100644 swagger/paths/application/webhooks/update.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index c06dd1471..5e22a7099 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -36,6 +36,8 @@ contactable_inboxes:
   $ref: ./resource/contactable_inboxes.yml
 custom_filter:
   $ref: ./resource/custom_filter.yml
+webhook:
+  $ref: ./resource/webhook.yml
 account:
   $ref: ./resource/account.yml
 platform_account:
@@ -91,6 +93,9 @@ team_create_update_payload:
 custom_filter_create_update_payload:
   $ref: ./request/custom_filter/create_update_payload.yml
 
+webhook_create_update_payload:
+  $ref: ./request/webhooks/create_update_payload.yml
+
 integrations_hook_create_payload:
   $ref: ./request/integrations/hook_create_payload.yml
 
@@ -158,6 +163,3 @@ account_summary:
   $ref: './resource/reports/summary.yml'
 agent_conversation_metrics:
   $ref: './resource/reports/conversation/agent.yml'
-
-
-
diff --git a/swagger/definitions/request/webhooks/create_update_payload.yml b/swagger/definitions/request/webhooks/create_update_payload.yml
new file mode 100644
index 000000000..417843fe6
--- /dev/null
+++ b/swagger/definitions/request/webhooks/create_update_payload.yml
@@ -0,0 +1,18 @@
+type: object
+properties:
+  url:
+    type: string
+    description: The url where the events should be sent
+  subscriptions:
+    type: array
+    items:
+      type: string
+      enum: [
+        "conversation_created",
+        "conversation_status_changed",
+        "conversation_updated",
+        "message_created",
+        "message_updated",
+        "webwidget_triggered"
+      ]
+    description: The events you want to subscribe to.
diff --git a/swagger/definitions/resource/webhook.yml b/swagger/definitions/resource/webhook.yml
new file mode 100644
index 000000000..1e4c58904
--- /dev/null
+++ b/swagger/definitions/resource/webhook.yml
@@ -0,0 +1,24 @@
+type: object
+properties:
+  id:
+    type: number
+    description: The ID of the webhook
+  url:
+    type: string
+    description: The url to which the events will be send
+  subscriptions:
+    type: array
+    items:
+      type: string
+      enum: [
+        "conversation_created",
+        "conversation_status_changed",
+        "conversation_updated",
+        "message_created",
+        "message_updated",
+        "webwidget_triggered"
+      ]
+    description: The list of subscribed events
+  account_id:
+    type: number
+    description: The id of the account which the webhook object belongs to
diff --git a/swagger/index.yml b/swagger/index.yml
index b2dd91e46..f64a090e7 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -56,17 +56,18 @@ x-tagGroups:
       - Agents
       - Canned Responses
       - Contacts
-      - Conversations
       - Conversation Assignment
       - Conversation Labels
-      - Inboxes
-      - Messages
-      - Integrations
-      - Profile
-      - Teams
-      - Custom Filters
-      - Reports
+      - Conversations
       - Custom Attributes
+      - Custom Filters
+      - Inboxes
+      - Integrations
+      - Messages
+      - Profile
+      - Reports
+      - Teams
+      - Webhooks
   - name: Client
     tags:
       - Contacts API
diff --git a/swagger/parameters/index.yml b/swagger/parameters/index.yml
index d69640369..2c61a6a01 100644
--- a/swagger/parameters/index.yml
+++ b/swagger/parameters/index.yml
@@ -25,6 +25,9 @@ conversation_id:
 custom_filter_id:
   $ref: ./custom_filter_id.yml
 
+webhook_id:
+  $ref: ./webhook_id.yml
+
 message_id:
   $ref: ./message_id.yml
 
diff --git a/swagger/parameters/webhook_id.yml b/swagger/parameters/webhook_id.yml
new file mode 100644
index 000000000..4400a082c
--- /dev/null
+++ b/swagger/parameters/webhook_id.yml
@@ -0,0 +1,5 @@
+in: path
+name: webhook_id
+type: integer
+required: true
+description: The numeric ID of the webhook
diff --git a/swagger/paths/application/webhooks/create.yml b/swagger/paths/application/webhooks/create.yml
new file mode 100644
index 000000000..e4d3053ee
--- /dev/null
+++ b/swagger/paths/application/webhooks/create.yml
@@ -0,0 +1,19 @@
+tags:
+  - Webhooks
+operationId: create-a-webhook
+summary: Add a webhook
+description: Add a webhook subscription to the account
+parameters:
+  - $ref: '#/parameters/account_id'
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/webhook_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/webhook'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/application/webhooks/delete.yml b/swagger/paths/application/webhooks/delete.yml
new file mode 100644
index 000000000..525c22dfc
--- /dev/null
+++ b/swagger/paths/application/webhooks/delete.yml
@@ -0,0 +1,12 @@
+tags:
+  - Webhooks
+operationId: delete-a-webhook
+summary: Delete a webhook
+description: Delete a webhook from the account
+responses:
+  200:
+    description: Success
+  401:
+    description: Unauthorized
+  404:
+    description: The webhook does not exist in the account
diff --git a/swagger/paths/application/webhooks/index.yml b/swagger/paths/application/webhooks/index.yml
new file mode 100644
index 000000000..f96fa00de
--- /dev/null
+++ b/swagger/paths/application/webhooks/index.yml
@@ -0,0 +1,15 @@
+tags:
+  - Webhooks
+operationId: list-all-webhooks
+summary: List all webhooks
+description:  List all webhooks in the account
+responses:
+  200:
+    description: Success
+    schema:
+      type: array
+      description: 'Array of webhook objects'
+      items:
+        $ref: '#/definitions/webhook'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/application/webhooks/update.yml b/swagger/paths/application/webhooks/update.yml
new file mode 100644
index 000000000..b395e7362
--- /dev/null
+++ b/swagger/paths/application/webhooks/update.yml
@@ -0,0 +1,19 @@
+tags:
+  - Webhooks
+operationId: update-a-webhook
+summary: Update a webhook object
+description: Update a webhook object in the account
+parameters:
+  - $ref: '#/parameters/account_id'
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/webhook_create_update_payload'
+responses:
+  200:
+    description: Success
+    schema:
+      $ref: '#/definitions/webhook'
+  401:
+    description: Unauthorized
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 2175a3154..084065a9a 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -385,6 +385,23 @@
   delete:
     $ref: ./application/custom_filters/delete.yml
 
+# webhooks
+/api/v1/accounts/{account_id}/webhooks:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: ./application/webhooks/index.yml
+  post:
+    $ref: ./application/webhooks/create.yml
+/api/v1/accounts/{account_id}/webhooks/{webhook_id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - $ref: '#/parameters/webhook_id'
+  patch:
+    $ref: ./application/webhooks/update.yml
+  delete:
+    $ref: ./application/webhooks/delete.yml
+
 ### Reports
 
 # List
diff --git a/swagger/swagger.json b/swagger/swagger.json
index ec1bf8a25..9103fe13e 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -4081,6 +4081,129 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/webhooks": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Webhooks"
+        ],
+        "operationId": "list-all-webhooks",
+        "summary": "List all webhooks",
+        "description": "List all webhooks in the account",
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of webhook objects",
+              "items": {
+                "$ref": "#/definitions/webhook"
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Webhooks"
+        ],
+        "operationId": "create-a-webhook",
+        "summary": "Add a webhook",
+        "description": "Add a webhook subscription to the account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/webhook_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/webhook"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/webhooks/{webhook_id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "$ref": "#/parameters/webhook_id"
+        }
+      ],
+      "patch": {
+        "tags": [
+          "Webhooks"
+        ],
+        "operationId": "update-a-webhook",
+        "summary": "Update a webhook object",
+        "description": "Update a webhook object in the account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/webhook_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/webhook"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Webhooks"
+        ],
+        "operationId": "delete-a-webhook",
+        "summary": "Delete a webhook",
+        "description": "Delete a webhook from the account",
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The webhook does not exist in the account"
+          }
+        }
+      }
+    },
     "/api/v2/accounts/{account_id}/reports": {
       "parameters": [
         {
@@ -4772,6 +4895,38 @@
         }
       }
     },
+    "webhook": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "number",
+          "description": "The ID of the webhook"
+        },
+        "url": {
+          "type": "string",
+          "description": "The url to which the events will be send"
+        },
+        "subscriptions": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "conversation_created",
+              "conversation_status_changed",
+              "conversation_updated",
+              "message_created",
+              "message_updated",
+              "webwidget_triggered"
+            ]
+          },
+          "description": "The list of subscribed events"
+        },
+        "account_id": {
+          "type": "number",
+          "description": "The id of the account which the webhook object belongs to"
+        }
+      }
+    },
     "account": {
       "type": "object",
       "properties": {
@@ -5223,6 +5378,30 @@
         }
       }
     },
+    "webhook_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "url": {
+          "type": "string",
+          "description": "The url where the events should be sent"
+        },
+        "subscriptions": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "conversation_created",
+              "conversation_status_changed",
+              "conversation_updated",
+              "message_created",
+              "message_updated",
+              "webwidget_triggered"
+            ]
+          },
+          "description": "The events you want to subscribe to."
+        }
+      }
+    },
     "integrations_hook_create_payload": {
       "type": "object",
       "properties": {
@@ -5736,6 +5915,13 @@
       "required": true,
       "description": "The numeric ID of the custom filter"
     },
+    "webhook_id": {
+      "in": "path",
+      "name": "webhook_id",
+      "type": "integer",
+      "required": true,
+      "description": "The numeric ID of the webhook"
+    },
     "message_id": {
       "in": "path",
       "name": "message_id",
@@ -5819,17 +6005,18 @@
         "Agents",
         "Canned Responses",
         "Contacts",
-        "Conversations",
         "Conversation Assignment",
         "Conversation Labels",
-        "Inboxes",
-        "Messages",
-        "Integrations",
-        "Profile",
-        "Teams",
+        "Conversations",
+        "Custom Attributes",
         "Custom Filters",
+        "Inboxes",
+        "Integrations",
+        "Messages",
+        "Profile",
         "Reports",
-        "Custom Attributes"
+        "Teams",
+        "Webhooks"
       ]
     },
     {

From 59969cc5536f63e926ad999e79f136bfb1e1ed03 Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Sun, 22 May 2022 13:08:41 +0530
Subject: [PATCH 121/177] chore: Update conversations API to include unattended
 conversations. (#4708)

* Update conversations API to include unattended conversations.
---
 app/finders/conversation_finder.rb             |  5 +++++
 .../accounts/conversations_controller_spec.rb  | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index 58013f128..ecbccfb88 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -51,6 +51,7 @@ class ConversationFinder
     filter_by_team if @team
     filter_by_labels if params[:labels]
     filter_by_query if params[:q]
+    filter_by_reply_status
   end
 
   def set_inboxes
@@ -90,6 +91,10 @@ class ConversationFinder
     @conversations
   end
 
+  def filter_by_reply_status
+    @conversations = @conversations.where(first_reply_created_at: nil) if params[:reply_status] == 'unattended'
+  end
+
   def filter_by_query
     allowed_message_types = [Message.message_types[:incoming], Message.message_types[:outgoing]]
     @conversations = conversations.joins(:messages).where('messages.content ILIKE :search', search: "%#{params[:q]}%")
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 8a874fc56..102e12477 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -15,6 +15,8 @@ RSpec.describe 'Conversations API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
       let(:conversation) { create(:conversation, account: account) }
+      let(:attended_conversation) { create(:conversation, account: account, first_reply_created_at: Time.now.utc) }
+      let(:unattended_conversation) { create(:conversation, account: account, first_reply_created_at: nil) }
 
       before do
         create(:inbox_member, user: agent, inbox: conversation.inbox)
@@ -43,6 +45,22 @@ RSpec.describe 'Conversations API', type: :request do
         expect(body[:data][:meta][:all_count]).to eq(1)
         expect(body[:data][:payload].first[:messages]).to eq([])
       end
+
+      it 'returns unattended conversations' do
+        agent_1 = create(:user, account: account, role: :agent)
+        create(:inbox_member, user: agent_1, inbox: attended_conversation.inbox)
+        create(:inbox_member, user: agent_1, inbox: unattended_conversation.inbox)
+
+        get "/api/v1/accounts/#{account.id}/conversations",
+            headers: agent_1.create_new_auth_token,
+            params: { reply_status: 'unattended' },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        body = JSON.parse(response.body, symbolize_names: true)
+        expect(body[:data][:meta][:all_count]).to eq(1)
+        expect(body[:data][:payload].count).to eq(1)
+      end
     end
   end
 

From f74a1f7d5ac2dc58a168eaab2728e3fe0de34be3 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 23 May 2022 11:33:54 +0530
Subject: [PATCH 122/177] chore: Update translations (#4691)

---
 .../dashboard/i18n/locale/ar/report.json      |  1 +
 .../dashboard/i18n/locale/bg/report.json      |  1 +
 .../dashboard/i18n/locale/bg/settings.json    |  2 +-
 .../dashboard/i18n/locale/ca/report.json      |  1 +
 .../dashboard/i18n/locale/cs/chatlist.json    |  6 +-
 .../i18n/locale/cs/conversation.json          | 64 +++++++++----------
 .../dashboard/i18n/locale/cs/report.json      | 41 ++++++------
 .../dashboard/i18n/locale/cs/settings.json    |  2 +-
 .../dashboard/i18n/locale/da/report.json      |  1 +
 .../dashboard/i18n/locale/de/report.json      |  1 +
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  4 +-
 .../dashboard/i18n/locale/el/report.json      |  1 +
 .../dashboard/i18n/locale/es/report.json      |  1 +
 .../dashboard/i18n/locale/fa/inboxMgmt.json   |  4 +-
 .../dashboard/i18n/locale/fa/report.json      |  1 +
 .../dashboard/i18n/locale/fi/report.json      |  1 +
 .../dashboard/i18n/locale/fr/report.json      |  1 +
 .../dashboard/i18n/locale/he/report.json      |  1 +
 .../dashboard/i18n/locale/hi/report.json      |  1 +
 .../dashboard/i18n/locale/hu/report.json      |  1 +
 .../dashboard/i18n/locale/id/report.json      |  1 +
 .../dashboard/i18n/locale/it/report.json      |  1 +
 .../i18n/locale/ja/advancedFilters.json       | 52 +++++++--------
 .../dashboard/i18n/locale/ja/contact.json     |  2 +-
 .../i18n/locale/ja/contactFilters.json        | 26 ++++----
 .../dashboard/i18n/locale/ja/report.json      |  1 +
 .../i18n/locale/ja/teamsSettings.json         | 10 +--
 .../dashboard/i18n/locale/ko/report.json      |  1 +
 .../dashboard/i18n/locale/lv/report.json      |  1 +
 .../dashboard/i18n/locale/ml/report.json      |  1 +
 .../dashboard/i18n/locale/ne/report.json      |  1 +
 .../dashboard/i18n/locale/nl/report.json      |  1 +
 .../dashboard/i18n/locale/no/report.json      |  1 +
 .../dashboard/i18n/locale/pl/report.json      |  1 +
 .../dashboard/i18n/locale/pt/report.json      |  1 +
 .../dashboard/i18n/locale/pt_BR/report.json   |  1 +
 .../dashboard/i18n/locale/ro/report.json      |  1 +
 .../dashboard/i18n/locale/ru/report.json      |  1 +
 .../dashboard/i18n/locale/sk/report.json      |  1 +
 .../dashboard/i18n/locale/sr/report.json      |  1 +
 .../dashboard/i18n/locale/sv/report.json      |  1 +
 .../dashboard/i18n/locale/ta/report.json      |  1 +
 .../dashboard/i18n/locale/th/report.json      |  1 +
 .../dashboard/i18n/locale/tr/report.json      |  1 +
 .../dashboard/i18n/locale/uk/report.json      |  1 +
 .../dashboard/i18n/locale/ur/report.json      |  1 +
 .../dashboard/i18n/locale/ur_IN/report.json   |  1 +
 .../dashboard/i18n/locale/vi/report.json      |  1 +
 .../dashboard/i18n/locale/zh_CN/report.json   |  1 +
 .../dashboard/i18n/locale/zh_TW/report.json   |  1 +
 app/javascript/survey/i18n/locale/cs.json     | 10 +--
 app/javascript/widget/i18n/locale/cs.json     | 20 +++---
 app/javascript/widget/i18n/locale/fr.json     | 14 ++--
 config/locales/ar.yml                         | 10 +++
 config/locales/bg.yml                         | 10 +++
 config/locales/ca.yml                         | 10 +++
 config/locales/cs.yml                         | 10 +++
 config/locales/da.yml                         | 10 +++
 config/locales/de.yml                         | 10 +++
 config/locales/el.yml                         | 10 +++
 config/locales/es.yml                         | 10 +++
 config/locales/fa.yml                         | 10 +++
 config/locales/fi.yml                         | 10 +++
 config/locales/fr.yml                         | 10 +++
 config/locales/he.yml                         | 10 +++
 config/locales/hi.yml                         | 10 +++
 config/locales/hu.yml                         | 10 +++
 config/locales/id.yml                         | 10 +++
 config/locales/it.yml                         | 10 +++
 config/locales/ja.yml                         | 10 +++
 config/locales/ko.yml                         | 10 +++
 config/locales/lv.yml                         | 10 +++
 config/locales/ml.yml                         | 10 +++
 config/locales/ne.yml                         | 10 +++
 config/locales/nl.yml                         | 10 +++
 config/locales/no.yml                         | 10 +++
 config/locales/pl.yml                         | 10 +++
 config/locales/pt.yml                         | 10 +++
 config/locales/pt_BR.yml                      | 10 +++
 config/locales/ro.yml                         | 10 +++
 config/locales/ru.yml                         | 10 +++
 config/locales/sk.yml                         | 10 +++
 config/locales/sr.yml                         | 10 +++
 config/locales/sv.yml                         | 10 +++
 config/locales/ta.yml                         | 10 +++
 config/locales/th.yml                         | 10 +++
 config/locales/tr.yml                         | 10 +++
 config/locales/uk.yml                         | 10 +++
 config/locales/ur.yml                         | 10 +++
 config/locales/ur_IN.yml                      | 10 +++
 config/locales/vi.yml                         | 10 +++
 config/locales/zh_CN.yml                      | 10 +++
 config/locales/zh_TW.yml                      | 10 +++
 93 files changed, 568 insertions(+), 128 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
index b690b7036..19180a51a 100644
--- a/app/javascript/dashboard/i18n/locale/ar/report.json
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "تقارير CSAT",
     "NO_RECORDS": "لا توجد ردود متوفرة على الدراسة الاستقصائية CSAT.",
+    "DOWNLOAD": "تحميل تقرير رضاء خدمة العملاء",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "اختر الوكلاء"
diff --git a/app/javascript/dashboard/i18n/locale/bg/report.json b/app/javascript/dashboard/i18n/locale/bg/report.json
index 1d4f82066..939c9a51b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/report.json
+++ b/app/javascript/dashboard/i18n/locale/bg/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 0eb08ee74..2c5909d8b 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -21,7 +21,7 @@
       },
       "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.",
+        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
         "BTN_TEXT": "Save message signature",
         "API_ERROR": "Couldn't save signature! Try again",
         "API_SUCCESS": "Signature saved successfully"
diff --git a/app/javascript/dashboard/i18n/locale/ca/report.json b/app/javascript/dashboard/i18n/locale/ca/report.json
index 32d8c2625..6ffcf856f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/report.json
+++ b/app/javascript/dashboard/i18n/locale/ca/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index 1e5dc3228..42aec5950 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -7,7 +7,7 @@
       "404": "V této skupině nejsou žádné aktivní konverzace."
     },
     "TAB_HEADING": "Konverzace",
-    "MENTION_HEADING": "Mentions",
+    "MENTION_HEADING": "Zmínka",
     "SEARCH": {
       "INPUT": "Hledat lidi, chaty, Uložené odpovědi .."
     },
@@ -76,12 +76,12 @@
     "RECEIVED_VIA_EMAIL": "Obdrženo e-mailem",
     "VIEW_TWEET_IN_TWITTER": "Zobrazit tweet na Twitteru",
     "REPLY_TO_TWEET": "Odpovědět na tento tweet",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Přejít na instagram příběh",
     "SENT": "Sent successfully",
     "NO_MESSAGES": "Žádné zprávy",
     "NO_CONTENT": "Žádný obsah k dispozici",
     "HIDE_QUOTED_TEXT": "Hide Quoted Text",
     "SHOW_QUOTED_TEXT": "Show Quoted Text",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Přečteno"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index 34b519dd1..ee68d3fc0 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vyberte prosím konverzaci z levého panelu",
-    "UNVERIFIED_SESSION": "The identity of this user is not verified",
+    "UNVERIFIED_SESSION": "Identita tohoto uživatele není ověřena",
     "NO_MESSAGE_1": "Ale ne! Vypadá to, že ve vaší schránce nejsou žádné zprávy od zákazníků.",
     "NO_MESSAGE_2": " pro odeslání zprávy na vaši stránku!",
     "NO_INBOX_1": "Hola! Zdá se, že jste ještě nepřidali žádné schránky.",
@@ -22,7 +22,7 @@
     "LOADING_CONVERSATIONS": "Načítání konverzací",
     "CANNOT_REPLY": "Nemůžete odpovědět z důvodu",
     "24_HOURS_WINDOW": "24 hodinové omezení okna",
-    "NOT_ASSIGNED_TO_YOU": "This conversation is not assigned to you. Would you like to assign this conversation to yourself?",
+    "NOT_ASSIGNED_TO_YOU": "Tato konverzace vám není přiřazena. Chcete si přiřadit tuto konverzaci?",
     "ASSIGN_TO_ME": "Přiřadit mi",
     "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hodinové omezení okna",
@@ -32,7 +32,7 @@
     "DOWNLOAD": "Stáhnout",
     "UPLOADING_ATTACHMENTS": "Nahrávání příloh...",
     "SUCCESS_DELETE_MESSAGE": "Zpráva byla úspěšně smazána",
-    "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
+    "FAIL_DELETE_MESSSAGE": "Zpráva se nepodařilo odstranit! Zkuste to znovu",
     "NO_RESPONSE": "Bez odpovědi",
     "RATING_TITLE": "Hodnocení",
     "FEEDBACK_TITLE": "Zpětná vazba",
@@ -43,12 +43,12 @@
       "OPEN": "Více",
       "CLOSE": "Zavřít",
       "DETAILS": "Podrobnosti",
-      "SNOOZED_UNTIL_TOMORROW": "Snoozed until tomorrow",
-      "SNOOZED_UNTIL_NEXT_WEEK": "Snoozed until next week",
-      "SNOOZED_UNTIL_NEXT_REPLY": "Snoozed until next reply"
+      "SNOOZED_UNTIL_TOMORROW": "Odloženo do zítřka",
+      "SNOOZED_UNTIL_NEXT_WEEK": "Odloženo do příštího týdne",
+      "SNOOZED_UNTIL_NEXT_REPLY": "Odloženo do další odpovědi"
     },
     "RESOLVE_DROPDOWN": {
-      "MARK_PENDING": "Mark as pending",
+      "MARK_PENDING": "Označit jako nevyřízené",
       "SNOOZE": {
         "TITLE": "Odložit do",
         "NEXT_REPLY": "Další odpověď",
@@ -57,13 +57,13 @@
       }
     },
     "FOOTER": {
-      "MESSAGE_SIGN_TOOLTIP": "Message signature",
-      "ENABLE_SIGN_TOOLTIP": "Enable signature",
-      "DISABLE_SIGN_TOOLTIP": "Disable signature",
+      "MESSAGE_SIGN_TOOLTIP": "Podpis zprávy",
+      "ENABLE_SIGN_TOOLTIP": "Povolit podpis",
+      "DISABLE_SIGN_TOOLTIP": "Zakázat podpis",
       "MSG_INPUT": "Shift + zadejte pro nový řádek. Začněte '/' pro výběr zrušené odpovědi.",
       "PRIVATE_MSG_INPUT": "Shift + zadejte pro nový řádek. Toto bude viditelné pouze pro agenty",
       "MESSAGE_SIGNATURE_NOT_CONFIGURED": "Message signature is not configured, please configure it in profile settings.",
-      "CLICK_HERE": "Click here to update"
+      "CLICK_HERE": "Klikněte zde pro aktualizaci"
     },
     "REPLYBOX": {
       "REPLY": "Odpověď",
@@ -77,7 +77,7 @@
       "TIP_AUDIORECORDER_ICON": "Record audio",
       "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
       "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
-      "ENTER_TO_SEND": "Enter to send",
+      "ENTER_TO_SEND": "Enterem odeslat",
       "DRAG_DROP": "Drag and drop here to attach",
       "START_AUDIO_RECORDING": "Start audio recording",
       "STOP_AUDIO_RECORDING": "Stop audio recording",
@@ -101,11 +101,11 @@
     "CHANGE_AGENT": "Konverzace pověřená osoba změněna",
     "CHANGE_TEAM": "Tým konverzace se změnil",
     "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
-    "MESSAGE_ERROR": "Unable to send this message, please try again later",
+    "MESSAGE_ERROR": "Nepodařilo se odeslat tuto zprávu, zkuste to prosím později",
     "SENT_BY": "Odeslal:",
     "BOT": "Bot",
-    "SEND_FAILED": "Couldn't send message! Try again",
-    "TRY_AGAIN": "retry",
+    "SEND_FAILED": "Odeslání zprávy se nezdařilo! Zkuste to znovu",
+    "TRY_AGAIN": "opakovat",
     "ASSIGNMENT": {
       "SELECT_AGENT": "Vybrat agenta",
       "REMOVE": "Odebrat",
@@ -165,37 +165,37 @@
       "PLACEHOLDER": "Nic"
     },
     "ACCORDION": {
-      "CONTACT_DETAILS": "Contact Details",
-      "CONVERSATION_ACTIONS": "Conversation Actions",
-      "CONVERSATION_LABELS": "Conversation Labels",
-      "CONVERSATION_INFO": "Conversation Information",
-      "CONTACT_ATTRIBUTES": "Contact Attributes",
+      "CONTACT_DETAILS": "Podrobnosti kontaktu",
+      "CONVERSATION_ACTIONS": "Akce konverzace",
+      "CONVERSATION_LABELS": "Štítky konverzace",
+      "CONVERSATION_INFO": "Informace o konverzaci",
+      "CONTACT_ATTRIBUTES": "Atributy kontaktu",
       "PREVIOUS_CONVERSATION": "Předchozí konverzace"
     }
   },
   "CONVERSATION_CUSTOM_ATTRIBUTES": {
-    "ADD_BUTTON_TEXT": "Create attribute",
+    "ADD_BUTTON_TEXT": "Vytvořit atribut",
     "UPDATE": {
-      "SUCCESS": "Attribute updated successfully",
-      "ERROR": "Unable to update attribute. Please try again later"
+      "SUCCESS": "Atribut byl úspěšně aktualizován",
+      "ERROR": "Atribut nelze aktualizovat. Zkuste to prosím později"
     },
     "ADD": {
-      "TITLE": "Add",
-      "SUCCESS": "Attribute added successfully",
-      "ERROR": "Unable to add attribute. Please try again later"
+      "TITLE": "Přidat",
+      "SUCCESS": "Atribut byl úspěšně přidán",
+      "ERROR": "Nelze přidat atribut. Zkuste to prosím později"
     },
     "DELETE": {
-      "SUCCESS": "Attribute deleted successfully",
-      "ERROR": "Unable to delete attribute. Please try again later"
+      "SUCCESS": "Atribut byl úspěšně odstraněn",
+      "ERROR": "Atribut nelze odstranit. Zkuste to prosím později"
     },
     "ATTRIBUTE_SELECT": {
-      "TITLE": "Add attributes",
-      "PLACEHOLDER": "Search attributes",
-      "NO_RESULT": "No attributes found"
+      "TITLE": "Přidat atributy",
+      "PLACEHOLDER": "Hledat atributy",
+      "NO_RESULT": "Nebyly nalezeny žádné atributy"
     }
   },
   "EMAIL_HEADER": {
-    "FROM": "From",
+    "FROM": "Od",
     "TO": "Komu",
     "BCC": "Bcc",
     "CC": "Cc",
diff --git a/app/javascript/dashboard/i18n/locale/cs/report.json b/app/javascript/dashboard/i18n/locale/cs/report.json
index 204327bf9..38f86c702 100644
--- a/app/javascript/dashboard/i18n/locale/cs/report.json
+++ b/app/javascript/dashboard/i18n/locale/cs/report.json
@@ -53,7 +53,7 @@
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslední rok"
       },
       {
         "id": 5,
@@ -61,56 +61,56 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Použít",
       "PLACEHOLDER": "Select date range"
     },
     "GROUP_BY_FILTER_DROPDOWN_LABEL": "Group By",
     "GROUP_BY_DAY_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Den"
       }
     ],
     "GROUP_BY_WEEK_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Den"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Týden"
       }
     ],
     "GROUP_BY_MONTH_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Den"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Týden"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Měsíc"
       }
     ],
     "GROUP_BY_YEAR_OPTIONS": [
       {
         "id": 1,
-        "groupBy": "Day"
+        "groupBy": "Den"
       },
       {
         "id": 2,
-        "groupBy": "Week"
+        "groupBy": "Týden"
       },
       {
         "id": 3,
-        "groupBy": "Month"
+        "groupBy": "Měsíc"
       },
       {
         "id": 4,
-        "groupBy": "Year"
+        "groupBy": "Rok"
       }
     ],
     "BUSINESS_HOURS": "Pracovní doba"
@@ -170,7 +170,7 @@
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslední rok"
       },
       {
         "id": 5,
@@ -178,7 +178,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Použít",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -237,7 +237,7 @@
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslední rok"
       },
       {
         "id": 5,
@@ -245,7 +245,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Použít",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -304,7 +304,7 @@
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslední rok"
       },
       {
         "id": 5,
@@ -312,7 +312,7 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Použít",
       "PLACEHOLDER": "Select date range"
     }
   },
@@ -371,7 +371,7 @@
       },
       {
         "id": 4,
-        "name": "Last year"
+        "name": "Poslední rok"
       },
       {
         "id": 5,
@@ -379,13 +379,14 @@
       }
     ],
     "CUSTOM_DATE_RANGE": {
-      "CONFIRM": "Apply",
+      "CONFIRM": "Použít",
       "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"
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index ee18bc901..a08059631 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -154,7 +154,7 @@
     "SWITCH": "Switch",
     "CONVERSATIONS": "Konverzace",
     "ALL_CONVERSATIONS": "All Conversations",
-    "MENTIONED_CONVERSATIONS": "Mentions",
+    "MENTIONED_CONVERSATIONS": "Zmínka",
     "REPORTS": "Zprávy",
     "SETTINGS": "Nastavení",
     "CONTACTS": "Kontakty",
diff --git a/app/javascript/dashboard/i18n/locale/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
index 2f46ee1ef..2122b1077 100644
--- a/app/javascript/dashboard/i18n/locale/da/report.json
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index d289fd131..f62143d75 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT-Berichte",
     "NO_RECORDS": "Es sind keine Antworten zu CSAT Umfragen verfügbar.",
+    "DOWNLOAD": "CSAT-Berichte herunterladen",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Agenten wählen"
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index e0f284e48..b23400d4e 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "Τοποθετήσετε αυτόν τον κώδικα μέσα στο body tag της ιστοσελίδας σας",
       "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": "Ενεργοποιήσετε το πλαίσιο συλλογής email",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Ενεργοποίηση ή απενεργοποίηση του πλαισίου συλλογής μηνυμάτων ηλεκτρονικού ταχυδρομείου στη νέα συνομιλία",
diff --git a/app/javascript/dashboard/i18n/locale/el/report.json b/app/javascript/dashboard/i18n/locale/el/report.json
index 26fbcef0c..f0ad7ad88 100644
--- a/app/javascript/dashboard/i18n/locale/el/report.json
+++ b/app/javascript/dashboard/i18n/locale/el/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Αναφορές CSAT",
     "NO_RECORDS": "Δεν υπάρχουν διαθέσιμες απαντήσεις ερευνών CSAT.",
+    "DOWNLOAD": "Λήψη αναφορών CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Επιλέξτε Πράκτορες"
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index 943da01c4..2ba73dda2 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Reporte de encuestas de satisfacción",
     "NO_RECORDS": "No hay respuestas de encuestas de satisfacción disponibles.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Elegir agentes"
diff --git a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
index d0ff5b89b..8cf0f8971 100644
--- a/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fa/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "این دکمه را در تگ body قرار دهید",
       "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": "فعال یا غیرفعال کردن فرم دریافت ایمیل از کاربر",
diff --git a/app/javascript/dashboard/i18n/locale/fa/report.json b/app/javascript/dashboard/i18n/locale/fa/report.json
index 92a85236d..5ef58f275 100644
--- a/app/javascript/dashboard/i18n/locale/fa/report.json
+++ b/app/javascript/dashboard/i18n/locale/fa/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "گزارشات رضایت مشتری",
     "NO_RECORDS": "هیچ پاسخ برای نظرسنجی رضایت مشتری در دسترس نیست.",
+    "DOWNLOAD": "دانلود گزارش CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "ایجنت را انتخاب کنید"
diff --git a/app/javascript/dashboard/i18n/locale/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
index ee09078f3..9fc8a5b90 100644
--- a/app/javascript/dashboard/i18n/locale/fi/report.json
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/fr/report.json b/app/javascript/dashboard/i18n/locale/fr/report.json
index 9fc345726..d325abcc4 100644
--- a/app/javascript/dashboard/i18n/locale/fr/report.json
+++ b/app/javascript/dashboard/i18n/locale/fr/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Rapports CSAT",
     "NO_RECORDS": "Il n'y a aucune réponse à l'enquête CSAT disponible.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choisissez des agents"
diff --git a/app/javascript/dashboard/i18n/locale/he/report.json b/app/javascript/dashboard/i18n/locale/he/report.json
index 38f201c14..3bb7fc7b2 100644
--- a/app/javascript/dashboard/i18n/locale/he/report.json
+++ b/app/javascript/dashboard/i18n/locale/he/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
index 566099afe..2388e913a 100644
--- a/app/javascript/dashboard/i18n/locale/hi/report.json
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
index c8862daf2..915cf5e4b 100644
--- a/app/javascript/dashboard/i18n/locale/hu/report.json
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/id/report.json b/app/javascript/dashboard/i18n/locale/id/report.json
index fb1c86bd4..44619155b 100644
--- a/app/javascript/dashboard/i18n/locale/id/report.json
+++ b/app/javascript/dashboard/i18n/locale/id/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Laporan CSAT",
     "NO_RECORDS": "Tidak ada respons survey CSAT yang tersedia.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/it/report.json b/app/javascript/dashboard/i18n/locale/it/report.json
index 10700fed8..c4948c98c 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Rapporti CSAT",
     "NO_RECORDS": "Non ci sono risposte al sondaggio CSAT disponibili.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Scegli agenti"
diff --git a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
index 8c8e6cdf1..47f3b7e87 100644
--- a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
@@ -1,28 +1,28 @@
 {
   "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",
+    "SUBTITLE": "会話のフィルターを行うには、適用したいフィルターを選択して「フィルターを適用」を押してください。",
+    "ADD_NEW_FILTER": "フィルターを追加",
+    "FILTER_DELETE_ERROR": "保存するには少なくとも一つのフィルター選択が必要です。",
+    "SUBMIT_BUTTON_LABEL": "フィルターを適用",
     "CANCEL_BUTTON_LABEL": "キャンセル",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "フィルターをクリア",
+    "EMPTY_VALUE_ERROR": "値は必須です",
+    "TOOLTIP_LABEL": "会話をフィルターする",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "AND",
       "OR": "OR"
     },
     "OPERATOR_LABELS": {
-      "equal_to": "Equal to",
-      "not_equal_to": "Not equal to",
-      "contains": "Contains",
-      "does_not_contain": "Does not contain",
-      "is_present": "Is present",
-      "is_not_present": "Is not present",
-      "is_greater_than": "Is greater than",
-      "is_less_than": "Is lesser than",
-      "days_before": "Is x days before"
+      "equal_to": "等しい",
+      "not_equal_to": "等しくない",
+      "contains": "含む",
+      "does_not_contain": "含まない",
+      "is_present": "存在する",
+      "is_not_present": "存在しない",
+      "is_greater_than": "より大きい",
+      "is_less_than": "より小さい",
+      "days_before": "x日前"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "True",
@@ -30,16 +30,16 @@
     },
     "ATTRIBUTES": {
       "STATUS": "状況",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "担当者名",
       "INBOX_NAME": "受信トレイ名",
-      "TEAM_NAME": "Team Name",
+      "TEAM_NAME": "チーム名",
       "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "CAMPAIGN_NAME": "キャンペーンの名前",
       "LABELS": "ラベル",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
+      "BROWSER_LANGUAGE": "ブラウザの言語",
+      "COUNTRY_NAME": "国名",
+      "REFERER_LINK": "参照者のリンク",
+      "CUSTOM_ATTRIBUTE_LIST": "リスト",
       "CUSTOM_ATTRIBUTE_TEXT": "Text",
       "CUSTOM_ATTRIBUTE_NUMBER": "Number",
       "CUSTOM_ATTRIBUTE_LINK": "Link",
@@ -58,11 +58,11 @@
         "LABEL": "Name this filter",
         "PLACEHOLDER": "Enter a name for this filter",
         "ERROR_MESSAGE": "Name is required",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "フィルターの保存",
         "CANCEL_BUTTON": "キャンセル",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "フォルダが正常に作成されました",
+          "ERROR_MESSAGE": "フォルダの作成中にエラーが発生しました"
         },
         "API_SEGMENTS": {
           "SUCCESS_MESSAGE": "Segment created successfully",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
index f2579e780..0f9c139ae 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -186,7 +186,7 @@
     "SEARCH_BUTTON": "Search",
     "SEARCH_INPUT_PLACEHOLDER": "Search for contacts",
     "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
+    "FILTER_CONTACTS_SAVE": "フィルターの保存",
     "FILTER_CONTACTS_DELETE": "Delete filter",
     "LIST": {
       "LOADING_MESSAGE": "Loading contacts...",
diff --git a/app/javascript/dashboard/i18n/locale/ja/contactFilters.json b/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
index 16a4b5c75..f298bb3a8 100644
--- a/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/contactFilters.json
@@ -2,28 +2,28 @@
     "CONTACTS_FILTER": {
         "TITLE": "Filter Contacts",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
+        "ADD_NEW_FILTER": "フィルターを追加",
         "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "FILTER_DELETE_ERROR": "保存するには少なくとも一つのフィルター選択が必要です。",
         "SUBMIT_BUTTON_LABEL": "送信",
         "CANCEL_BUTTON_LABEL": "キャンセル",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
+        "CLEAR_BUTTON_LABEL": "フィルターをクリア",
+        "EMPTY_VALUE_ERROR": "値は必須です",
         "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",
+            "equal_to": "等しい",
+            "not_equal_to": "等しくない",
+            "contains": "含む",
+            "does_not_contain": "含まない",
+            "is_present": "存在する",
+            "is_not_present": "存在しない",
+            "is_greater_than": "より大きい",
             "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
+            "days_before": "x日前"
         },
         "ATTRIBUTES": {
             "NAME": "名前",
@@ -32,7 +32,7 @@
             "IDENTIFIER": "Identifier",
             "CITY": "City",
             "COUNTRY": "Country",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
+            "CUSTOM_ATTRIBUTE_LIST": "リスト",
             "CUSTOM_ATTRIBUTE_TEXT": "Text",
             "CUSTOM_ATTRIBUTE_NUMBER": "Number",
             "CUSTOM_ATTRIBUTE_LINK": "Link",
diff --git a/app/javascript/dashboard/i18n/locale/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
index b681e94d1..14475a5b5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/report.json
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
index f89e38cdf..387f222e5 100644
--- a/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/teamsSettings.json
@@ -1,15 +1,15 @@
 {
   "TEAMS_SETTINGS": {
-    "NEW_TEAM": "Create new team",
-    "HEADER": "Teams",
+    "NEW_TEAM": "チームを新規作成",
+    "HEADER": "チーム一覧",
     "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"
+      "404": "このアカウントにはまだ作成したチームはありません。",
+      "EDIT_TEAM": "チームを編集"
     },
     "CREATE_FLOW": {
       "CREATE": {
-        "TITLE": "Create a new team",
+        "TITLE": "チームを新規作成",
         "DESC": "Add a title and description to your new team."
       },
       "AGENTS": {
diff --git a/app/javascript/dashboard/i18n/locale/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
index d0f3e1679..24c3a2734 100644
--- a/app/javascript/dashboard/i18n/locale/ko/report.json
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/lv/report.json b/app/javascript/dashboard/i18n/locale/lv/report.json
index 566099afe..2388e913a 100644
--- a/app/javascript/dashboard/i18n/locale/lv/report.json
+++ b/app/javascript/dashboard/i18n/locale/lv/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/ml/report.json b/app/javascript/dashboard/i18n/locale/ml/report.json
index b5fd901e0..4afb8d383 100644
--- a/app/javascript/dashboard/i18n/locale/ml/report.json
+++ b/app/javascript/dashboard/i18n/locale/ml/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT റിപ്പോർട്ടുകൾ",
     "NO_RECORDS": "CSAT സർവേ പ്രതികരണങ്ങളൊന്നും ലഭ്യമല്ല.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/ne/report.json b/app/javascript/dashboard/i18n/locale/ne/report.json
index 566099afe..2388e913a 100644
--- a/app/javascript/dashboard/i18n/locale/ne/report.json
+++ b/app/javascript/dashboard/i18n/locale/ne/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/nl/report.json b/app/javascript/dashboard/i18n/locale/nl/report.json
index 06f50b9ab..ebb230146 100644
--- a/app/javascript/dashboard/i18n/locale/nl/report.json
+++ b/app/javascript/dashboard/i18n/locale/nl/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/no/report.json b/app/javascript/dashboard/i18n/locale/no/report.json
index 009368714..4ddd7089b 100644
--- a/app/javascript/dashboard/i18n/locale/no/report.json
+++ b/app/javascript/dashboard/i18n/locale/no/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/pl/report.json b/app/javascript/dashboard/i18n/locale/pl/report.json
index c45624ad6..c88a46795 100644
--- a/app/javascript/dashboard/i18n/locale/pl/report.json
+++ b/app/javascript/dashboard/i18n/locale/pl/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Raporty CSAT",
     "NO_RECORDS": "Brak dostępnych odpowiedzi na ankietę CSAT.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/pt/report.json b/app/javascript/dashboard/i18n/locale/pt/report.json
index 0d8fc3e46..0021dbd82 100644
--- a/app/javascript/dashboard/i18n/locale/pt/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Relatórios CSAT",
     "NO_RECORDS": "Sem dados CSAT disponíveis para reposta.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Escolher Agentes"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/report.json b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
index fb3c83861..ac7200c0c 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/report.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Relatórios CSAT",
     "NO_RECORDS": "Não há respostas de pesquisa em CSAT disponíveis.",
+    "DOWNLOAD": "Baixar relatórios de CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Escolher agentes"
diff --git a/app/javascript/dashboard/i18n/locale/ro/report.json b/app/javascript/dashboard/i18n/locale/ro/report.json
index e20f8888d..869db122c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/report.json
+++ b/app/javascript/dashboard/i18n/locale/ro/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Rapoarte CSAT",
     "NO_RECORDS": "Nu există răspunsuri predefinite disponibile în acest cont.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Alege agenți"
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 483646a14..8dc221b4e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Отчёты CSAT",
     "NO_RECORDS": "Нет ответов на опрос CSAT.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Выберите Операторов"
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index 1bf58d067..5ba7826a3 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/sr/report.json b/app/javascript/dashboard/i18n/locale/sr/report.json
index f67447fe5..f9fabfe4b 100644
--- a/app/javascript/dashboard/i18n/locale/sr/report.json
+++ b/app/javascript/dashboard/i18n/locale/sr/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/sv/report.json b/app/javascript/dashboard/i18n/locale/sv/report.json
index ebe38abe0..ae03214a4 100644
--- a/app/javascript/dashboard/i18n/locale/sv/report.json
+++ b/app/javascript/dashboard/i18n/locale/sv/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
index a9af84a42..ad9fd7104 100644
--- a/app/javascript/dashboard/i18n/locale/ta/report.json
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/th/report.json b/app/javascript/dashboard/i18n/locale/th/report.json
index c059a92bd..b0b2a56d3 100644
--- a/app/javascript/dashboard/i18n/locale/th/report.json
+++ b/app/javascript/dashboard/i18n/locale/th/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "รายงาน CSAT",
     "NO_RECORDS": "ไม่มีรายงาน CSAT ที่แสดงผลได้",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "เลือกพนักงาน"
diff --git a/app/javascript/dashboard/i18n/locale/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
index d57d444e4..5b535f729 100644
--- a/app/javascript/dashboard/i18n/locale/tr/report.json
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Temsilcileri Seç"
diff --git a/app/javascript/dashboard/i18n/locale/uk/report.json b/app/javascript/dashboard/i18n/locale/uk/report.json
index e95f0b228..cda566237 100644
--- a/app/javascript/dashboard/i18n/locale/uk/report.json
+++ b/app/javascript/dashboard/i18n/locale/uk/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Звіти CSAT",
     "NO_RECORDS": "Немає доступних відповідей для опитувань CSAT.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Виберіть Агентів"
diff --git a/app/javascript/dashboard/i18n/locale/ur/report.json b/app/javascript/dashboard/i18n/locale/ur/report.json
index 33175eec0..524e1f812 100644
--- a/app/javascript/dashboard/i18n/locale/ur/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/report.json b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
index 566099afe..2388e913a 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/report.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
index a33e0c94a..8ff6b2014 100644
--- a/app/javascript/dashboard/i18n/locale/vi/report.json
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Báo cáo CSAT",
     "NO_RECORDS": "Không có phản hồi báo cáo CSAT có sẵn.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/report.json b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
index faf200994..d41223fa0 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/report.json b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
index b31bdebda..ceb0f230e 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/report.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/report.json
@@ -386,6 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "CSAT Reports",
     "NO_RECORDS": "There are no CSAT survey responses available.",
+    "DOWNLOAD": "Download CSAT Reports",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Choose Agents"
diff --git a/app/javascript/survey/i18n/locale/cs.json b/app/javascript/survey/i18n/locale/cs.json
index 5e80c2694..7809d99e8 100644
--- a/app/javascript/survey/i18n/locale/cs.json
+++ b/app/javascript/survey/i18n/locale/cs.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Vážený zákazníku 👋, věnujte prosím několik okamžiků zpětné vazbě na konverzaci, kterou jste vedli s %{inboxName}.",
     "RATING": {
       "LABEL": "Ohodnoťte svou konverzaci",
       "SUCCESS_MESSAGE": "Děkujeme Vám za odeslání hodnocení"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "Máte nějaké připomínky, o které byste se rád podělil?",
+      "PLACEHOLDER": "Váš názor (volitelné)",
+      "BUTTON_TEXT": "Odeslat zpětnou vazbu"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Průzkum byl úspěšně aktualizován",
       "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
     }
   },
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
index 5df52e2ee..f0e721113 100644
--- a/app/javascript/widget/i18n/locale/cs.json
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -8,8 +8,8 @@
       "SUBMIT": "Odeslat"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Send message again",
-      "ERROR_MESSAGE": "Couldn't send, try again"
+      "RETRY": "Odeslat zprávu znovu",
+      "ERROR_MESSAGE": "Odeslání se nezdařilo, zkuste to znovu"
     }
   },
   "TEAM_AVAILABILITY": {
@@ -22,8 +22,8 @@
     "IN_A_DAY": "Obvykle odpoví za den"
   },
   "START_CONVERSATION": "Zahájit konverzaci",
-  "END_CONVERSATION": "End Conversation",
-  "CONTINUE_CONVERSATION": "Continue conversation",
+  "END_CONVERSATION": "Ukončit konverzaci",
+  "CONTINUE_CONVERSATION": "Pokračovat v konverzaci",
   "START_NEW_CONVERSATION": "Zahájit novou konverzaci",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Zobrazit nové zprávy",
@@ -49,14 +49,14 @@
       "EMAIL_ADDRESS": {
         "LABEL": "E-mailová adresa",
         "PLACEHOLDER": "Zadejte prosím Váš e-mail",
-        "REQUIRED_ERROR": "Email Address is required",
+        "REQUIRED_ERROR": "E-mailová adresa je vyžadována",
         "VALID_ERROR": "Zadejte prosím platnou e-mailovou adresu"
       },
       "PHONE_NUMBER": {
         "LABEL": "Telefonní číslo",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "PLACEHOLDER": "Zadejte prosím Vaše telefonní číslo",
+        "REQUIRED_ERROR": "Telefonní číslo je vyžadováno",
+        "VALID_ERROR": "Telefonní číslo by mělo být ve formátu E.164, např.: +141555555555"
       },
       "MESSAGE": {
         "LABEL": "Zpráva",
@@ -64,8 +64,8 @@
         "ERROR": "Zpráva je příliš krátká"
       }
     },
-    "CAMPAIGN_HEADER": "Please provide your name and email before starting the conversation",
-    "IS_REQUIRED": "is required"
+    "CAMPAIGN_HEADER": "Zadejte své jméno a e-mail před zahájením konverzace",
+    "IS_REQUIRED": "je vyžadováno"
   },
   "FILE_SIZE_LIMIT": "Soubor překračuje limit {MAXIMUM_FILE_UPLOAD_SIZE} přílohy",
   "CHAT_FORM": {
diff --git a/app/javascript/widget/i18n/locale/fr.json b/app/javascript/widget/i18n/locale/fr.json
index 728125ec7..df6afc085 100644
--- a/app/javascript/widget/i18n/locale/fr.json
+++ b/app/javascript/widget/i18n/locale/fr.json
@@ -8,7 +8,7 @@
       "SUBMIT": "Envoyer"
     },
     "MESSAGE_BUBBLE": {
-      "RETRY": "Envoyer à nouveau le message",
+      "RETRY": "Envoyer le message à nouveau",
       "ERROR_MESSAGE": "Impossible d'envoyer, réessayez"
     }
   },
@@ -49,14 +49,14 @@
       "EMAIL_ADDRESS": {
         "LABEL": "Adresse de courriel",
         "PLACEHOLDER": "Veuillez saisir votre adresse de courriel",
-        "REQUIRED_ERROR": "Email Address is required",
+        "REQUIRED_ERROR": "L'adresse courriel est requise",
         "VALID_ERROR": "Veuillez saisir une adresse de courriel valide"
       },
       "PHONE_NUMBER": {
         "LABEL": "Numéro de téléphone",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "PLACEHOLDER": "Veuillez entrer votre numéro de téléphone",
+        "REQUIRED_ERROR": "Le numéro de téléphone est requis",
+        "VALID_ERROR": "Le numéro de téléphone doit être au format E.164. Ex : +1415555555"
       },
       "MESSAGE": {
         "LABEL": "Message",
@@ -64,8 +64,8 @@
         "ERROR": "Message trop court"
       }
     },
-    "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre email avant de commencer la conversation",
-    "IS_REQUIRED": "is required"
+    "CAMPAIGN_HEADER": "Veuillez fournir votre nom et votre courriel avant de commencer la conversation",
+    "IS_REQUIRED": "est requis"
   },
   "FILE_SIZE_LIMIT": "Le fichier dépasse la limite de {MAXIMUM_FILE_UPLOAD_SIZE} pour les pièces jointes",
   "CHAT_FORM": {
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 35ed2e1b6..c5afdb402 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -45,6 +45,16 @@ ar:
       avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
       avg_resolution_time: متوسط وقت المحادثة (الدقائق)
     default_group_by: اليوم
+    csat:
+      headers:
+        contact_name: اسم جهة الاتصال
+        contact_email_address: عنوان البريد الإلكتروني الخاص بجهة الاتصال
+        contact_phone_number: رقم هاتف جهة الاتصال
+        link_to_the_conversation: رابط إلى المحادثة
+        agent_name: اسم الموظف
+        rating: التقييم
+        feedback: التعليق على الملاحظات
+        recorded_at: تاريخ التسجيل
   notifications:
     notification_title:
       conversation_creation: "[محادثة جديدة] - #%{display_id} تم إنشاؤها في %{inbox_name}"
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index e52248b3e..6469857f4 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -45,6 +45,16 @@ bg:
       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: Име на агента
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index e4b47f68b..269b98285 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -45,6 +45,16 @@ ca:
       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: Nom de l'Agent
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nova conversació] - #%{display_id} ha estat creada a %{inbox_name}"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 3a72b05d1..5cb16ce18 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -45,6 +45,16 @@ cs:
       avg_first_response_time: Prům. doba první odpovědi (minuty)
       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: Název agenta
+        rating: Hodnocení
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c2cc19c2a..34e42b394 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -45,6 +45,16 @@ da:
       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: Agentens Navn
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d39914a80..82354838b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -45,6 +45,16 @@ de:
       avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
       avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
     default_group_by: Tag
+    csat:
+      headers:
+        contact_name: Kontaktname
+        contact_email_address: Kontakt-E-Mail-Adresse
+        contact_phone_number: Kontakt Telefonnummer
+        link_to_the_conversation: Link zur Konversation
+        agent_name: Agentenname
+        rating: Bewertung
+        feedback: Feedback-Kommentar
+        recorded_at: Aufnahmedatum
   notifications:
     notification_title:
       conversation_creation: "[Neues Gespräch] - #%{display_id} wurde in %{inbox_name} erstellt"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index df71a715d..e7f9d219b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -45,6 +45,16 @@ el:
       avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
       avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
     default_group_by: ημέρα
+    csat:
+      headers:
+        contact_name: Όνομα Επαφής
+        contact_email_address: Διεύθυνση Email Επαφής
+        contact_phone_number: Αριθμός Τηλεφώνου Επαφής
+        link_to_the_conversation: Σύνδεσμος για την συνομιλία
+        agent_name: Όνομα Πράκτορα
+        rating: Αξιολόγηση
+        feedback: Σχόλιο ανατροφοδότησης
+        recorded_at: Ημερομηνία καταγραφής
   notifications:
     notification_title:
       conversation_creation: "[Νέα συνομιλία] - #%{display_id} δημιουργήθηκε στο %{inbox_name}"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4b8e36eb7..9ae7f5ab0 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -45,6 +45,16 @@ es:
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
     default_group_by: día
+    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: Nombre del agente
+        rating: Calificación
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nueva conversación] - #%{display_id} ha sido creado en %{inbox_name}"
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index ad250ec62..94d15d78a 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -45,6 +45,16 @@ fa:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     default_group_by: روز
+    csat:
+      headers:
+        contact_name: نام تماس
+        contact_email_address: آدرس ایمیل تماس
+        contact_phone_number: شماره تلفن تماس
+        link_to_the_conversation: پیوند به گفتگو
+        agent_name: اسم ایجنت
+        rating: رتبه
+        feedback: بازخورد نظر
+        recorded_at: تاریخ ثبت شده
   notifications:
     notification_title:
       conversation_creation: "[گفتگو جدید] - #%{display_id} در %{inbox_name} ایجاد شده است"
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 552fc7eb7..abc42d30c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -45,6 +45,16 @@ fi:
       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: Edustajan nimi
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 129940293..f24823871 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -45,6 +45,16 @@ fr:
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
     default_group_by: jour
+    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: Nom de l'agent
+        rating: Note
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nouvelle conversation] - #%{display_id} a été créé dans %{inbox_name}"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index d605b98b0..7013aeec9 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -45,6 +45,16 @@ he:
       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: שם סוכן
+        rating: דירוג
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index 0e045faad..fe9e0e127 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -45,6 +45,16 @@ hi:
       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}"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 70b38bc1b..03949320d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -45,6 +45,16 @@ hu:
       avg_first_response_time: Átlagos első reakcióidő (perc)
       avg_resolution_time: Átlagos megoldási idő (perc)
     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: Ügynök neve
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Új beszélgetés] - #%{display_id} létrejött itt:%{inbox_name}"
diff --git a/config/locales/id.yml b/config/locales/id.yml
index a462a8fcb..598a2952f 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -45,6 +45,16 @@ id:
       avg_first_response_time: Rata-rata waktu respons pertama (Menit)
       avg_resolution_time: Rata-rata waktu resolusi (Menit)
     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: Nama Agen
+        rating: Peringkat
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Percakapan baru] - #%{display_id} telah dibuat di %{inbox_name}"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a3864d218..fabe6efdd 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -45,6 +45,16 @@ it:
       avg_first_response_time: Tempo medio di prima risposta (minuti)
       avg_resolution_time: Tempo medio di risoluzione (minuti)
     default_group_by: giorno
+    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: Nome dell'agente
+        rating: Valutazione
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nuova conversazione] - #%{display_id} è stato creato in %{inbox_name}"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index e55f52c5d..50f1afb0e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -45,6 +45,16 @@ ja:
       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: 担当者名
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e0e4ba8ff..a9032f824 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -45,6 +45,16 @@ ko:
       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: 에이전트 이름
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index c284b2a61..6ed29e8f7 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -45,6 +45,16 @@ lv:
       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}"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 2fdee2596..7c80c69f4 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -45,6 +45,16 @@ ml:
       avg_first_response_time: Avg first response time (Minutes)
       avg_resolution_time: Avg resolution time (Minutes)
     default_group_by: ദിവസം
+    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: ഏജന്റിന്റെ പേര്
+        rating: റേറ്റിംഗ്
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index b5c5e27c7..15f26703f 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -45,6 +45,16 @@ ne:
       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}"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index aac903a2d..ed10eba6c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -45,6 +45,16 @@ nl:
       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: Naam medewerker
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 35f78f939..f134f24af 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -45,6 +45,16 @@
       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 navn
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5af376b28..cf3676f1e 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -45,6 +45,16 @@ pl:
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     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: Nazwa agenta
+        rating: Ocena
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nowa rozmowa] - #%{display_id} został utworzony w %{inbox_name}"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index ed033cea8..c8a310aff 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -45,6 +45,16 @@ pt:
       avg_first_response_time: Média do tempo de resposta (minutos)
       avg_resolution_time: Média do tempo de resolução (minutos)
     default_group_by: dia
+    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: Nome do Representante
+        rating: Avaliar
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Nova conversa] - #%{display_id} foi criada em %{inbox_name}"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 2f7a8aeec..c8fb9090b 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -45,6 +45,16 @@ pt_BR:
       avg_first_response_time: Tempo médio de primeira resposta (minutos)
       avg_resolution_time: Tempo médio de resolução (minutos)
     default_group_by: dia
+    csat:
+      headers:
+        contact_name: Nome do contato
+        contact_email_address: E-mail de contato
+        contact_phone_number: Telefone de contato
+        link_to_the_conversation: Link para a conversa
+        agent_name: Nome do Agente
+        rating: Classificação
+        feedback: Comentário de Feedback
+        recorded_at: Data de gravação
   notifications:
     notification_title:
       conversation_creation: "[Nova conversa] - #%{display_id} foi criado em %{inbox_name}"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index aaf9c81f0..adcad7a68 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -45,6 +45,16 @@ ro:
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     default_group_by: zi
+    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: Nume Agent
+        rating: Evaluare
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Conversație nouă] - #%{display_id} a fost creat în %{inbox_name}"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index f15779328..ce5ae1d54 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -45,6 +45,16 @@ ru:
       avg_first_response_time: Среднее время первого ответа (в минутах)
       avg_resolution_time: Среднее время решения (в минутах)
     default_group_by: день
+    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: Имя оператора
+        rating: Оценка
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Новая беседа] - #%{display_id} была создана в %{inbox_name}"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 6a410382a..02406b0b3 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -45,6 +45,16 @@ sk:
       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: Meno agenta
+        rating: Hodnotenia
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index b67c836e6..04ab3bf57 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -45,6 +45,16 @@ sr-Latn:
       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: Ime agenta
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 232d8953f..ef685a384 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -45,6 +45,16 @@ sv:
       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: Agentens namn
+        rating: Betyg
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Ny konversation] - #%{display_id} har skapats i %{inbox_name}"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index 3639960e8..e8c2d09c5 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -45,6 +45,16 @@ ta:
       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: ஏஜென்ட் பெயர்
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 2932759a2..4290ff009 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -45,6 +45,16 @@ th:
       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: ชื่อพนักงาน
+        rating: การประเมิน
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index f74ddec45..3a79c0791 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -45,6 +45,16 @@ tr:
       avg_first_response_time: Ortalama cevap süresi(dakika)
       avg_resolution_time: Ortalama çözüm üretme süresi(dakika)
     default_group_by: gün
+    csat:
+      headers:
+        contact_name: Contact Name
+        contact_email_address: Contact Email Address
+        contact_phone_number: Contact Phone Number
+        link_to_the_conversation: Görüşmenin bağlantısı
+        agent_name: Kullanıcı Adı
+        rating: Değerlendirme
+        feedback: Değerlendirme Yorumu
+        recorded_at: Kaydedilen tarih
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 679312262..956eb0a9b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -45,6 +45,16 @@ uk:
       avg_first_response_time: Середній час першої відповіді (Хвилин)
       avg_resolution_time: Середній час вирішення (Хвилин)
     default_group_by: день
+    csat:
+      headers:
+        contact_name: Ім'я контакту
+        contact_email_address: Email
+        contact_phone_number: Контактний телефон
+        link_to_the_conversation: Посилання на бесіду
+        agent_name: Ім'я агента
+        rating: Оцінка
+        feedback: Відгук
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Новий діалог] - #%{display_id} було створено в %{inbox_name}"
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 65c47be7d..633be0001 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -45,6 +45,16 @@ ur:
       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: ایجنٹ کا نام
+        rating: درجہ بندی
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 65c47be7d..6887bb4b9 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -45,6 +45,16 @@ ur:
       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}"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index fb74fa259..e82342c64 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -45,6 +45,16 @@ vi:
       avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
       avg_resolution_time: Thời gian giải quyết trung bình (phút)
     default_group_by: ngày
+    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: Tên nhà cung cấp
+        rating: Đánh giá
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[Cuộc trò chuyện mới] - #%{display_id} đã được tạo trong %{inbox_name}"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 40b2d77ed..0c9f79573 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -45,6 +45,16 @@ zh_CN:
       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: 客服名称
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[New conversation] - #%{display_id} has been created in %{inbox_name}"
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index 3463aa64e..e8cde15fd 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -45,6 +45,16 @@ zh_TW:
       avg_first_response_time: 平均第一次回覆時間（分鐘）
       avg_resolution_time: 平均解決時間（分鐘）
     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: 客服姓名
+        rating: Rating
+        feedback: Feedback Comment
+        recorded_at: Recorded date
   notifications:
     notification_title:
       conversation_creation: "[新對話] - #%{display_id} 已經在 %{inbox_name} 中被建立"

From 79280ae372a7e1522756babb6300b1c68f3aa07f Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 23 May 2022 12:46:17 +0530
Subject: [PATCH 123/177] chore: Enable Ukrainian language (uk) (#4720)

---
 config/initializers/languages.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index 239c0a2eb..f177b8cbb 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -34,7 +34,8 @@ LANGUAGES_CONFIG = {
   29 => { name: 'norsk (no)', iso_639_3_code: 'nor', iso_639_1_code: 'no', enabled: true },
   30 => { name: '中文 (zh-CN)', iso_639_3_code: 'zho', iso_639_1_code: 'zh_CN', enabled: true },
   31 => { name: 'język polski (pl)', iso_639_3_code: 'pol', iso_639_1_code: 'pl', enabled: true },
-  32 => { name: 'slovenčina (sk)', iso_639_3_code: 'slk', iso_639_1_code: 'sk', enabled: true }
+  32 => { name: 'slovenčina (sk)', iso_639_3_code: 'slk', iso_639_1_code: 'sk', enabled: true },
+  33 => { name: 'украї́нська мо́ва (uk)', iso_639_3_code: 'ukr', iso_639_1_code: 'uk', enabled: true }
 }.filter { |_key, val| val[:enabled] }.freeze
 
 Rails.configuration.i18n.available_locales = LANGUAGES_CONFIG.map { |_index, lang| lang[:iso_639_1_code].to_sym }

From 56cd9bc0b873a5416cd1e210bfee1701e35f04e4 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 23 May 2022 19:24:07 +0530
Subject: [PATCH 124/177] chore: Add Assignable Agents API (#4722)

---
 .../accounts/assignable_agents_controller.rb  | 24 +++++++
 .../api/v1/accounts/inboxes_controller.rb     |  1 +
 .../dashboard/api/assignableAgents.js         | 16 +++++
 app/javascript/dashboard/api/inboxes.js       |  4 --
 .../api/specs/assignableAgents.spec.js        | 18 +++++
 .../dashboard/api/specs/inboxes.spec.js       |  8 ---
 .../store/modules/inboxAssignableAgents.js    |  4 +-
 .../assignable_agents/index.json.jbuilder     |  5 ++
 config/routes.rb                              |  2 +-
 .../assignable_agents_controller_spec.rb      | 67 +++++++++++++++++++
 10 files changed, 134 insertions(+), 15 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/assignable_agents_controller.rb
 create mode 100644 app/javascript/dashboard/api/assignableAgents.js
 create mode 100644 app/javascript/dashboard/api/specs/assignableAgents.spec.js
 create mode 100644 app/views/api/v1/accounts/assignable_agents/index.json.jbuilder
 create mode 100644 spec/controllers/api/v1/accounts/assignable_agents_controller_spec.rb

diff --git a/app/controllers/api/v1/accounts/assignable_agents_controller.rb b/app/controllers/api/v1/accounts/assignable_agents_controller.rb
new file mode 100644
index 000000000..a712342dd
--- /dev/null
+++ b/app/controllers/api/v1/accounts/assignable_agents_controller.rb
@@ -0,0 +1,24 @@
+class Api::V1::Accounts::AssignableAgentsController < Api::V1::Accounts::BaseController
+  before_action :fetch_inboxes
+
+  def index
+    agent_ids = @inboxes.map do |inbox|
+      authorize inbox, :show?
+      member_ids = inbox.members.pluck(:user_id)
+      member_ids
+    end
+    agent_ids = agent_ids.inject(:&)
+    agents = Current.account.users.where(id: agent_ids)
+    @assignable_agents = (agents + Current.account.administrators).uniq
+  end
+
+  private
+
+  def fetch_inboxes
+    @inboxes = Current.account.inboxes.find(permitted_params[:inbox_ids])
+  end
+
+  def permitted_params
+    params.permit(inbox_ids: [])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 66a71985d..4bc85546a 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -12,6 +12,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def show; end
 
+  # Deprecated: This API will be removed in 2.7.0
   def assignable_agents
     @assignable_agents = (Current.account.users.where(id: @inbox.members.select(:user_id)) + Current.account.administrators).uniq
   end
diff --git a/app/javascript/dashboard/api/assignableAgents.js b/app/javascript/dashboard/api/assignableAgents.js
new file mode 100644
index 000000000..5b999facf
--- /dev/null
+++ b/app/javascript/dashboard/api/assignableAgents.js
@@ -0,0 +1,16 @@
+/* global axios */
+import ApiClient from './ApiClient';
+
+class AssignableAgents extends ApiClient {
+  constructor() {
+    super('assignable_agents', { accountScoped: true });
+  }
+
+  get(inboxIds) {
+    return axios.get(this.url, {
+      params: { inbox_ids: inboxIds },
+    });
+  }
+}
+
+export default new AssignableAgents();
diff --git a/app/javascript/dashboard/api/inboxes.js b/app/javascript/dashboard/api/inboxes.js
index 1cf6ba113..a76ef1414 100644
--- a/app/javascript/dashboard/api/inboxes.js
+++ b/app/javascript/dashboard/api/inboxes.js
@@ -6,10 +6,6 @@ class Inboxes extends ApiClient {
     super('inboxes', { accountScoped: true });
   }
 
-  getAssignableAgents(inboxId) {
-    return axios.get(`${this.url}/${inboxId}/assignable_agents`);
-  }
-
   getCampaigns(inboxId) {
     return axios.get(`${this.url}/${inboxId}/campaigns`);
   }
diff --git a/app/javascript/dashboard/api/specs/assignableAgents.spec.js b/app/javascript/dashboard/api/specs/assignableAgents.spec.js
new file mode 100644
index 000000000..6c9c5ec9a
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/assignableAgents.spec.js
@@ -0,0 +1,18 @@
+import assignableAgentsAPI from '../assignableAgents';
+import describeWithAPIMock from './apiSpecHelper';
+
+describe('#AssignableAgentsAPI', () => {
+  describeWithAPIMock('API calls', context => {
+    it('#getAssignableAgents', () => {
+      assignableAgentsAPI.get([1]);
+      expect(context.axiosMock.get).toHaveBeenCalledWith(
+        '/api/v1/assignable_agents',
+        {
+          params: {
+            inbox_ids: [1],
+          },
+        }
+      );
+    });
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inboxes.spec.js b/app/javascript/dashboard/api/specs/inboxes.spec.js
index b261bb930..0d755d44a 100644
--- a/app/javascript/dashboard/api/specs/inboxes.spec.js
+++ b/app/javascript/dashboard/api/specs/inboxes.spec.js
@@ -10,17 +10,9 @@ describe('#InboxesAPI', () => {
     expect(inboxesAPI).toHaveProperty('create');
     expect(inboxesAPI).toHaveProperty('update');
     expect(inboxesAPI).toHaveProperty('delete');
-    expect(inboxesAPI).toHaveProperty('getAssignableAgents');
     expect(inboxesAPI).toHaveProperty('getCampaigns');
   });
   describeWithAPIMock('API calls', context => {
-    it('#getAssignableAgents', () => {
-      inboxesAPI.getAssignableAgents(1);
-      expect(context.axiosMock.get).toHaveBeenCalledWith(
-        '/api/v1/inboxes/1/assignable_agents'
-      );
-    });
-
     it('#getCampaigns', () => {
       inboxesAPI.getCampaigns(2);
       expect(context.axiosMock.get).toHaveBeenCalledWith(
diff --git a/app/javascript/dashboard/store/modules/inboxAssignableAgents.js b/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
index 31a2d98d0..1acb6897a 100644
--- a/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
+++ b/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 
-import InboxesAPI from 'dashboard/api/inboxes.js';
+import AssignableAgentsAPI from '../../api/assignableAgents';
 
 const state = {
   records: {},
@@ -31,7 +31,7 @@ export const actions = {
     try {
       const {
         data: { payload },
-      } = await InboxesAPI.getAssignableAgents(inboxId);
+      } = await AssignableAgentsAPI.get([inboxId]);
       commit(types.SET_INBOX_ASSIGNABLE_AGENTS, { inboxId, members: payload });
     } catch (error) {
       throw new Error(error);
diff --git a/app/views/api/v1/accounts/assignable_agents/index.json.jbuilder b/app/views/api/v1/accounts/assignable_agents/index.json.jbuilder
new file mode 100644
index 000000000..af71dea1e
--- /dev/null
+++ b/app/views/api/v1/accounts/assignable_agents/index.json.jbuilder
@@ -0,0 +1,5 @@
+json.payload do
+  json.array! @assignable_agents do |agent|
+    json.partial! 'api/v1/models/agent.json.jbuilder', resource: agent
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index a80f6ca39..b2029a739 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,7 +43,7 @@ Rails.application.routes.draw do
           resource :bulk_actions, only: [:create]
           resources :agents, only: [:index, :create, :update, :destroy]
           resources :agent_bots, only: [:index, :create, :show, :update, :destroy]
-
+          resources :assignable_agents, only: [:index]
           resources :callbacks, only: [] do
             collection do
               post :register_facebook_page
diff --git a/spec/controllers/api/v1/accounts/assignable_agents_controller_spec.rb b/spec/controllers/api/v1/accounts/assignable_agents_controller_spec.rb
new file mode 100644
index 000000000..6f1a068ee
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/assignable_agents_controller_spec.rb
@@ -0,0 +1,67 @@
+require 'rails_helper'
+
+RSpec.describe 'Assignable Agents API', type: :request do
+  let(:account) { create(:account) }
+  let(:agent1) { create(:user, account: account, role: :agent) }
+  let!(:agent2) { create(:user, account: account, role: :agent) }
+  let!(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'GET /api/v1/accounts/{account.id}/assignable_agents' do
+    let(:inbox1) { create(:inbox, account: account) }
+    let(:inbox2) { create(:inbox, account: account) }
+
+    before do
+      create(:inbox_member, user: agent1, inbox: inbox1)
+      create(:inbox_member, user: agent1, inbox: inbox2)
+    end
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/assignable_agents"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when the user is not part of an inbox' do
+      context 'when the user is an admininstrator' do
+        it 'returns all assignable inbox members along with administrators' do
+          get "/api/v1/accounts/#{account.id}/assignable_agents",
+              params: { inbox_ids: [inbox1.id, inbox2.id] },
+              headers: admin.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:success)
+          response_data = JSON.parse(response.body, symbolize_names: true)[:payload]
+          expect(response_data.size).to eq(2)
+          expect(response_data.pluck(:role)).to include('agent', 'administrator')
+        end
+      end
+
+      context 'when the user is an agent' do
+        it 'returns unauthorized' do
+          get "/api/v1/accounts/#{account.id}/assignable_agents",
+              params: { inbox_ids: [inbox1.id, inbox2.id] },
+              headers: agent2.create_new_auth_token,
+              as: :json
+
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+    end
+
+    context 'when the user is part of the inbox' do
+      it 'returns all assignable inbox members along with administrators' do
+        get "/api/v1/accounts/#{account.id}/assignable_agents",
+            params: { inbox_ids: [inbox1.id, inbox2.id] },
+            headers: agent1.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_data = JSON.parse(response.body, symbolize_names: true)[:payload]
+        expect(response_data.size).to eq(2)
+        expect(response_data.pluck(:role)).to include('agent', 'administrator')
+      end
+    end
+  end
+end

From d20eafbda4719693a9c0084c84f5311eab00250e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 11:12:19 +0530
Subject: [PATCH 125/177] chore(deps): bump nokogiri from 1.13.5 to 1.13.6
 (#4734)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.5 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.5...v1.13.6)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

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

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 253c35da6..880390f16 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -378,14 +378,14 @@ GEM
     netrc (0.11.0)
     newrelic_rpm (8.7.0)
     nio4r (2.5.8)
-    nokogiri (1.13.5)
+    nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    nokogiri (1.13.5-arm64-darwin)
+    nokogiri (1.13.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.5-x86_64-darwin)
+    nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.5-x86_64-linux)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     oauth (0.5.8)
     orm_adapter (0.5.0)

From baa3efaf0ef0d59555d2c3df6ce04303a31b45a2 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 24 May 2022 22:15:57 +0530
Subject: [PATCH 126/177] chore: Update cache name in Circle CI builds (#4738)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 974b981ab..076903576 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,14 +40,13 @@ jobs:
 
       - restore_cache:
           keys:
-            - chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
-            - chatwoot-bundle
+            - chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
 
       - run: bundle install --frozen --path ~/.bundle
       - save_cache:
           paths:
             - ~/.bundle
-          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-{{ checksum "Gemfile.lock" }}
+          key: chatwoot-bundle-{{ .Environment.CACHE_VERSION }}-v20220524-{{ checksum "Gemfile.lock" }}
 
 
       # Only necessary if app uses webpacker or yarn in some other way

From 22d22cf4c3c5166b653653dfafac9b557975cbb7 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Wed, 25 May 2022 12:30:00 +0530
Subject: [PATCH 127/177] feat: Improve Linux installation experience (#4713)

* feat: improve linux install script

* feat: setup logging and reduce verboseness

- redirect output/error to logfile
- reduce verboseness in main script exection
- trap non-zero exit

* chore: remove debug logging

* feat: fix exit handler

* improve legibility

* Apply suggestions from code review

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

* chore: improve formatting

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 deployment/setup_20.04.sh | 405 +++++++++++++++++++++++++-------------
 1 file changed, 263 insertions(+), 142 deletions(-)

diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 14a0b74f6..13c26f513 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -1,164 +1,285 @@
 #!/usr/bin/env bash
 
 # Description: Chatwoot installation script
-# OS: Ubuntu 20.04 LTS / Ubuntu 20.10
-# Script Version: 0.8
+# OS: Ubuntu 20.04 LTS
+# Script Version: 1.0
 # Run this script as root
 
-read -p 'Would you like to configure a domain and SSL for Chatwoot?(yes or no): ' configure_webserver
+set -eu -o pipefail
+trap exit_handler EXIT
 
-if [ $configure_webserver == "yes" ]
-then
-read -p 'Enter your sub-domain to be used for Chatwoot (chatwoot.domain.com for example) : ' domain_name
-echo -e "\nThis script will try to generate SSL certificates via LetsEncrypt and serve chatwoot at
-"https://$domain_name". Proceed further once you have pointed your DNS to the IP of the instance.\n"
-read -p 'Enter the email LetsEncrypt can use to send reminders when your SSL certificate is up for renewal: ' le_email
-read -p 'Do you wish to proceed? (yes or no): ' exit_true
-if [ $exit_true == "no" ]
-then
-exit 1
-fi
+function exit_handler() {
+  if [ "$?" -ne 0 ]; then
+   echo -en "\nSome error has occured. Check '/var/log/chatwoot-setup.log' for details.\n"
+   exit 1
+  fi
+}
+
+if [ "$(id -u)" -ne 0 ]; then
+  echo 'This script should be run as root.' >&2
+  exit 1
 fi
 
-read -p 'Would you like to install postgres and redis?(Answer no if you plan to use external services): ' install_pg_redis
-
-if [ $install_pg_redis == "no" ]
-then
-echo "***** Skipping pg and redis installation. ****"
-fi
-
-apt update && apt upgrade -y
-apt install -y curl
-curl -sL https://deb.nodesource.com/setup_12.x | bash -
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-apt update
-
-apt install -y \
-    git software-properties-common imagemagick libpq-dev \
-    libxml2-dev libxslt1-dev file g++ gcc autoconf build-essential \
-    libssl-dev libyaml-dev libreadline-dev gnupg2 \
-    postgresql-client redis-tools \
-    nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
-    libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev sudo
-
-if [ $install_pg_redis != "no" ]
-then
-apt install -y postgresql postgresql-contrib redis-server
-fi
-
-if [ $configure_webserver == "yes" ]
-then
-apt install -y nginx nginx-full certbot python3-certbot-nginx
-fi
-
-adduser --disabled-login --gecos "" chatwoot
-
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
-curl -sSL https://get.rvm.io | bash -s stable
-adduser chatwoot rvm
-
-if [ $install_pg_redis != "no" ]
-then
-pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
-sudo -i -u postgres psql << EOF
-\set pass `echo $pg_pass`
-CREATE USER chatwoot CREATEDB;
-ALTER USER chatwoot PASSWORD :'pass';
-ALTER ROLE chatwoot SUPERUSER;
-UPDATE pg_database SET datistemplate = FALSE WHERE datname = 'template1';
-DROP DATABASE template1;
-CREATE DATABASE template1 WITH TEMPLATE = template0 ENCODING = 'UNICODE';
-UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template1';
-\c template1
-VACUUM FREEZE;
-EOF
-
-systemctl enable redis-server.service
-systemctl enable postgresql
-fi
-
-secret=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 63 ; echo '')
-RAILS_ENV=production
-
-sudo -i -u chatwoot << EOF
-rvm --version
-rvm autolibs disable
-rvm install "ruby-3.0.2"
-rvm use 3.0.2 --default
-
-git clone https://github.com/chatwoot/chatwoot.git
-cd chatwoot
 if [[ -z "$1" ]]; then
-git checkout master;
+  BRANCH="master"
 else
-git checkout $1;
+  BRANCH="$1"
 fi
-bundle
-yarn
 
-cp .env.example .env
-sed -i -e "/SECRET_KEY_BASE/ s/=.*/=$secret/" .env
-sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
-sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
-sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
-sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
-sed -i -e '/RAILS_ENV/ s/=.*/=$RAILS_ENV/' .env
-echo -en "\nINSTALLATION_ENV=linux_script" >> ".env"
+function get_domain_info() {
+  read -rp 'Enter the domain/subdomain for Chatwoot (e.g., chatwoot.domain.com) :' domain_name
+  read -rp 'Enter an email address for LetsEncrypt to send reminders when your SSL certificate is up for renewal :' le_email
+  cat << EOF
 
-rake assets:precompile RAILS_ENV=production
+This script will generate SSL certificates via LetsEncrypt and serve Chatwoot at
+https://$domain_name. Proceed further once you have pointed your DNS to the IP of the instance.
+
+EOF
+  read -rp 'Do you wish to proceed? (yes or no): ' exit_true
+  if [ "$exit_true" == "no" ]
+  then
+    exit 1
+  fi
+}
+
+function install_dependencies() {
+  apt update && apt upgrade -y
+  apt install -y curl
+  curl -sL https://deb.nodesource.com/setup_12.x | bash -
+  curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+  echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+  apt update
+
+  apt install -y \
+      git software-properties-common imagemagick libpq-dev \
+      libxml2-dev libxslt1-dev file g++ gcc autoconf build-essential \
+      libssl-dev libyaml-dev libreadline-dev gnupg2 \
+      postgresql-client redis-tools \
+      nodejs yarn patch ruby-dev zlib1g-dev liblzma-dev \
+      libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev sudo
+}
+
+function install_databases() {
+  apt install -y postgresql postgresql-contrib redis-server
+}
+
+function install_webserver() {
+  apt install -y nginx nginx-full certbot python3-certbot-nginx
+}
+
+function configure_rvm() {
+  adduser --disabled-login --gecos "" chatwoot
+
+  gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+  gpg2 --keyserver hkp://keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+  curl -sSL https://get.rvm.io | bash -s stable
+  adduser chatwoot rvm
+}
+
+function configure_db() {
+  pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
+  sudo -i -u postgres psql << EOF
+  \set pass `echo $pg_pass`
+  CREATE USER chatwoot CREATEDB;
+  ALTER USER chatwoot PASSWORD :'pass';
+  ALTER ROLE chatwoot SUPERUSER;
+  UPDATE pg_database SET datistemplate = FALSE WHERE datname = 'template1';
+  DROP DATABASE template1;
+  CREATE DATABASE template1 WITH TEMPLATE = template0 ENCODING = 'UNICODE';
+  UPDATE pg_database SET datistemplate = TRUE WHERE datname = 'template1';
+  \c template1
+  VACUUM FREEZE;
 EOF
 
-if [ $install_pg_redis != "no" ]
-then
-sudo -i -u chatwoot << EOF
-cd chatwoot
-RAILS_ENV=production bundle exec rake db:create
-RAILS_ENV=production bundle exec rake db:reset
+  systemctl enable redis-server.service
+  systemctl enable postgresql
+
+}
+
+function setup_chatwoot() {
+  secret=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 63 ; echo '')
+  RAILS_ENV=production
+
+  sudo -i -u chatwoot << EOF
+  rvm --version
+  rvm autolibs disable
+  rvm install "ruby-3.0.2"
+  rvm use 3.0.2 --default
+
+  git clone https://github.com/chatwoot/chatwoot.git
+  cd chatwoot
+  git checkout "$BRANCH"
+  bundle
+  yarn
+
+  cp .env.example .env
+  sed -i -e "/SECRET_KEY_BASE/ s/=.*/=$secret/" .env
+  sed -i -e '/REDIS_URL/ s/=.*/=redis:\/\/localhost:6379/' .env
+  sed -i -e '/POSTGRES_HOST/ s/=.*/=localhost/' .env
+  sed -i -e '/POSTGRES_USERNAME/ s/=.*/=chatwoot/' .env
+  sed -i -e "/POSTGRES_PASSWORD/ s/=.*/=$pg_pass/" .env
+  sed -i -e '/RAILS_ENV/ s/=.*/=$RAILS_ENV/' .env
+  echo -en "\nINSTALLATION_ENV=linux_script" >> ".env"
+
+  rake assets:precompile RAILS_ENV=production
 EOF
-fi
 
-cp /home/chatwoot/chatwoot/deployment/chatwoot-web.1.service /etc/systemd/system/chatwoot-web.1.service
-cp /home/chatwoot/chatwoot/deployment/chatwoot-worker.1.service /etc/systemd/system/chatwoot-worker.1.service
-cp /home/chatwoot/chatwoot/deployment/chatwoot.target /etc/systemd/system/chatwoot.target
+}
 
-systemctl enable chatwoot.target
-systemctl start chatwoot.target
 
-public_ip=$(curl http://checkip.amazonaws.com -s)
-
-if [ $configure_webserver != "yes" ]
-then
-echo -en "\n\n***************************************************************************\n"
-echo "Woot! Woot!! Chatwoot server installation is complete"
-echo "The server will be accessible at http://$public_ip:3000"
-echo "To configure a domain and SSL certificate, follow the guide at https://www.chatwoot.com/docs/deployment/deploy-chatwoot-in-linux-vm"
-echo "***************************************************************************"
-else
-curl https://ssl-config.mozilla.org/ffdhe4096.txt >> /etc/ssl/dhparam
-wget https://raw.githubusercontent.com/chatwoot/chatwoot/develop/deployment/nginx_chatwoot.conf
-cp nginx_chatwoot.conf /etc/nginx/sites-available/nginx_chatwoot.conf
-certbot certonly --non-interactive --agree-tos --nginx -m $le_email -d $domain_name
-sed -i "s/chatwoot.domain.com/$domain_name/g" /etc/nginx/sites-available/nginx_chatwoot.conf
-ln -s /etc/nginx/sites-available/nginx_chatwoot.conf /etc/nginx/sites-enabled/nginx_chatwoot.conf
-systemctl restart nginx
-sudo -i -u chatwoot << EOF
-cd chatwoot
-sed -i "s/http:\/\/0.0.0.0:3000/https:\/\/$domain_name/g" .env
+function run_db_migrations(){
+  sudo -i -u chatwoot << EOF
+  cd chatwoot
+  RAILS_ENV=production bundle exec rake db:create
+  RAILS_ENV=production bundle exec rake db:reset
 EOF
-systemctl restart chatwoot.target
-echo -en "\n\n***************************************************************************\n"
-echo "Woot! Woot!! Chatwoot server installation is complete"
-echo "The server will be accessible at https://$domain_name"
-echo "***************************************************************************"
-fi
+
+}
 
 
-if [ $install_pg_redis == "no" ]
-then
-echo -en "\n\n***************************************************************************\n"
-echo "DB migrations are not run as pg and redis is not installed."
-echo "After modifying .env with your external db creds, run db migrations !!!"
-echo "***************************************************************************"
-fi
+function configure_systemd_services() {
+  cp /home/chatwoot/chatwoot/deployment/chatwoot-web.1.service /etc/systemd/system/chatwoot-web.1.service
+  cp /home/chatwoot/chatwoot/deployment/chatwoot-worker.1.service /etc/systemd/system/chatwoot-worker.1.service
+  cp /home/chatwoot/chatwoot/deployment/chatwoot.target /etc/systemd/system/chatwoot.target
+
+  systemctl enable chatwoot.target
+  systemctl start chatwoot.target
+}
+
+
+function setup_ssl() {
+  echo "debug: setting up ssl"
+  echo "debug: domain: $domain_name"
+  echo "debug: letsencrypt email: $le_email"
+  curl https://ssl-config.mozilla.org/ffdhe4096.txt >> /etc/ssl/dhparam
+  wget https://raw.githubusercontent.com/chatwoot/chatwoot/develop/deployment/nginx_chatwoot.conf
+  cp nginx_chatwoot.conf /etc/nginx/sites-available/nginx_chatwoot.conf
+  certbot certonly --non-interactive --agree-tos --nginx -m "$le_email" -d "$domain_name"
+  sed -i "s/chatwoot.domain.com/$domain_name/g" /etc/nginx/sites-available/nginx_chatwoot.conf
+  ln -s /etc/nginx/sites-available/nginx_chatwoot.conf /etc/nginx/sites-enabled/nginx_chatwoot.conf
+  systemctl restart nginx
+  sudo -i -u chatwoot << EOF
+  cd chatwoot
+  sed -i "s/http:\/\/0.0.0.0:3000/https:\/\/$domain_name/g" .env
+EOF
+  systemctl restart chatwoot.target
+}
+
+function setup_logging() {
+  touch /var/log/chatwoot-setup.log
+  LOG_FILE="/var/log/chatwoot-setup.log"
+}
+
+function main() {
+
+  setup_logging
+  cat << EOF
+
+***************************************************************************
+              Chatwoot Installation (latest)
+***************************************************************************
+
+For more verbose logs, open up a second terminal and follow along using, `tail -f /var/log/chatwoot`.
+
+EOF
+
+  sleep 3
+  read -rp 'Would you like to configure a domain and SSL for Chatwoot?(yes or no): ' configure_webserver
+
+  if [ "$configure_webserver" == "yes" ]
+  then
+    get_domain_info
+  fi
+
+  echo -en "\n"
+  read -rp 'Would you like to install Postgres and Redis? (Answer no if you plan to use external services): ' install_pg_redis
+
+  if [ "$install_pg_redis" == "no" ]
+  then
+    echo "***** Skipping Postgres and Redis installation. ****"
+  fi
+
+  echo -en "\n➥ 1/9 Installing dependencies. This takes a while."
+  install_dependencies &>> "${LOG_FILE}"
+
+  if [ "$install_pg_redis" != "no" ]
+  then
+    echo "➥ 2/9 Installing databases"
+    install_databases &>> "${LOG_FILE}"
+  fi
+
+  if [ "$configure_webserver" == "yes" ]
+  then
+    echo "➥ 3/9 Installing webserver"
+    install_webserver &>> "${LOG_FILE}"
+  fi
+
+  echo "➥ 4/9 Setting up Ruby"
+  configure_rvm &>> "${LOG_FILE}"
+
+  if [ "$install_pg_redis" != "no" ]
+  then
+    echo "➥ 5/9 Setting up the database"
+    configure_db &>> "${LOG_FILE}"
+  fi
+
+  echo "➥ 6/9 Installing Chatwoot. This takes a while."
+  setup_chatwoot &>> "${LOG_FILE}"
+
+  if [ "$install_pg_redis" != "no" ]
+  then
+    echo "➥ 7/9 Running migrations"
+    run_db_migrations &>> "${LOG_FILE}"
+  fi
+
+  echo "➥ 8/9 Setting up systemd services"
+  configure_systemd_services &>> "${LOG_FILE}"
+
+  public_ip=$(curl http://checkip.amazonaws.com -s)
+  
+  if [ "$configure_webserver" != "yes" ]
+  then
+    cat << EOF
+
+***************************************************************************
+Woot! Woot!! Chatwoot server installation is complete.
+The server will be accessible at http://$public_ip:3000
+
+To configure a domain and SSL certificate, follow the guide at 
+https://www.chatwoot.com/docs/deployment/deploy-chatwoot-in-linux-vm
+
+Join the community at https://chatwoot.com/community
+***************************************************************************
+EOF
+  else
+    echo "➥ 9/9 Setting up SSL/TLS"
+    setup_ssl &>> "${LOG_FILE}"
+    cat << EOF
+
+***************************************************************************
+Woot! Woot!! Chatwoot server installation is complete.
+The server will be accessible at https://$domain_name
+
+Join the community at https://chatwoot.com/community
+***************************************************************************
+EOF
+  fi
+
+  if [ "$install_pg_redis" == "no" ]
+  then
+cat <<EOF
+***************************************************************************
+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`.
+***************************************************************************
+EOF
+  fi
+
+exit 0
+
+}
+
+main "$@"

From 7434b60f71a2eaeca40df7e6fcd5c8b95c8e5e81 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 25 May 2022 12:38:23 +0530
Subject: [PATCH 128/177] fix: Revert changes to fix name updation from
 pre-chat form (#4741)

---
 .../api/v1/widget/base_controller.rb          |  6 ++++
 .../api/v1/widget/conversations_controller.rb |  1 -
 .../widget/conversations_controller_spec.rb   | 30 +++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index 646d70acf..fc4d33fc3 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -54,6 +54,7 @@ class Api::V1::Widget::BaseController < ApplicationController
       ).perform
     else
       @contact.update!(email: email)
+      update_contact_name
     end
   end
 
@@ -67,9 +68,14 @@ class Api::V1::Widget::BaseController < ApplicationController
       ).perform
     else
       @contact.update!(phone_number: phone_number)
+      update_contact_name
     end
   end
 
+  def update_contact_name
+    @contact.update!(name: contact_name) if contact_name.present?
+  end
+
   def contact_email
     permitted_params.dig(:contact, :email)&.downcase
   end
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index cfe107ac6..8d054229c 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -16,7 +16,6 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   def process_update_contact
     update_contact(contact_email) if @contact.email.blank? && contact_email.present?
     update_contact_phone_number(contact_phone_number) if @contact.phone_number.blank? && contact_phone_number.present?
-    @contact.update!(name: contact_name) if contact_name.present?
   end
 
   def update_last_seen
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 88f41dea0..307862374 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -69,6 +69,36 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
       expect(json_response['id']).not_to eq nil
       expect(json_response['contact']['email']).to eq 'contact-email@chatwoot.com'
       expect(json_response['contact']['phone_number']).to eq '+919745313456'
+      expect(json_response['contact']['name']).to eq 'contact-name'
+      expect(json_response['custom_attributes']['order_id']).to eq '12345'
+      expect(json_response['messages'][0]['content']).to eq 'This is a test message'
+    end
+
+    it 'does not update the name if the contact already exist' do
+      existing_contact = create(:contact, account: account)
+
+      post '/api/v1/widget/conversations',
+           headers: { 'X-Auth-Token' => token },
+           params: {
+             website_token: web_widget.website_token,
+             contact: {
+               name: 'contact-name',
+               email: existing_contact.email,
+               phone_number: '+919745313456'
+             },
+             message: {
+               content: 'This is a test message'
+             },
+             custom_attributes: { order_id: '12345' }
+           },
+           as: :json
+
+      expect(response).to have_http_status(:success)
+      json_response = JSON.parse(response.body)
+      expect(json_response['id']).not_to eq nil
+      expect(json_response['contact']['email']).to eq existing_contact.email
+      expect(json_response['contact']['name']).not_to eq 'contact-name'
+      expect(json_response['contact']['phone_number']).to eq '+919745313456'
       expect(json_response['custom_attributes']['order_id']).to eq '12345'
       expect(json_response['messages'][0]['content']).to eq 'This is a test message'
     end

From 1215f37ddae1a69a203ddb0622fc21e1bc8f1a59 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 25 May 2022 17:06:31 +0530
Subject: [PATCH 129/177] fix: Remove translated keys from locale files (#4748)

---
 .../dashboard/components/ChatList.vue         | 13 +++++---
 .../dashboard/i18n/locale/ar/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/bg/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ca/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/cs/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/da/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/de/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/el/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/en/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/es/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/fa/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/fi/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/fr/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/he/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/hi/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/hu/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/id/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/it/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ja/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ko/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/lv/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ml/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ne/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/nl/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/no/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/pl/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/pt/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/pt_BR/chatlist.json | 32 +++----------------
 .../dashboard/i18n/locale/ro/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ru/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/sk/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/sr/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/sv/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ta/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/th/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/tr/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/uk/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ur/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/ur_IN/chatlist.json | 32 +++----------------
 .../dashboard/i18n/locale/vi/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/zh/chatlist.json    | 32 +++----------------
 .../dashboard/i18n/locale/zh_CN/chatlist.json | 32 +++----------------
 .../dashboard/i18n/locale/zh_TW/chatlist.json | 32 +++----------------
 43 files changed, 219 insertions(+), 1138 deletions(-)

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index deb0276bf..2887e4a08 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -235,11 +235,16 @@ export default {
       return {};
     },
     assigneeTabItems() {
-      return this.$t('CHAT_LIST.ASSIGNEE_TYPE_TABS').map(item => {
-        const count = this.conversationStats[item.COUNT_KEY] || 0;
+      const ASSIGNEE_TYPE_TAB_KEYS = {
+        me: 'mineCount',
+        unassigned: 'unAssignedCount',
+        all: 'allCount',
+      };
+      return Object.keys(ASSIGNEE_TYPE_TAB_KEYS).map(key => {
+        const count = this.conversationStats[ASSIGNEE_TYPE_TAB_KEYS[key]] || 0;
         return {
-          key: item.KEY,
-          name: item.NAME,
+          key,
+          name: this.$t(`CHAT_LIST.ASSIGNEE_TYPE_TABS.${key}`),
           count,
         };
       });
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
index 59acf4738..9af631c7e 100644
--- a/app/javascript/dashboard/i18n/locale/ar/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "البحث عن جهات الاتصال، المحادثات، قوالب الردود الجاهزة .."
     },
     "FILTER_ALL": "الكل",
-    "STATUS_TABS": [
-      {
-        "NAME": "فتح",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "مغلقة",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "محادثاتي",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "غير مسند",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "الكل",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "محادثاتي",
+      "unassigned": "غير مسند",
+      "all": "الكل"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "فتح"
diff --git a/app/javascript/dashboard/i18n/locale/bg/chatlist.json b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
index f6b3b480f..54b5ae2f0 100644
--- a/app/javascript/dashboard/i18n/locale/bg/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/bg/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Търсене на хора, чатове, запазени отговори .."
     },
     "FILTER_ALL": "Всички",
-    "STATUS_TABS": [
-      {
-        "NAME": "Отворен",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Разрешен",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Мой",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Неназначен",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Всички",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Мой",
+      "unassigned": "Неназначен",
+      "all": "Всички"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Отворен"
diff --git a/app/javascript/dashboard/i18n/locale/ca/chatlist.json b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
index fcba4a38e..9bbe16544 100644
--- a/app/javascript/dashboard/i18n/locale/ca/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ca/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Cerca persones, xats, respostes desades .."
     },
     "FILTER_ALL": "Totes",
-    "STATUS_TABS": [
-      {
-        "NAME": "Obrir",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resoltes",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Meves",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Sense assignar",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Totes",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Meves",
+      "unassigned": "Sense assignar",
+      "all": "Totes"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Obrir"
diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index 42aec5950..020affe76 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Hledat lidi, chaty, Uložené odpovědi .."
     },
     "FILTER_ALL": "Vše",
-    "STATUS_TABS": [
-      {
-        "NAME": "Otevřít",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Vyřešeno",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Důl",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Nepřiřazeno",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Vše",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Důl",
+      "unassigned": "Nepřiřazeno",
+      "all": "Vše"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Otevřít"
diff --git a/app/javascript/dashboard/i18n/locale/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
index 2be5e379e..9b6da159b 100644
--- a/app/javascript/dashboard/i18n/locale/da/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Søg efter Mennesker, Chats, Gemte svar .."
     },
     "FILTER_ALL": "Alle",
-    "STATUS_TABS": [
-      {
-        "NAME": "Åbn",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Løst",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Ikke Tildelt",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Alle",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Ikke Tildelt",
+      "all": "Alle"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Åbn"
diff --git a/app/javascript/dashboard/i18n/locale/de/chatlist.json b/app/javascript/dashboard/i18n/locale/de/chatlist.json
index 1570a1c19..eed586fae 100644
--- a/app/javascript/dashboard/i18n/locale/de/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/de/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Suche nach Personen, Chats, gespeicherten Antworten .."
     },
     "FILTER_ALL": "Alle",
-    "STATUS_TABS": [
-      {
-        "NAME": "Offen",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Gelöst",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Meine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Nicht zugewiesen",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Alle",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Meine",
+      "unassigned": "Nicht zugewiesen",
+      "all": "Alle"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Öffnen"
diff --git a/app/javascript/dashboard/i18n/locale/el/chatlist.json b/app/javascript/dashboard/i18n/locale/el/chatlist.json
index de7179517..779349e0b 100644
--- a/app/javascript/dashboard/i18n/locale/el/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/el/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Αναζήτηση Ανθρώπων, συνομιλιών, αποθηκευμένων απαντήσεων .."
     },
     "FILTER_ALL": "Όλες",
-    "STATUS_TABS": [
-      {
-        "NAME": "Ανοιχτές",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Επιλύθηκαν",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Δικές μου",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Χωρίς Αντιστοίχιση",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Όλες",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Δικές μου",
+      "unassigned": "Χωρίς Αντιστοίχιση",
+      "all": "Όλες"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Ανοιχτές"
diff --git a/app/javascript/dashboard/i18n/locale/en/chatlist.json b/app/javascript/dashboard/i18n/locale/en/chatlist.json
index e3d637b71..93bba4aab 100644
--- a/app/javascript/dashboard/i18n/locale/en/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/en/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
     "FILTER_ALL": "All",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolved",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "All",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 8b73f6ff2..959598771 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Búsqueda de Personas, Chats, Respuestas Salvadas .."
     },
     "FILTER_ALL": "Todos",
-    "STATUS_TABS": [
-      {
-        "NAME": "Abrir",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resuelto",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mías",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Todos",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mías",
+      "unassigned": "Unassigned",
+      "all": "Todos"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Abrir"
diff --git a/app/javascript/dashboard/i18n/locale/fa/chatlist.json b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
index 2bdaba90c..c9851c0d2 100644
--- a/app/javascript/dashboard/i18n/locale/fa/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fa/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "پیدا کردن افراد، گفتگوها و پاسخ‌های از پیش نوشته شده..."
     },
     "FILTER_ALL": "همه",
-    "STATUS_TABS": [
-      {
-        "NAME": "باز",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "حل شده",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "من",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "تخصیص داده نشده",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "همه",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "من",
+      "unassigned": "تخصیص داده نشده",
+      "all": "همه"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "باز"
diff --git a/app/javascript/dashboard/i18n/locale/fi/chatlist.json b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
index 6b5842902..8dce11d82 100644
--- a/app/javascript/dashboard/i18n/locale/fi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Etsi ihmisiä, keskusteluita, tallennettuja vastauksia..."
     },
     "FILTER_ALL": "Kaikki",
-    "STATUS_TABS": [
-      {
-        "NAME": "Avaa",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Ratkaistu",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Minun",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Osoittamaton",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Kaikki",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Minun",
+      "unassigned": "Osoittamaton",
+      "all": "Kaikki"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Avaa"
diff --git a/app/javascript/dashboard/i18n/locale/fr/chatlist.json b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
index 4a37f71e7..91895fdf0 100644
--- a/app/javascript/dashboard/i18n/locale/fr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/fr/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Rechercher des personnes, des conversations, des réponses standardisées ..."
     },
     "FILTER_ALL": "Tous",
-    "STATUS_TABS": [
-      {
-        "NAME": "Ouvert",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Résolu",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Les miens",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Non assigné",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Tous",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Les miens",
+      "unassigned": "Non assigné",
+      "all": "Tous"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Ouvert"
diff --git a/app/javascript/dashboard/i18n/locale/he/chatlist.json b/app/javascript/dashboard/i18n/locale/he/chatlist.json
index 22e54ad1d..e669054ac 100644
--- a/app/javascript/dashboard/i18n/locale/he/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/he/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "חפש אנשים, צ'אטים, תגובות שמורות .."
     },
     "FILTER_ALL": "הכל",
-    "STATUS_TABS": [
-      {
-        "NAME": "פתח",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "נפתרה",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "שלי",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "לא הוקצתה",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "הכל",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "שלי",
+      "unassigned": "לא הוקצתה",
+      "all": "הכל"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "פתח"
diff --git a/app/javascript/dashboard/i18n/locale/hi/chatlist.json b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
index e3d637b71..93bba4aab 100644
--- a/app/javascript/dashboard/i18n/locale/hi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
     "FILTER_ALL": "All",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolved",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "All",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
index 90796f7f6..68365725a 100644
--- a/app/javascript/dashboard/i18n/locale/hu/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Keresés: emberek, beszélgetése, mentett válaszok .."
     },
     "FILTER_ALL": "Mind",
-    "STATUS_TABS": [
-      {
-        "NAME": "Megnyitás",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Megoldva",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Enyém",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Gazdátlan",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Mind",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Enyém",
+      "unassigned": "Gazdátlan",
+      "all": "Mind"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Megnyitás"
diff --git a/app/javascript/dashboard/i18n/locale/id/chatlist.json b/app/javascript/dashboard/i18n/locale/id/chatlist.json
index e8532ec72..6319c7165 100644
--- a/app/javascript/dashboard/i18n/locale/id/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/id/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Telusuri Orang, Obrolan, Balasan Tersimpan.."
     },
     "FILTER_ALL": "Semua",
-    "STATUS_TABS": [
-      {
-        "NAME": "Terbuka",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Terselesaikan",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Milikku",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Belum ditugaskan",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Semua",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Milikku",
+      "unassigned": "Belum ditugaskan",
+      "all": "Semua"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Terbuka"
diff --git a/app/javascript/dashboard/i18n/locale/it/chatlist.json b/app/javascript/dashboard/i18n/locale/it/chatlist.json
index a2481f110..7c90eab17 100644
--- a/app/javascript/dashboard/i18n/locale/it/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/it/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Cerca persone, Chat, risposte salvate .."
     },
     "FILTER_ALL": "Tutti",
-    "STATUS_TABS": [
-      {
-        "NAME": "Aperte",
-        "KEY": "contaaperture"
-      },
-      {
-        "NAME": "Risolti",
-        "KEY": "Conteggio"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mie",
-        "KEY": "Io",
-        "COUNT_KEY": "contaMinore"
-      },
-      {
-        "NAME": "Non assegnato",
-        "KEY": "non assegnato",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Tutti",
-        "KEY": "Tutti",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mie",
+      "unassigned": "Non assegnato",
+      "all": "Tutti"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Aperte"
diff --git a/app/javascript/dashboard/i18n/locale/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
index 064d52376..3e8a18a74 100644
--- a/app/javascript/dashboard/i18n/locale/ja/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "人物、チャット、保存された返信を検索する"
     },
     "FILTER_ALL": "すべて",
-    "STATUS_TABS": [
-      {
-        "NAME": "開く",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "解決済み",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "自分",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "未割当",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "すべて",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "自分",
+      "unassigned": "未割当",
+      "all": "すべて"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "開く"
diff --git a/app/javascript/dashboard/i18n/locale/ko/chatlist.json b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
index cec1fc991..13045ef2f 100644
--- a/app/javascript/dashboard/i18n/locale/ko/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "사람 검색, 채팅, 저장된 응답..."
     },
     "FILTER_ALL": "모두",
-    "STATUS_TABS": [
-      {
-        "NAME": "열기",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "해결됨",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "나에게 할당",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "지정되지 않음",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "모두",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "나에게 할당",
+      "unassigned": "지정되지 않음",
+      "all": "모두"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "열기"
diff --git a/app/javascript/dashboard/i18n/locale/lv/chatlist.json b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
index e3d637b71..93bba4aab 100644
--- a/app/javascript/dashboard/i18n/locale/lv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/lv/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
     "FILTER_ALL": "All",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolved",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "All",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/ml/chatlist.json b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
index 538f108a2..54df183b7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ml/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "ആളുകൾ, ചാറ്റുകൾ, ക്യാൻഡ് മറുപടികൾ എന്നിവയ്ക്കായി തിരയുക .."
     },
     "FILTER_ALL": "എല്ലാം",
-    "STATUS_TABS": [
-      {
-        "NAME": "സജീവം",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "പരിഹരിച്ചത്",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "എന്റേത്",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "നിയുക്തമാക്കാത്തത്",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "എല്ലാം",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "എന്റേത്",
+      "unassigned": "നിയുക്തമാക്കാത്തത്",
+      "all": "എല്ലാം"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "സജീവം"
diff --git a/app/javascript/dashboard/i18n/locale/ne/chatlist.json b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
index e3d637b71..93bba4aab 100644
--- a/app/javascript/dashboard/i18n/locale/ne/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ne/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
     "FILTER_ALL": "All",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolved",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "All",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/nl/chatlist.json b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
index 887b84a90..fa9c30b24 100644
--- a/app/javascript/dashboard/i18n/locale/nl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/nl/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Zoek naar mensen, gesprekken, opgeslagen antwoorden .."
     },
     "FILTER_ALL": "Allemaal",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Opgelost",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mijn",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Niet toegewezen",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Allemaal",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mijn",
+      "unassigned": "Niet toegewezen",
+      "all": "Allemaal"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/no/chatlist.json b/app/javascript/dashboard/i18n/locale/no/chatlist.json
index 2d6fff92c..729bf1521 100644
--- a/app/javascript/dashboard/i18n/locale/no/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/no/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Søk etter personer, samtaler, lagrede svar .."
     },
     "FILTER_ALL": "Alle",
-    "STATUS_TABS": [
-      {
-        "NAME": "Åpne",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Løst",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Ikke tildelt",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Alle",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Ikke tildelt",
+      "all": "Alle"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Åpne"
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 51d1d83d3..4435da117 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Szukaj ludzi, czatów, zapisanych odpowiedzi .."
     },
     "FILTER_ALL": "Wszystkie",
-    "STATUS_TABS": [
-      {
-        "NAME": "Otwórz",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Rozwiązano",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Kopalnia",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Nieprzypisane",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Wszystkie",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Kopalnia",
+      "unassigned": "Nieprzypisane",
+      "all": "Wszystkie"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Otwarte"
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index aefe5b0c4..d344a1076 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Pesquisar pessoas, conversas, respostas salvas .."
     },
     "FILTER_ALL": "TODOS",
-    "STATUS_TABS": [
-      {
-        "NAME": "Abertas",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolvido",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Minerar",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Não atribuído",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "TODOS",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Minerar",
+      "unassigned": "Não atribuído",
+      "all": "Todos"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Abertas"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
index 0278274e5..7aa17802b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Pesquisar pessoas, conversas, respostas salvas .."
     },
     "FILTER_ALL": "Todos",
-    "STATUS_TABS": [
-      {
-        "NAME": "Abertas",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolvida",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Minha",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Não atribuída",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Todos",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Minha",
+      "unassigned": "Não atribuída",
+      "all": "Todos"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Abertas"
diff --git a/app/javascript/dashboard/i18n/locale/ro/chatlist.json b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
index 6525c0bd1..f97c89570 100644
--- a/app/javascript/dashboard/i18n/locale/ro/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ro/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Caută persoane, conversații, răspunsuri salvate .."
     },
     "FILTER_ALL": "Toate",
-    "STATUS_TABS": [
-      {
-        "NAME": "Deschide",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Rezolvat",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Ale mele",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Neatribuit",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Toate",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Ale mele",
+      "unassigned": "Neatribuit",
+      "all": "Toate"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Deschide"
diff --git a/app/javascript/dashboard/i18n/locale/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
index 7eaa00dfb..95ae5d47b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Искать людей, чаты, сохраненные ответы .."
     },
     "FILTER_ALL": "Все",
-    "STATUS_TABS": [
-      {
-        "NAME": "Открыть",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Закрыт",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Мои",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Неназначен",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Все",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Мои",
+      "unassigned": "Неназначен",
+      "all": "Все"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Открыть"
diff --git a/app/javascript/dashboard/i18n/locale/sk/chatlist.json b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
index f60a4456b..e7ce0eead 100644
--- a/app/javascript/dashboard/i18n/locale/sk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Vyhľadávanie ľudí, konverzácií, uložených odpovedí.."
     },
     "FILTER_ALL": "Všetko",
-    "STATUS_TABS": [
-      {
-        "NAME": "Otvorené",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Vyriešené",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Moje",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Nepriradené",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Všetko",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Moje",
+      "unassigned": "Nepriradené",
+      "all": "Všetko"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Otvorené"
diff --git a/app/javascript/dashboard/i18n/locale/sr/chatlist.json b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
index 44d87f299..efef0429d 100644
--- a/app/javascript/dashboard/i18n/locale/sr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Tražite osobe, razgovore, gotove odgovore .."
     },
     "FILTER_ALL": "Sve",
-    "STATUS_TABS": [
-      {
-        "NAME": "Otvoreni",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Rešeni",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Moji",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Nedodeljen",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Svi",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Moji",
+      "unassigned": "Nedodeljen",
+      "all": "Svi"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Otvoreni"
diff --git a/app/javascript/dashboard/i18n/locale/sv/chatlist.json b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
index 6bf34759c..1a49f49fa 100644
--- a/app/javascript/dashboard/i18n/locale/sv/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sv/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Sök efter personer, chattar, sparade svar .."
     },
     "FILTER_ALL": "Alla",
-    "STATUS_TABS": [
-      {
-        "NAME": "Öppna",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Löst",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mina",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Otilldelade",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Alla",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mina",
+      "unassigned": "Otilldelade",
+      "all": "Alla"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Öppna"
diff --git a/app/javascript/dashboard/i18n/locale/ta/chatlist.json b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
index dd518b8d4..b7e5a6bcd 100644
--- a/app/javascript/dashboard/i18n/locale/ta/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "நபர்கள், அரட்டைகள், சேமித்த பதில்களை தேட .."
     },
     "FILTER_ALL": "எல்லாம்",
-    "STATUS_TABS": [
-      {
-        "NAME": "திற",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "தீர்க்கப்பட்டது",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "என்னுடைய",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "ஒதுக்கப்படாதது",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "எல்லாம்",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "என்னுடைய",
+      "unassigned": "ஒதுக்கப்படாதது",
+      "all": "எல்லாம்"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "திற"
diff --git a/app/javascript/dashboard/i18n/locale/th/chatlist.json b/app/javascript/dashboard/i18n/locale/th/chatlist.json
index 94293972e..580a48f09 100644
--- a/app/javascript/dashboard/i18n/locale/th/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/th/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "ค้นหาผู้คน, เเชท, หรือการตอบกลับ"
     },
     "FILTER_ALL": "ทั้งหมด",
-    "STATUS_TABS": [
-      {
-        "NAME": "เปิด",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "เสร็จสิ้น",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "ของฉัน",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "ไม่ได้รับมอบหมาย",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "ทั้งหมด",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "ของฉัน",
+      "unassigned": "ไม่ได้รับมอบหมาย",
+      "all": "ทั้งหมด"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "เปิด"
diff --git a/app/javascript/dashboard/i18n/locale/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
index 16e380225..387981fd1 100644
--- a/app/javascript/dashboard/i18n/locale/tr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Kişileri, Sohbetleri, Kaydedilen Yanıtları Ara .."
     },
     "FILTER_ALL": "Hepsi",
-    "STATUS_TABS": [
-      {
-        "NAME": "Açık",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Çözüldü",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Benim",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Atanmamış",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Hepsi",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Benim",
+      "unassigned": "Atanmamış",
+      "all": "Hepsi"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Açık"
diff --git a/app/javascript/dashboard/i18n/locale/uk/chatlist.json b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
index 5cda7a47e..2302f64f2 100644
--- a/app/javascript/dashboard/i18n/locale/uk/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/uk/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Пошук людей, чатів та збережених відповідей.."
     },
     "FILTER_ALL": "Всі",
-    "STATUS_TABS": [
-      {
-        "NAME": "Відкриті",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Вирішені",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Мої",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Непризначені",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Всі",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Мої",
+      "unassigned": "Непризначені",
+      "all": "Всі"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Відкриті"
diff --git a/app/javascript/dashboard/i18n/locale/ur/chatlist.json b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
index b209790e2..edf29540f 100644
--- a/app/javascript/dashboard/i18n/locale/ur/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ur/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "لوگوں ، چیٹس یا محفوظ کردہ جوابات میں تلاش کریں.."
     },
     "FILTER_ALL": "تمام",
-    "STATUS_TABS": [
-      {
-        "NAME": "کھولیں۔",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "حل ہو گیا۔",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "میرا",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "نا مقرر کیا ہوا",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "تمام",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "میرا",
+      "unassigned": "نا مقرر کیا ہوا",
+      "all": "تمام"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "کھولیں۔"
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
index e3d637b71..93bba4aab 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Search for People, Chats, Saved Replies .."
     },
     "FILTER_ALL": "All",
-    "STATUS_TABS": [
-      {
-        "NAME": "Open",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Resolved",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Mine",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Unassigned",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "All",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Mine",
+      "unassigned": "Unassigned",
+      "all": "All"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Open"
diff --git a/app/javascript/dashboard/i18n/locale/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
index 376ad5608..72ef062ee 100644
--- a/app/javascript/dashboard/i18n/locale/vi/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "Tìm kiếm cho người, đoạn chat, lưu trữ trả lời .."
     },
     "FILTER_ALL": "Tất cả",
-    "STATUS_TABS": [
-      {
-        "NAME": "Mở",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "Đã được giải quyết",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "Của tôi",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "Chưa được phân công",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "Tất cả",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "Của tôi",
+      "unassigned": "Chưa được phân công",
+      "all": "Tất cả"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "Mở"
diff --git a/app/javascript/dashboard/i18n/locale/zh/chatlist.json b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
index 1de627a15..b7d574d46 100644
--- a/app/javascript/dashboard/i18n/locale/zh/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
@@ -10,33 +10,11 @@
     "SEARCH": {
       "INPUT": "搜索人、聊天室、保存回复"
     },
-    "STATUS_TABS": [
-      {
-        "NAME": "打开",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "已解决",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "我的",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "未分配的",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "所有的",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "我的",
+      "unassigned": "未分配的",
+      "all": "所有的"
+    },
     "CHAT_STATUS_ITEMS": [
       {
         "TEXT": "正在进行的\n",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
index 76beb060a..734d8ebd3 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "搜索人、聊天室、保存回复"
     },
     "FILTER_ALL": "所有的",
-    "STATUS_TABS": [
-      {
-        "NAME": "打开",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "已解决",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "我的",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "未分配的",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "所有的",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "我的",
+      "unassigned": "未分配的",
+      "all": "所有的"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "打开"
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
index 0d91b98cd..c526710c2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
@@ -12,33 +12,11 @@
       "INPUT": "搜尋人、聊天室、保存回覆"
     },
     "FILTER_ALL": "所有的",
-    "STATUS_TABS": [
-      {
-        "NAME": "打開",
-        "KEY": "openCount"
-      },
-      {
-        "NAME": "已解決",
-        "KEY": "allConvCount"
-      }
-    ],
-    "ASSIGNEE_TYPE_TABS": [
-      {
-        "NAME": "我的",
-        "KEY": "me",
-        "COUNT_KEY": "mineCount"
-      },
-      {
-        "NAME": "未指派的",
-        "KEY": "unassigned",
-        "COUNT_KEY": "unAssignedCount"
-      },
-      {
-        "NAME": "所有的",
-        "KEY": "all",
-        "COUNT_KEY": "allCount"
-      }
-    ],
+    "ASSIGNEE_TYPE_TABS": {
+      "me": "我的",
+      "unassigned": "未指派的",
+      "all": "所有的"
+    },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
         "TEXT": "打開"

From 47a6d9681a4303eb54705246eec01d117a20c18b Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Thu, 26 May 2022 19:05:30 +0530
Subject: [PATCH 130/177] feat: send instagram message after 24 hours (#4698)

Added MESSAGE_TAG: HUMAN_AGENT for Instagram messages if the user wants to send it after the standard message window.

Fixes #4689
---
 app/models/conversation.rb                    | 14 +++-
 .../instagram/send_on_instagram_service.rb    | 18 ++++-
 config/installation_config.yml                |  3 +
 spec/models/conversation_spec.rb              | 32 +++++++++
 .../send_on_instagram_service_spec.rb         | 69 ++++++++++++++++---
 5 files changed, 122 insertions(+), 14 deletions(-)

diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 643f8fa56..cd45adf7b 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -93,7 +93,7 @@ class Conversation < ApplicationRecord
   delegate :auto_resolve_duration, to: :account
 
   def can_reply?
-    return last_message_less_than_24_hrs? if additional_attributes['type'] == 'instagram_direct_message'
+    return can_reply_on_instagram? if additional_attributes['type'] == 'instagram_direct_message'
 
     return true unless inbox&.channel&.has_24_hour_messaging_window?
 
@@ -112,6 +112,18 @@ class Conversation < ApplicationRecord
     Time.current < last_incoming_message.created_at + 24.hours
   end
 
+  def can_reply_on_instagram?
+    global_config = GlobalConfig.get('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
+
+    return false if last_incoming_message.nil?
+
+    if global_config['ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT']
+      Time.current < last_incoming_message.created_at + 7.days
+    else
+      last_message_less_than_24_hrs?
+    end
+  end
+
   def update_assignee(agent = nil)
     update!(assignee: agent)
   end
diff --git a/app/services/instagram/send_on_instagram_service.rb b/app/services/instagram/send_on_instagram_service.rb
index 2ad7c9042..fbd3c44bf 100644
--- a/app/services/instagram/send_on_instagram_service.rb
+++ b/app/services/instagram/send_on_instagram_service.rb
@@ -23,17 +23,19 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
   end
 
   def message_params
-    {
+    params = {
       recipient: { id: contact.get_source_id(inbox.id) },
       message: {
         text: message.content
       }
     }
+
+    merge_human_agent_tag(params)
   end
 
   def attachament_message_params
     attachment = message.attachments.first
-    {
+    params = {
       recipient: { id: contact.get_source_id(inbox.id) },
       message: {
         attachment: {
@@ -44,6 +46,8 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
         }
       }
     }
+
+    merge_human_agent_tag(params)
   end
 
   # Deliver a message with the given payload.
@@ -96,4 +100,14 @@ class Instagram::SendOnInstagramService < Base::SendOnChannelService
   def config
     Facebook::Messenger.config
   end
+
+  def merge_human_agent_tag(params)
+    global_config = GlobalConfig.get('ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT')
+
+    return params unless global_config['ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT']
+
+    params[:messaging_type] = 'MESSAGE_TAG'
+    params[:tag] = 'HUMAN_AGENT'
+    params
+  end
 end
diff --git a/config/installation_config.yml b/config/installation_config.yml
index a80776715..e95c6da2c 100644
--- a/config/installation_config.yml
+++ b/config/installation_config.yml
@@ -59,3 +59,6 @@
 - name: DISABLE_USER_PROFILE_UPDATE
   value: false
   locked: false
+- name: ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT
+  value: false
+  locked: false
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 8c278a81b..e83ee5195 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -512,6 +512,38 @@ RSpec.describe Conversation, type: :model do
         )
         expect(conversation.can_reply?).to eq true
       end
+
+      context 'when instagram channel' do
+        it 'return true with HUMAN_AGENT if it is outside of 24 hour window' do
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: true)
+
+          conversation.update(additional_attributes: { type: 'instagram_direct_message' })
+          create(
+            :message,
+            account: conversation.account,
+            inbox: facebook_inbox,
+            conversation: conversation,
+            created_at: Time.now - 48.hours
+          )
+
+          expect(conversation.can_reply?).to eq true
+        end
+
+        it 'return false without HUMAN_AGENT if it is outside of 24 hour window' do
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: false)
+
+          conversation.update(additional_attributes: { type: 'instagram_direct_message' })
+          create(
+            :message,
+            account: conversation.account,
+            inbox: facebook_inbox,
+            conversation: conversation,
+            created_at: Time.now - 48.hours
+          )
+
+          expect(conversation.can_reply?).to eq false
+        end
+      end
     end
   end
 
diff --git a/spec/services/instagram/send_on_instagram_service_spec.rb b/spec/services/instagram/send_on_instagram_service_spec.rb
index 1606f27d1..f42efa1df 100644
--- a/spec/services/instagram/send_on_instagram_service_spec.rb
+++ b/spec/services/instagram/send_on_instagram_service_spec.rb
@@ -27,21 +27,68 @@ describe Instagram::SendOnInstagramService do
         )
       end
 
-      it 'if message is sent from chatwoot and is outgoing' do
-        message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
-        response = ::Instagram::SendOnInstagramService.new(message: message).perform
+      context 'without message_tag HUMAN_AGENT' do
+        before do
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: false)
+        end
 
-        expect(response).to eq({  message_id: 'anyrandommessageid1234567890' })
+        it 'if message is sent from chatwoot and is outgoing' do
+          message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+
+          allow(HTTParty).to receive(:post).with(
+            {
+              recipient: { id: contact.get_source_id(instagram_inbox.id) },
+              message: {
+                text: message.content
+              }
+            }
+          ).and_return(
+            {
+              'message_id': 'anyrandommessageid1234567890'
+            }
+          )
+
+          response = ::Instagram::SendOnInstagramService.new(message: message).perform
+
+          expect(response).to eq({  message_id: 'anyrandommessageid1234567890' })
+        end
+
+        it 'if message with attachment is sent from chatwoot and is outgoing' do
+          message = build(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+          attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
+          attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
+          message.save!
+          response = ::Instagram::SendOnInstagramService.new(message: message).perform
+
+          expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
+        end
       end
 
-      it 'if message with attachment is sent from chatwoot and is outgoing' do
-        message = build(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
-        attachment = message.attachments.new(account_id: message.account_id, file_type: :image)
-        attachment.file.attach(io: File.open(Rails.root.join('spec/assets/avatar.png')), filename: 'avatar.png', content_type: 'image/png')
-        message.save!
-        response = ::Instagram::SendOnInstagramService.new(message: message).perform
+      context 'with message_tag HUMAN_AGENT' do
+        before do
+          InstallationConfig.where(name: 'ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT').first_or_create(value: true)
+        end
 
-        expect(response).to eq({ message_id: 'anyrandommessageid1234567890' })
+        it 'if message is sent from chatwoot and is outgoing' do
+          message = create(:message, message_type: 'outgoing', inbox: instagram_inbox, account: account, conversation: conversation)
+
+          allow(HTTParty).to receive(:post).with(
+            {
+              recipient: { id: contact.get_source_id(instagram_inbox.id) },
+              message: {
+                text: message.content
+              },
+              messaging_type: 'MESSAGE_TAG',
+              tag: 'HUMAN_AGENT'
+            }
+          ).and_return(
+            {
+              'message_id': 'anyrandommessageid1234567890'
+            }
+          )
+
+          ::Instagram::SendOnInstagramService.new(message: message).perform
+        end
       end
     end
   end

From ab05dd9b9b2f65a74b9f36c0dab6b5a08d5a7af3 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 26 May 2022 20:23:00 +0530
Subject: [PATCH 131/177] chore: Improve the reauthorization requirement for
 Email Channel (#4753)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb     |  2 ++
 app/models/channel/email.rb                   |  2 ++
 app/models/concerns/reauthorizable.rb         |  4 ++-
 spec/models/channel/email_spec.rb             | 27 +++++++++++++++++++
 spec/models/concerns/reauthorizable_shared.rb | 12 ++++++++-
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 spec/models/channel/email_spec.rb

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index ef24ef4c2..eab5e4701 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -7,6 +7,8 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     return unless should_fetch_email?(channel)
 
     process_mail_for_channel(channel)
+    # clearing old failures like timeouts since the mail is now successfully processed
+    channel.reauthorized!
   rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::IMAP::NoResponseError
     channel.authorization_error!
   rescue StandardError => e
diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb
index 5b1cc0c91..c5a67c676 100644
--- a/app/models/channel/email.rb
+++ b/app/models/channel/email.rb
@@ -36,6 +36,8 @@ class Channel::Email < ApplicationRecord
   include Channelable
   include Reauthorizable
 
+  AUTHORIZATION_ERROR_THRESHOLD = 10
+
   self.table_name = 'channel_email'
   EDITABLE_ATTRS = [:email, :imap_enabled, :imap_login, :imap_password, :imap_address, :imap_port, :imap_enable_ssl, :imap_inbox_synced_at,
                     :smtp_enabled, :smtp_login, :smtp_password, :smtp_address, :smtp_port, :smtp_domain, :smtp_enable_starttls_auto,
diff --git a/app/models/concerns/reauthorizable.rb b/app/models/concerns/reauthorizable.rb
index dc55d9b2e..cc78b56a0 100644
--- a/app/models/concerns/reauthorizable.rb
+++ b/app/models/concerns/reauthorizable.rb
@@ -29,7 +29,9 @@ module Reauthorizable
   # Implement in your exception handling logic for authorization errors
   def authorization_error!
     ::Redis::Alfred.incr(authorization_error_count_key)
-    prompt_reauthorization! if authorization_error_count >= AUTHORIZATION_ERROR_THRESHOLD
+    # we are giving precendence to the authorization error threshhold defined in the class
+    # so that channels can override the default value
+    prompt_reauthorization! if authorization_error_count >= self.class::AUTHORIZATION_ERROR_THRESHOLD
   end
 
   # Performed automatically if error threshold is breached
diff --git a/spec/models/channel/email_spec.rb b/spec/models/channel/email_spec.rb
new file mode 100644
index 000000000..af3a978f4
--- /dev/null
+++ b/spec/models/channel/email_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+require Rails.root.join 'spec/models/concerns/reauthorizable_shared.rb'
+
+RSpec.describe Channel::Email do
+  let(:channel) { create(:channel_email) }
+
+  describe 'concerns' do
+    it_behaves_like 'reauthorizable'
+
+    context 'when prompt_reauthorization!' do
+      it 'calls channel notifier mail for email' do
+        admin_mailer = double
+        mailer_double = double
+        expect(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).and_return(admin_mailer)
+        expect(admin_mailer).to receive(:email_disconnect).with(channel.inbox).and_return(mailer_double)
+        expect(mailer_double).to receive(:deliver_later)
+        channel.prompt_reauthorization!
+      end
+    end
+  end
+
+  it 'has a valid name' do
+    expect(channel.name).to eq('Email')
+  end
+end
diff --git a/spec/models/concerns/reauthorizable_shared.rb b/spec/models/concerns/reauthorizable_shared.rb
index 62b251367..212afd4af 100644
--- a/spec/models/concerns/reauthorizable_shared.rb
+++ b/spec/models/concerns/reauthorizable_shared.rb
@@ -12,12 +12,22 @@ shared_examples_for 'reauthorizable' do
     expect(obj.authorization_error_count).to eq 1
   end
 
+  it 'prompts reauthorization when error threshold is passed' do
+    obj = FactoryBot.create(model.to_s.underscore.tr('/', '_').to_sym)
+    expect(obj.reauthorization_required?).to eq false
+
+    obj.class::AUTHORIZATION_ERROR_THRESHOLD.times do
+      obj.authorization_error!
+    end
+
+    expect(obj.reauthorization_required?).to eq true
+  end
+
   it 'prompt_reauthorization!' do
     obj = FactoryBot.create(model.to_s.underscore.tr('/', '_').to_sym)
     expect(obj.reauthorization_required?).to eq false
 
     obj.prompt_reauthorization!
-
     expect(obj.reauthorization_required?).to eq true
   end
 

From dceeb57a1d514d32ed17db61763b5ba23899fad4 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 26 May 2022 20:23:36 +0530
Subject: [PATCH 132/177] chore: Update translations from Crowdin (#4751)

---
 .../dashboard/i18n/locale/cs/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/de/report.json      |   2 +-
 .../dashboard/i18n/locale/es/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/it/report.json      |   4 +-
 .../dashboard/i18n/locale/pl/chatlist.json    |   2 +-
 .../dashboard/i18n/locale/sk/report.json      |   2 +-
 .../dashboard/i18n/locale/sr/chatlist.json    |   2 +-
 .../i18n/locale/zh_CN/advancedFilters.json    | 102 +++++++++---------
 .../i18n/locale/zh_CN/attributesMgmt.json     |  48 ++++-----
 .../i18n/locale/zh_CN/automation.json         |   2 +-
 .../dashboard/i18n/locale/zh_CN/contact.json  |   4 +-
 .../i18n/locale/zh_CN/contactFilters.json     |  44 ++++----
 .../i18n/locale/zh_CN/generalSettings.json    |   2 +-
 config/locales/it.yml                         |  12 +--
 14 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/cs/chatlist.json b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
index 020affe76..0d46c6047 100644
--- a/app/javascript/dashboard/i18n/locale/cs/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/cs/chatlist.json
@@ -13,7 +13,7 @@
     },
     "FILTER_ALL": "Vše",
     "ASSIGNEE_TYPE_TABS": {
-      "me": "Důl",
+      "me": "Mine",
       "unassigned": "Nepřiřazeno",
       "all": "Vše"
     },
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index f62143d75..78328b540 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -421,7 +421,7 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Offene Konversationen",
       "LOADING_MESSAGE": "Konversationsdaten werden geladen...",
-      "OPEN": "Offen",
+      "OPEN": "Öffnen",
       "UNATTENDED": "Unbeaufsichtigt",
       "UNASSIGNED": "Nicht zugewiesen"
     },
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index 959598771..a8d0062ee 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -14,7 +14,7 @@
     "FILTER_ALL": "Todos",
     "ASSIGNEE_TYPE_TABS": {
       "me": "Mías",
-      "unassigned": "Unassigned",
+      "unassigned": "Sin asignar",
       "all": "Todos"
     },
     "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 c4948c98c..081c5cc4f 100644
--- a/app/javascript/dashboard/i18n/locale/it/report.json
+++ b/app/javascript/dashboard/i18n/locale/it/report.json
@@ -386,7 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Rapporti CSAT",
     "NO_RECORDS": "Non ci sono risposte al sondaggio CSAT disponibili.",
-    "DOWNLOAD": "Download CSAT Reports",
+    "DOWNLOAD": "Scarica report CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Scegli agenti"
@@ -421,7 +421,7 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Conversazioni aperte",
       "LOADING_MESSAGE": "Caricamento metriche conversazioni...",
-      "OPEN": "Aperte",
+      "OPEN": "Apri",
       "UNATTENDED": "Non partecipate",
       "UNASSIGNED": "Non assegnato"
     },
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 4435da117..84e1f198b 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -13,7 +13,7 @@
     },
     "FILTER_ALL": "Wszystkie",
     "ASSIGNEE_TYPE_TABS": {
-      "me": "Kopalnia",
+      "me": "Mine",
       "unassigned": "Nieprzypisane",
       "all": "Wszystkie"
     },
diff --git a/app/javascript/dashboard/i18n/locale/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
index 5ba7826a3..27cb2b1b5 100644
--- a/app/javascript/dashboard/i18n/locale/sk/report.json
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -421,7 +421,7 @@
     "ACCOUNT_CONVERSATIONS": {
       "HEADER": "Open Conversations",
       "LOADING_MESSAGE": "Loading conversation metrics...",
-      "OPEN": "Otvorené",
+      "OPEN": "Otvoriť",
       "UNATTENDED": "Unattended",
       "UNASSIGNED": "Nepriradené"
     },
diff --git a/app/javascript/dashboard/i18n/locale/sr/chatlist.json b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
index efef0429d..155270e33 100644
--- a/app/javascript/dashboard/i18n/locale/sr/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/sr/chatlist.json
@@ -15,7 +15,7 @@
     "ASSIGNEE_TYPE_TABS": {
       "me": "Moji",
       "unassigned": "Nedodeljen",
-      "all": "Svi"
+      "all": "Sve"
     },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
index 39c814191..b0ca59fde 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/advancedFilters.json
@@ -1,91 +1,91 @@
 {
   "FILTER": {
-    "TITLE": "Filter Conversations",
-    "SUBTITLE": "Add filters below and hit 'Apply filters' to filter conversations.",
-    "ADD_NEW_FILTER": "Add Filter",
-    "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "TITLE": "过滤会话",
+    "SUBTITLE": "在下方添加过滤器并点击“应用过滤器”到过滤对话。",
+    "ADD_NEW_FILTER": "添加过滤器",
+    "FILTER_DELETE_ERROR": "您至少需要一个过滤器来保存",
+    "SUBMIT_BUTTON_LABEL": "应用过滤器",
     "CANCEL_BUTTON_LABEL": "取消",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
-    "TOOLTIP_LABEL": "Filter conversations",
+    "CLEAR_BUTTON_LABEL": "清除过滤器",
+    "EMPTY_VALUE_ERROR": "必须填写值",
+    "TOOLTIP_LABEL": "过滤会话",
     "QUERY_DROPDOWN_LABELS": {
-      "AND": "AND",
-      "OR": "OR"
+      "AND": "和",
+      "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"
+      "equal_to": "等于",
+      "not_equal_to": "不等于",
+      "contains": "包含",
+      "does_not_contain": "不包含",
+      "is_present": "存在",
+      "is_not_present": "不存在",
+      "is_greater_than": "大于",
+      "is_less_than": "小于：",
+      "days_before": "是 x 天前"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "真的",
+      "FALSE": "错误"
     },
     "ATTRIBUTES": {
       "STATUS": "状态",
-      "ASSIGNEE_NAME": "Assignee Name",
+      "ASSIGNEE_NAME": "指派人姓名",
       "INBOX_NAME": "收件箱名称",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "团队名称",
+      "CONVERSATION_IDENTIFIER": "会话标识符",
+      "CAMPAIGN_NAME": "活动名称",
       "LABELS": "标签",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "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"
+      "BROWSER_LANGUAGE": "浏览器语言",
+      "COUNTRY_NAME": "国家",
+      "REFERER_LINK": "引用链接",
+      "CUSTOM_ATTRIBUTE_LIST": "列表",
+      "CUSTOM_ATTRIBUTE_TEXT": "文本",
+      "CUSTOM_ATTRIBUTE_NUMBER": "号码",
+      "CUSTOM_ATTRIBUTE_LINK": "链接",
+      "CUSTOM_ATTRIBUTE_CHECKBOX": "复选框",
+      "CREATED_AT": "创建于",
+      "LAST_ACTIVITY": "上次活动"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "标准过滤器",
+      "ADDITIONAL_FILTERS": "附加过滤器",
       "CUSTOM_ATTRIBUTES": "自定义属性"
     },
     "CUSTOM_VIEWS": {
       "ADD": {
-        "TITLE": "Do you want to save this filter?",
-        "LABEL": "Name this filter",
-        "PLACEHOLDER": "Enter a name for this filter",
+        "TITLE": "您想要保存此过滤器吗？",
+        "LABEL": "给此过滤器命名",
+        "PLACEHOLDER": "输入此过滤器的名称",
         "ERROR_MESSAGE": "名字必填",
-        "SAVE_BUTTON": "Save filter",
+        "SAVE_BUTTON": "保存过滤器",
         "CANCEL_BUTTON": "取消",
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder created successfully",
-          "ERROR_MESSAGE": "Error while creating folder"
+          "SUCCESS_MESSAGE": "文件夹创建成功",
+          "ERROR_MESSAGE": "文件夹创建失败"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "片段创建成功",
+          "ERROR_MESSAGE": "创建片段时出错"
         }
       },
       "DELETE": {
-        "DELETE_BUTTON": "Delete filter",
+        "DELETE_BUTTON": "删除过滤器",
         "MODAL": {
           "CONFIRM": {
             "TITLE": "确认删除",
-            "MESSAGE": "Are you sure to delete the filter ",
+            "MESSAGE": "您确定要删除过滤器吗？ ",
             "YES": "是，删除",
             "NO": "否，保留它"
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "文件夹删除成功",
+          "ERROR_MESSAGE": "删除文件夹时出错"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "片段删除成功",
+          "ERROR_MESSAGE": "删除片段时出错"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
index b1d468b67..22b9d13b8 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/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": "创建",
@@ -16,67 +16,67 @@
         },
         "DESC": {
           "LABEL": "描述信息",
-          "PLACEHOLDER": "Enter custom attribute description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "输入自定义属性描述",
+          "ERROR": "描述是必需的"
         },
         "MODEL": {
           "LABEL": "应用到",
           "PLACEHOLDER": "请选择一个",
-          "ERROR": "Model is required"
+          "ERROR": "模型是必需的"
         },
         "TYPE": {
           "LABEL": "类型",
           "PLACEHOLDER": "请选择一个类型",
-          "ERROR": "Type is required",
+          "ERROR": "类型是必需的",
           "LIST": {
-            "LABEL": "List Values",
-            "PLACEHOLDER": "Please enter value and press enter key",
-            "ERROR": "Must have at least one value"
+            "LABEL": "列表值",
+            "PLACEHOLDER": "请输入值并按回车键",
+            "ERROR": "必须至少有一个值"
           }
         },
         "KEY": {
           "LABEL": "键",
-          "PLACEHOLDER": "Enter custom attribute key",
+          "PLACEHOLDER": "输入自定义属性键",
           "ERROR": "键是必需的",
           "IN_VALID": "无效键"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute added successfully",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "SUCCESS_MESSAGE": "自定义属性添加成功",
+        "ERROR_MESSAGE": "无法创建自定义属性，请稍后再试"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "删除",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "自定义属性删除成功",
+        "ERROR_MESSAGE": "无法删除自定义属性。请重试。"
       },
       "CONFIRM": {
-        "TITLE": "Are you sure want to delete - %{attributeName}",
-        "PLACE_HOLDER": "Please type {attributeName} to confirm",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "TITLE": "您确定要删除 - %{attributeName}",
+        "PLACE_HOLDER": "请输入 {attributeName} 以确认",
+        "MESSAGE": "删除将删除自定义属性",
         "YES": "删除 ",
         "NO": "取消"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Custom Attribute",
+      "TITLE": "编辑自定义属性",
       "UPDATE_BUTTON_TEXT": "更新",
       "TYPE": {
         "LIST": {
-          "LABEL": "List Values",
-          "PLACEHOLDER": "Please enter values and press enter key"
+          "LABEL": "列表值",
+          "PLACEHOLDER": "请输入值并按输入键"
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "自定义属性更新成功",
+        "ERROR_MESSAGE": "更新自定义属性时出错，请重试"
       }
     },
     "TABS": {
       "HEADER": "自定义属性",
-      "CONVERSATION": "Conversation",
+      "CONVERSATION": "会话",
       "CONTACT": "联系人"
     },
     "LIST": {
@@ -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/zh_CN/automation.json b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
index cbb17c275..a33296c4a 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/automation.json
@@ -17,7 +17,7 @@
         "DESC": {
           "LABEL": "描述信息",
           "PLACEHOLDER": "Enter rule description",
-          "ERROR": "Description is required"
+          "ERROR": "描述是必需的"
         },
         "EVENT": {
           "LABEL": "Event",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
index 8976fdfff..8be366df2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contact.json
@@ -186,8 +186,8 @@
     "SEARCH_BUTTON": "搜索",
     "SEARCH_INPUT_PLACEHOLDER": "搜索联系人",
     "FILTER_CONTACTS": "Filter",
-    "FILTER_CONTACTS_SAVE": "Save filter",
-    "FILTER_CONTACTS_DELETE": "Delete filter",
+    "FILTER_CONTACTS_SAVE": "保存过滤器",
+    "FILTER_CONTACTS_DELETE": "删除过滤器",
     "LIST": {
       "LOADING_MESSAGE": "正在加载联系人列表...",
       "404": "没有搜索到联系人🔍",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
index 2a001b828..867d18cde 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/contactFilters.json
@@ -2,28 +2,28 @@
     "CONTACTS_FILTER": {
         "TITLE": "Filter Contacts",
         "SUBTITLE": "Add filters below and hit 'Submit' to filter contacts.",
-        "ADD_NEW_FILTER": "Add Filter",
+        "ADD_NEW_FILTER": "添加过滤器",
         "CLEAR_ALL_FILTERS": "Clear All Filters",
-        "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
+        "FILTER_DELETE_ERROR": "您至少需要一个过滤器来保存",
         "SUBMIT_BUTTON_LABEL": "提交",
         "CANCEL_BUTTON_LABEL": "取消",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
+        "CLEAR_BUTTON_LABEL": "清除过滤器",
+        "EMPTY_VALUE_ERROR": "必须填写值",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
-            "AND": "AND",
-            "OR": "OR"
+            "AND": "和",
+            "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",
+            "equal_to": "等于",
+            "not_equal_to": "不等于",
+            "contains": "包含",
+            "does_not_contain": "不包含",
+            "is_present": "存在",
+            "is_not_present": "不存在",
+            "is_greater_than": "大于",
             "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
+            "days_before": "是 x 天前"
         },
         "ATTRIBUTES": {
             "NAME": "姓名：",
@@ -32,17 +32,17 @@
             "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",
+            "CUSTOM_ATTRIBUTE_LIST": "列表",
+            "CUSTOM_ATTRIBUTE_TEXT": "文本",
+            "CUSTOM_ATTRIBUTE_NUMBER": "号码",
+            "CUSTOM_ATTRIBUTE_LINK": "链接",
+            "CUSTOM_ATTRIBUTE_CHECKBOX": "复选框",
+            "CREATED_AT": "创建于",
             "LAST_ACTIVITY": "Last Activity"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
-            "ADDITIONAL_FILTERS": "Additional Filters",
+            "STANDARD_FILTERS": "标准过滤器",
+            "ADDITIONAL_FILTERS": "附加过滤器",
             "CUSTOM_ATTRIBUTES": "自定义属性"
         }
     }
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
index 151434225..514e7ca89 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/generalSettings.json
@@ -97,7 +97,7 @@
     "SECTIONS": {
       "GENERAL": "General",
       "REPORTS": "报告",
-      "CONVERSATION": "Conversation",
+      "CONVERSATION": "会话",
       "CHANGE_ASSIGNEE": "Change Assignee",
       "CHANGE_TEAM": "Change Team",
       "ADD_LABEL": "Add label to the conversation",
diff --git a/config/locales/it.yml b/config/locales/it.yml
index fabe6efdd..1d8d6c444 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -47,14 +47,14 @@ it:
     default_group_by: giorno
     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
+        contact_name: Nome contatto
+        contact_email_address: Indirizzo email contatto
+        contact_phone_number: Numero di telefono contatto
+        link_to_the_conversation: Link alla conversazione
         agent_name: Nome dell'agente
         rating: Valutazione
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        feedback: Commento del feedback
+        recorded_at: Data di registrazione
   notifications:
     notification_title:
       conversation_creation: "[Nuova conversazione] - #%{display_id} è stato creato in %{inbox_name}"

From 52fad886b88e71f88a81ad44916da746b60cd56d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 27 May 2022 09:26:59 +0530
Subject: [PATCH 133/177] feat: Add business hours in downloadable reports
 (#4674)

Co-authored-by: Aswin Dev P.S <aswindevps@gmail.com>
---
 .../api/v2/accounts/reports_controller.rb     | 27 +++++----
 app/helpers/api/v2/accounts/reports_helper.rb | 56 +++++++++++++++++++
 app/javascript/dashboard/api/reports.js       | 16 +++---
 .../dashboard/api/specs/reports.spec.js       | 13 +++--
 .../dashboard/helper/downloadHelper.js        |  9 ++-
 .../helper/specs/downloadHelper.spec.js       |  4 ++
 .../reports/components/WootReports.vue        |  6 +-
 .../dashboard/store/modules/reports.js        |  8 +--
 .../api/v2/accounts/reports/agents.csv.erb    |  9 +--
 .../api/v2/accounts/reports/inboxes.csv.erb   | 19 ++++---
 .../api/v2/accounts/reports/labels.csv.erb    | 18 +++---
 .../api/v2/accounts/reports/teams.csv.erb     |  9 +--
 config/locales/en.yml                         | 11 ++++
 13 files changed, 138 insertions(+), 67 deletions(-)
 create mode 100644 app/helpers/api/v2/accounts/reports_helper.rb

diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index c2117583a..bbc4dde7b 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -1,4 +1,5 @@
 class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
+  include Api::V2::Accounts::ReportsHelper
   before_action :check_authorization
 
   def index
@@ -12,27 +13,23 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
   end
 
   def agents
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = 'attachment; filename=agents_report.csv'
-    render layout: false, template: 'api/v2/accounts/reports/agents.csv.erb', format: 'csv'
+    @report_data = generate_agents_report
+    generate_csv('agents_report', 'api/v2/accounts/reports/agents.csv.erb')
   end
 
   def inboxes
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = 'attachment; filename=inboxes_report.csv'
-    render layout: false, template: 'api/v2/accounts/reports/inboxes.csv.erb', format: 'csv'
+    @report_data = generate_inboxes_report
+    generate_csv('inboxes_report', 'api/v2/accounts/reports/inboxes.csv.erb')
   end
 
   def labels
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = 'attachment; filename=labels_report.csv'
-    render layout: false, template: 'api/v2/accounts/reports/labels.csv.erb', format: 'csv'
+    @report_data = generate_labels_report
+    generate_csv('labels_report', 'api/v2/accounts/reports/labels.csv.erb')
   end
 
   def teams
-    response.headers['Content-Type'] = 'text/csv'
-    response.headers['Content-Disposition'] = 'attachment; filename=teams_report.csv'
-    render layout: false, template: 'api/v2/accounts/reports/teams.csv.erb', format: 'csv'
+    @report_data = generate_teams_report
+    generate_csv('teams_report', 'api/v2/accounts/reports/teams.csv.erb')
   end
 
   def conversations
@@ -43,6 +40,12 @@ class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
 
   private
 
+  def generate_csv(filename, template)
+    response.headers['Content-Type'] = 'text/csv'
+    response.headers['Content-Disposition'] = "attachment; filename=#{filename}.csv"
+    render layout: false, template: template, format: 'csv'
+  end
+
   def check_authorization
     raise Pundit::NotAuthorizedError unless Current.account_user.administrator?
   end
diff --git a/app/helpers/api/v2/accounts/reports_helper.rb b/app/helpers/api/v2/accounts/reports_helper.rb
new file mode 100644
index 000000000..0604eba2f
--- /dev/null
+++ b/app/helpers/api/v2/accounts/reports_helper.rb
@@ -0,0 +1,56 @@
+module Api::V2::Accounts::ReportsHelper
+  def generate_agents_report
+    Current.account.users.map do |agent|
+      agent_report = generate_report({ type: :agent, id: agent.id })
+      [agent.name] + generate_readable_report_metrics(agent_report)
+    end
+  end
+
+  def generate_inboxes_report
+    Current.account.inboxes.map do |inbox|
+      inbox_report = generate_report({ type: :inbox, id: inbox.id })
+      [inbox.name, inbox.channel&.name] + generate_readable_report_metrics(inbox_report)
+    end
+  end
+
+  def generate_teams_report
+    Current.account.teams.map do |team|
+      team_report = generate_report({ type: :team, id: team.id })
+      [team.name] + generate_readable_report_metrics(team_report)
+    end
+  end
+
+  def generate_labels_report
+    Current.account.labels.map do |label|
+      label_report = generate_report({ type: :label, id: label.id })
+      [label.title] + generate_readable_report_metrics(label_report)
+    end
+  end
+
+  def generate_report(report_params)
+    V2::ReportBuilder.new(
+      Current.account,
+      report_params.merge(
+        {
+          since: params[:since],
+          until: params[:until],
+          business_hours: ActiveModel::Type::Boolean.new.cast(params[:business_hours])
+        }
+      )
+    ).summary
+  end
+
+  private
+
+  def generate_readable_report_metrics(report_metric)
+    [
+      report_metric[:conversations_count],
+      time_to_minutes(report_metric[:avg_first_response_time]),
+      time_to_minutes(report_metric[:avg_resolution_time])
+    ]
+  end
+
+  def time_to_minutes(time_in_seconds)
+    (time_in_seconds / 60).to_i
+  end
+end
diff --git a/app/javascript/dashboard/api/reports.js b/app/javascript/dashboard/api/reports.js
index ca50c062f..61fd0adca 100644
--- a/app/javascript/dashboard/api/reports.js
+++ b/app/javascript/dashboard/api/reports.js
@@ -53,27 +53,27 @@ class ReportsAPI extends ApiClient {
     });
   }
 
-  getAgentReports(since, until) {
+  getAgentReports({ from: since, to: until, businessHours }) {
     return axios.get(`${this.url}/agents`, {
-      params: { since, until },
+      params: { since, until, business_hours: businessHours },
     });
   }
 
-  getLabelReports(since, until) {
+  getLabelReports({ from: since, to: until, businessHours }) {
     return axios.get(`${this.url}/labels`, {
-      params: { since, until },
+      params: { since, until, business_hours: businessHours },
     });
   }
 
-  getInboxReports(since, until) {
+  getInboxReports({ from: since, to: until, businessHours }) {
     return axios.get(`${this.url}/inboxes`, {
-      params: { since, until },
+      params: { since, until, business_hours: businessHours },
     });
   }
 
-  getTeamReports(since, until) {
+  getTeamReports({ from: since, to: until, businessHours }) {
     return axios.get(`${this.url}/teams`, {
-      params: { since, until },
+      params: { since, until, business_hours: businessHours },
     });
   }
 }
diff --git a/app/javascript/dashboard/api/specs/reports.spec.js b/app/javascript/dashboard/api/specs/reports.spec.js
index b51c87db5..4e2a8f38f 100644
--- a/app/javascript/dashboard/api/specs/reports.spec.js
+++ b/app/javascript/dashboard/api/specs/reports.spec.js
@@ -47,20 +47,25 @@ describe('#Reports API', () => {
     });
 
     it('#getAgentReports', () => {
-      reportsAPI.getAgentReports(1621103400, 1621621800);
+      reportsAPI.getAgentReports({
+        from: 1621103400,
+        to: 1621621800,
+        businessHours: true,
+      });
       expect(context.axiosMock.get).toHaveBeenCalledWith(
         '/api/v2/reports/agents',
         {
           params: {
             since: 1621103400,
             until: 1621621800,
+            business_hours: true,
           },
         }
       );
     });
 
     it('#getLabelReports', () => {
-      reportsAPI.getLabelReports(1621103400, 1621621800);
+      reportsAPI.getLabelReports({ from: 1621103400, to: 1621621800 });
       expect(context.axiosMock.get).toHaveBeenCalledWith(
         '/api/v2/reports/labels',
         {
@@ -73,7 +78,7 @@ describe('#Reports API', () => {
     });
 
     it('#getInboxReports', () => {
-      reportsAPI.getInboxReports(1621103400, 1621621800);
+      reportsAPI.getInboxReports({ from: 1621103400, to: 1621621800 });
       expect(context.axiosMock.get).toHaveBeenCalledWith(
         '/api/v2/reports/inboxes',
         {
@@ -86,7 +91,7 @@ describe('#Reports API', () => {
     });
 
     it('#getTeamReports', () => {
-      reportsAPI.getTeamReports(1621103400, 1621621800);
+      reportsAPI.getTeamReports({ from: 1621103400, to: 1621621800 });
       expect(context.axiosMock.get).toHaveBeenCalledWith(
         '/api/v2/reports/teams',
         {
diff --git a/app/javascript/dashboard/helper/downloadHelper.js b/app/javascript/dashboard/helper/downloadHelper.js
index 68c3b5cee..94b6a69bd 100644
--- a/app/javascript/dashboard/helper/downloadHelper.js
+++ b/app/javascript/dashboard/helper/downloadHelper.js
@@ -13,5 +13,10 @@ export const downloadCsvFile = (fileName, content) => {
   return link;
 };
 
-export const generateFileName = ({ type, to }) =>
-  `${type}-report-${format(fromUnixTime(to), 'dd-MM-yyyy')}.csv`;
+export const generateFileName = ({ type, to, businessHours = false }) => {
+  let name = `${type}-report-${format(fromUnixTime(to), 'dd-MM-yyyy')}`;
+  if (businessHours) {
+    name = `${name}-business-hours`;
+  }
+  return `${name}.csv`;
+};
diff --git a/app/javascript/dashboard/helper/specs/downloadHelper.spec.js b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
index 6cdec4160..477123422 100644
--- a/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/downloadHelper.spec.js
@@ -5,5 +5,9 @@ describe('#generateFileName', () => {
     expect(generateFileName({ type: 'csat', to: 1652812199 })).toEqual(
       'csat-report-17-05-2022.csv'
     );
+
+    expect(
+      generateFileName({ type: 'csat', to: 1652812199, businessHours: true })
+    ).toEqual('csat-report-17-05-2022-business-hours.csv');
   });
 });
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 34188a12a..098960e85 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/WootReports.vue
@@ -251,7 +251,7 @@ export default {
       });
     },
     downloadReports() {
-      const { from, to, type } = this;
+      const { from, to, type, businessHours } = this;
       const dispatchMethods = {
         agent: 'downloadAgentReports',
         label: 'downloadLabelReports',
@@ -259,8 +259,8 @@ export default {
         team: 'downloadTeamReports',
       };
       if (dispatchMethods[type]) {
-        const fileName = generateFileName({ type, to });
-        const params = { from, to, fileName };
+        const fileName = generateFileName({ type, to, businessHours });
+        const params = { from, to, fileName, businessHours };
         this.$store.dispatch(dispatchMethods[type], params);
       }
     },
diff --git a/app/javascript/dashboard/store/modules/reports.js b/app/javascript/dashboard/store/modules/reports.js
index 9ae571803..0404d1aca 100644
--- a/app/javascript/dashboard/store/modules/reports.js
+++ b/app/javascript/dashboard/store/modules/reports.js
@@ -120,7 +120,7 @@ export const actions = {
     commit(types.default.UPDATE_REPORT_AGENTS_STATUS, data);
   },
   downloadAgentReports(_, reportObj) {
-    return Report.getAgentReports(reportObj.from, reportObj.to)
+    return Report.getAgentReports(reportObj)
       .then(response => {
         downloadCsvFile(reportObj.fileName, response.data);
       })
@@ -129,7 +129,7 @@ export const actions = {
       });
   },
   downloadLabelReports(_, reportObj) {
-    return Report.getLabelReports(reportObj.from, reportObj.to)
+    return Report.getLabelReports(reportObj)
       .then(response => {
         downloadCsvFile(reportObj.fileName, response.data);
       })
@@ -138,7 +138,7 @@ export const actions = {
       });
   },
   downloadInboxReports(_, reportObj) {
-    return Report.getInboxReports(reportObj.from, reportObj.to)
+    return Report.getInboxReports(reportObj)
       .then(response => {
         downloadCsvFile(reportObj.fileName, response.data);
       })
@@ -147,7 +147,7 @@ export const actions = {
       });
   },
   downloadTeamReports(_, reportObj) {
-    return Report.getTeamReports(reportObj.from, reportObj.to)
+    return Report.getTeamReports(reportObj)
       .then(response => {
         downloadCsvFile(reportObj.fileName, response.data);
       })
diff --git a/app/views/api/v2/accounts/reports/agents.csv.erb b/app/views/api/v2/accounts/reports/agents.csv.erb
index 9c8f1f814..bed88dfd7 100644
--- a/app/views/api/v2/accounts/reports/agents.csv.erb
+++ b/app/views/api/v2/accounts/reports/agents.csv.erb
@@ -6,14 +6,7 @@
   ]
 %>
 <%= CSV.generate_line headers -%>
-<% Current.account.users.each do |agent| %>
-  <% agent_report = V2::ReportBuilder.new(Current.account, {
-        type: :agent,
-        id: agent.id,
-        since: params[:since],
-        until: params[:until]
-      }).summary %>
-  <% row = [ agent.name, agent_report[:conversations_count], (agent_report[:avg_first_response_time]/60).to_i, (agent_report[:avg_resolution_time]/60).to_i ] %>
+<% @report_data.each do |row| %>
 <%= CSV.generate_line row -%>
 <% end %>
 <%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>
diff --git a/app/views/api/v2/accounts/reports/inboxes.csv.erb b/app/views/api/v2/accounts/reports/inboxes.csv.erb
index c82be2df4..89b3b1182 100644
--- a/app/views/api/v2/accounts/reports/inboxes.csv.erb
+++ b/app/views/api/v2/accounts/reports/inboxes.csv.erb
@@ -1,12 +1,13 @@
-<% headers = ['Inbox name', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
+<% headers = [
+    I18n.t('reports.inbox_csv.inbox_name'),
+    I18n.t('reports.inbox_csv.inbox_type'),
+    I18n.t('reports.inbox_csv.conversations_count'),
+    I18n.t('reports.inbox_csv.avg_first_response_time'),
+    I18n.t('reports.inbox_csv.avg_resolution_time')
+  ]
+%>
 <%= CSV.generate_line headers -%>
-<% Current.account.inboxes.each do |inbox| %>
-  <% inbox_report = V2::ReportBuilder.new(Current.account, {
-        type: :inbox,
-        id: inbox.id,
-        since: params[:since],
-        until: params[:until]
-      }).summary %>
-  <% row = [ inbox.name, inbox_report[:conversations_count], (inbox_report[:avg_first_response_time]/60).to_i, (inbox_report[:avg_resolution_time]/60).to_i ] %>
+<% @report_data.each do |row| %>
 <%= CSV.generate_line row -%>
 <% end %>
+<%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>
diff --git a/app/views/api/v2/accounts/reports/labels.csv.erb b/app/views/api/v2/accounts/reports/labels.csv.erb
index dcbc2b974..9fd0a9cc5 100644
--- a/app/views/api/v2/accounts/reports/labels.csv.erb
+++ b/app/views/api/v2/accounts/reports/labels.csv.erb
@@ -1,12 +1,12 @@
-<% headers = ['Label Title', 'Conversations count', 'Avg first response time (Minutes)', 'Avg resolution time (Minutes)'] %>
+<% headers = [
+    I18n.t('reports.label_csv.label_title'),
+    I18n.t('reports.label_csv.conversations_count'),
+    I18n.t('reports.label_csv.avg_first_response_time'),
+    I18n.t('reports.label_csv.avg_resolution_time')
+  ]
+%>
 <%= CSV.generate_line headers -%>
-<% Current.account.labels.each do |label| %>
-  <% label_report = V2::ReportBuilder.new(Current.account, {
-        type: :label,
-        id: label.id,
-        since: params[:since],
-        until: params[:until]
-      }).summary %>
-  <% row = [ label.title, label_report[:conversations_count], (label_report[:avg_first_response_time]/60).to_i, (label_report[:avg_resolution_time]/60).to_i ] %>
+<% @report_data.each do |row| %>
 <%= CSV.generate_line row -%>
 <% end %>
+<%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>
diff --git a/app/views/api/v2/accounts/reports/teams.csv.erb b/app/views/api/v2/accounts/reports/teams.csv.erb
index f7b82cb1d..e50e195bd 100644
--- a/app/views/api/v2/accounts/reports/teams.csv.erb
+++ b/app/views/api/v2/accounts/reports/teams.csv.erb
@@ -6,14 +6,7 @@
   ]
 %>
 <%= CSV.generate_line headers -%>
-<% Current.account.teams.each do |team| %>
-  <% team_report = V2::ReportBuilder.new(Current.account, {
-        type: :team,
-        id: team.id,
-        since: params[:since],
-        until: params[:until]
-      }).summary %>
-  <% row = [ team.name, team_report[:conversations_count], (team_report[:avg_first_response_time]/60).to_i, (team_report[:avg_resolution_time]/60).to_i ] %>
+<% @report_data.each do |row| %>
 <%= CSV.generate_line row -%>
 <% end %>
 <%= CSV.generate_line [I18n.t('reports.period', since: Date.strptime(params[:since], '%s'), until: Date.strptime(params[:until], '%s'))] %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index bd7829b53..b986ef1c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -54,6 +54,17 @@ en:
       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

From 50d2dbd46257eb40b8741b6fe91850b6e896e1a3 Mon Sep 17 00:00:00 2001
From: Devin Ellis <devin@ellis.cl>
Date: Thu, 26 May 2022 23:53:29 -0700
Subject: [PATCH 134/177] chore: Fix the exception while destructuring data in
 chatwoot:error listener  (#4702)

---
 app/javascript/widget/store/modules/contacts.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/javascript/widget/store/modules/contacts.js b/app/javascript/widget/store/modules/contacts.js
index c8187a9f8..587b84ac6 100644
--- a/app/javascript/widget/store/modules/contacts.js
+++ b/app/javascript/widget/store/modules/contacts.js
@@ -61,9 +61,7 @@ export const actions = {
         dispatch('conversationAttributes/getAttributes', {}, { root: true });
       }
     } catch (error) {
-      const {
-        response: { data },
-      } = error;
+      const data = error && error.response && error.response.data ? error.response.data : error
       IFrameHelper.sendMessage({
         event: 'error',
         errorType: SET_USER_ERROR,

From 568c30e93e92ddcaffcf8874332d07c692590b8d Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Fri, 27 May 2022 17:33:24 +0530
Subject: [PATCH 135/177] chore: Update ruby and docker base image to 3.0.4
 (#4693)

* chore: Update ruby version to 3.0.4

* chore: update ruby version in docker workflow

* chore: update ruby version to 3.1.2

* Upgrade vue-jest to remove deasync

* Revert to 3.0.4 to see if deasync issue is fixed

* fix: script failure if pg/redis not opted in

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .circleci/config.yml                 |   2 +-
 .github/workflows/run_foss_spec.yml  |   2 +-
 .ruby-version                        |   2 +-
 Gemfile                              |   2 +-
 Gemfile.lock                         |   2 +-
 deployment/chatwoot-web.1.service    |   6 +-
 deployment/chatwoot-worker.1.service |   6 +-
 deployment/setup_18.04.sh            |   4 +-
 deployment/setup_20.04.sh            |  14 +-
 docker/Dockerfile                    |   4 +-
 package.json                         |   2 +-
 yarn.lock                            | 370 ++++++++++++++-------------
 12 files changed, 209 insertions(+), 207 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 076903576..87572fdc3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,7 +7,7 @@ defaults: &defaults
   working_directory: ~/build
   docker:
     # specify the version you desire here
-    - image: cimg/ruby:3.0.2-browsers
+    - image: cimg/ruby:3.0.4-browsers
 
     # Specify service dependencies here if necessary
     # CircleCI maintains a library of pre-built images
diff --git a/.github/workflows/run_foss_spec.yml b/.github/workflows/run_foss_spec.yml
index 395e063e7..39df7aa3d 100644
--- a/.github/workflows/run_foss_spec.yml
+++ b/.github/workflows/run_foss_spec.yml
@@ -47,7 +47,7 @@ jobs:
 
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.0.2 # Not needed with a .ruby-version file
+        ruby-version: 3.0.4 # Not needed with a .ruby-version file
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
     - name: yarn
diff --git a/.ruby-version b/.ruby-version
index b50214693..b0f2dcb32 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.2
+3.0.4
diff --git a/Gemfile b/Gemfile
index 55d02d87c..f7cac3c70 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ruby '3.0.2'
+ruby '3.0.4'
 
 ##-- base gems for rails --##
 gem 'rack-cors', require: 'rack/cors'
diff --git a/Gemfile.lock b/Gemfile.lock
index 880390f16..3ba3e0a36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -752,7 +752,7 @@ DEPENDENCIES
   working_hours
 
 RUBY VERSION
-   ruby 3.0.2p107
+   ruby 3.0.4p208
 
 BUNDLED WITH
    2.3.10
diff --git a/deployment/chatwoot-web.1.service b/deployment/chatwoot-web.1.service
index 40f64b563..15d70e1bf 100644
--- a/deployment/chatwoot-web.1.service
+++ b/deployment/chatwoot-web.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.2/bin:/home/chatwoot/.rvm/gems/ruby-3.0.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4/bin:/home/chatwoot/.rvm/gems/ruby-3.0.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.2"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.2:/home/chatwoot/.rvm/gems/ruby-3.0.2@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.4"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4:/home/chatwoot/.rvm/gems/ruby-3.0.4@global"
diff --git a/deployment/chatwoot-worker.1.service b/deployment/chatwoot-worker.1.service
index fa13898c0..6e6e113f0 100644
--- a/deployment/chatwoot-worker.1.service
+++ b/deployment/chatwoot-worker.1.service
@@ -16,10 +16,10 @@ KillMode=mixed
 StandardInput=null
 SyslogIdentifier=%p
 
-Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.2/bin:/home/chatwoot/.rvm/gems/ruby-3.0.2@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.2/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
+Environment="PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4/bin:/home/chatwoot/.rvm/gems/ruby-3.0.4@global/bin:/home/chatwoot/.rvm/rubies/ruby-3.0.4/bin:/home/chatwoot/.rvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin:/home/chatwoot/.rvm/bin:/home/chatwoot/.rvm/bin"
 Environment="PORT=3000"
 Environment="RAILS_ENV=production"
 Environment="NODE_ENV=production"
 Environment="RAILS_LOG_TO_STDOUT=true"
-Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.2"
-Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.2:/home/chatwoot/.rvm/gems/ruby-3.0.2@global"
+Environment="GEM_HOME=/home/chatwoot/.rvm/gems/ruby-3.0.4"
+Environment="GEM_PATH=/home/chatwoot/.rvm/gems/ruby-3.0.4:/home/chatwoot/.rvm/gems/ruby-3.0.4@global"
diff --git a/deployment/setup_18.04.sh b/deployment/setup_18.04.sh
index 9e9e3cf12..d8250f5eb 100644
--- a/deployment/setup_18.04.sh
+++ b/deployment/setup_18.04.sh
@@ -43,8 +43,8 @@ RAILS_ENV=production
 sudo -i -u chatwoot << EOF
 rvm --version
 rvm autolibs disable
-rvm install "ruby-3.0.2"
-rvm use 3.0.2 --default
+rvm install "ruby-3.0.4"
+rvm use 3.0.4 --default
 
 git clone https://github.com/chatwoot/chatwoot.git
 cd chatwoot
diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 13c26f513..6f9512f39 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -7,7 +7,8 @@
 
 set -eu -o pipefail
 trap exit_handler EXIT
-
+pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
+ 
 function exit_handler() {
   if [ "$?" -ne 0 ]; then
    echo -en "\nSome error has occured. Check '/var/log/chatwoot-setup.log' for details.\n"
@@ -77,8 +78,7 @@ function configure_rvm() {
 }
 
 function configure_db() {
-  pg_pass=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 15 ; echo '')
-  sudo -i -u postgres psql << EOF
+ sudo -i -u postgres psql << EOF
   \set pass `echo $pg_pass`
   CREATE USER chatwoot CREATEDB;
   ALTER USER chatwoot PASSWORD :'pass';
@@ -103,8 +103,8 @@ function setup_chatwoot() {
   sudo -i -u chatwoot << EOF
   rvm --version
   rvm autolibs disable
-  rvm install "ruby-3.0.2"
-  rvm use 3.0.2 --default
+  rvm install "ruby-3.0.4"
+  rvm use 3.0.4 --default
 
   git clone https://github.com/chatwoot/chatwoot.git
   cd chatwoot
@@ -236,7 +236,7 @@ EOF
   configure_systemd_services &>> "${LOG_FILE}"
 
   public_ip=$(curl http://checkip.amazonaws.com -s)
-  
+
   if [ "$configure_webserver" != "yes" ]
   then
     cat << EOF
@@ -245,7 +245,7 @@ EOF
 Woot! Woot!! Chatwoot server installation is complete.
 The server will be accessible at http://$public_ip:3000
 
-To configure a domain and SSL certificate, follow the guide at 
+To configure a domain and SSL certificate, follow the guide at
 https://www.chatwoot.com/docs/deployment/deploy-chatwoot-in-linux-vm
 
 Join the community at https://chatwoot.com/community
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 64c49b324..71a6dc72f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,5 @@
 # pre-build stage
-FROM ruby:3.0.2-alpine AS pre-builder
+FROM ruby:3.0.4-alpine AS pre-builder
 
 # ARG default to production settings
 # For development docker-compose file overrides ARGS
@@ -66,7 +66,7 @@ RUN rm -rf /gems/ruby/3.0.0/cache/*.gem \
   && find /gems/ruby/3.0.0/gems/ \( -name "*.c" -o -name "*.o" \) -delete
 
 # final build stage
-FROM ruby:3.0.2-alpine
+FROM ruby:3.0.4-alpine
 
 ARG BUNDLE_WITHOUT="development:test"
 ENV BUNDLE_WITHOUT ${BUNDLE_WITHOUT}
diff --git a/package.json b/package.json
index f862e0fbe..dcfd8d5db 100644
--- a/package.json
+++ b/package.json
@@ -114,7 +114,7 @@
     "lint-staged": "10.5.4",
     "prettier": "^1.16.4",
     "rimraf": "^3.0.0",
-    "vue-jest": "3.0.7",
+    "vue-jest": "4",
     "webpack-dev-server": "3.11.2"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index fa46ddb37..bd138a972 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16,6 +16,13 @@
   dependencies:
     "@babel/highlight" "^7.12.13"
 
+"@babel/code-frame@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
+  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+  dependencies:
+    "@babel/highlight" "^7.16.7"
+
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8":
   version "7.13.15"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.15.tgz#7e8eea42d0b64fda2b375b22d06c605222e848f4"
@@ -73,6 +80,15 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
+"@babel/generator@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d"
+  integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==
+  dependencies:
+    "@babel/types" "^7.18.2"
+    "@jridgewell/gen-mapping" "^0.3.0"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
@@ -145,6 +161,11 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
+"@babel/helper-environment-visitor@^7.16.7", "@babel/helper-environment-visitor@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd"
+  integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ==
+
 "@babel/helper-explode-assignable-expression@^7.12.13":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
@@ -161,6 +182,14 @@
     "@babel/template" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/helper-function-name@^7.17.9":
+  version "7.17.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
+  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
+  dependencies:
+    "@babel/template" "^7.16.7"
+    "@babel/types" "^7.17.0"
+
 "@babel/helper-get-function-arity@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
@@ -176,6 +205,13 @@
     "@babel/traverse" "^7.13.15"
     "@babel/types" "^7.13.16"
 
+"@babel/helper-hoist-variables@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
+  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-member-expression-to-functions@^7.13.0", "@babel/helper-member-expression-to-functions@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
@@ -190,6 +226,13 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
+"@babel/helper-module-imports@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
+  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.13.14":
   version "7.13.14"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
@@ -204,6 +247,20 @@
     "@babel/traverse" "^7.13.13"
     "@babel/types" "^7.13.14"
 
+"@babel/helper-module-transforms@^7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd"
+  integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.16.7"
+    "@babel/helper-module-imports" "^7.16.7"
+    "@babel/helper-simple-access" "^7.17.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/template" "^7.16.7"
+    "@babel/traverse" "^7.18.0"
+    "@babel/types" "^7.18.0"
+
 "@babel/helper-optimise-call-expression@^7.12.13":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
@@ -221,6 +278,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
   integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
 
+"@babel/helper-plugin-utils@^7.17.12":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96"
+  integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA==
+
 "@babel/helper-remap-async-to-generator@^7.13.0":
   version "7.13.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
@@ -247,6 +309,13 @@
   dependencies:
     "@babel/types" "^7.13.12"
 
+"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9"
+  integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ==
+  dependencies:
+    "@babel/types" "^7.18.2"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
@@ -261,11 +330,23 @@
   dependencies:
     "@babel/types" "^7.12.13"
 
+"@babel/helper-split-export-declaration@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
+  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+  dependencies:
+    "@babel/types" "^7.16.7"
+
 "@babel/helper-validator-identifier@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
   integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
 
+"@babel/helper-validator-identifier@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
+  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+
 "@babel/helper-validator-option@^7.12.17":
   version "7.12.17"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
@@ -299,11 +380,25 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.16.7":
+  version "7.17.12"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351"
+  integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    chalk "^2.0.0"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.12.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.13", "@babel/parser@^7.12.7", "@babel/parser@^7.13.12", "@babel/parser@^7.13.16", "@babel/parser@^7.13.9", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6":
   version "7.13.16"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.16.tgz#0f18179b0448e6939b1f3f5c4c355a3a9bcdfd37"
   integrity sha512-6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw==
 
+"@babel/parser@^7.16.7", "@babel/parser@^7.18.0":
+  version "7.18.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.3.tgz#39e99c7b0c4c56cef4d1eed8de9f506411c2ebc2"
+  integrity sha512-rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ==
+
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
   version "7.13.12"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
@@ -724,6 +819,16 @@
     "@babel/helper-simple-access" "^7.12.13"
     babel-plugin-dynamic-import-node "^2.3.3"
 
+"@babel/plugin-transform-modules-commonjs@^7.2.0":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e"
+  integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.18.0"
+    "@babel/helper-plugin-utils" "^7.17.12"
+    "@babel/helper-simple-access" "^7.18.2"
+    babel-plugin-dynamic-import-node "^2.3.3"
+
 "@babel/plugin-transform-modules-systemjs@^7.13.8":
   version "7.13.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
@@ -1049,6 +1154,15 @@
     "@babel/parser" "^7.12.13"
     "@babel/types" "^7.12.13"
 
+"@babel/template@^7.16.7":
+  version "7.16.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
+  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/parser" "^7.16.7"
+    "@babel/types" "^7.16.7"
+
 "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.13.17", "@babel/traverse@^7.7.0":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.17.tgz#c85415e0c7d50ac053d758baec98b28b2ecfeea3"
@@ -1063,6 +1177,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.18.0":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8"
+  integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA==
+  dependencies:
+    "@babel/code-frame" "^7.16.7"
+    "@babel/generator" "^7.18.2"
+    "@babel/helper-environment-visitor" "^7.18.2"
+    "@babel/helper-function-name" "^7.17.9"
+    "@babel/helper-hoist-variables" "^7.16.7"
+    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/parser" "^7.18.0"
+    "@babel/types" "^7.18.2"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.14", "@babel/types@^7.13.16", "@babel/types@^7.13.17", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.1", "@babel/types@^7.7.0", "@babel/types@^7.9.6":
   version "7.13.17"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
@@ -1071,6 +1201,14 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.16.7", "@babel/types@^7.17.0", "@babel/types@^7.18.0", "@babel/types@^7.18.2":
+  version "7.18.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.2.tgz#191abfed79ebe6f4242f643a9a5cbaa36b10b091"
+  integrity sha512-0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.16.7"
+    to-fast-properties "^2.0.0"
+
 "@base2/pretty-print-object@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@base2/pretty-print-object/-/pretty-print-object-1.0.0.tgz#860ce718b0b73f4009e153541faff2cb6b85d047"
@@ -1518,6 +1656,38 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9"
+  integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.0"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz#30cd49820a962aff48c8fffc5cd760151fca61fe"
+  integrity sha512-8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA==
+
+"@jridgewell/set-array@^1.0.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea"
+  integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c"
+  integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w==
+
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea"
+  integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@lit/reactive-element@^1.0.0", "@lit/reactive-element@^1.1.0":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@lit/reactive-element/-/reactive-element-1.1.1.tgz#523b29e529e881fce47bab764ea1b8058fd45796"
@@ -2717,16 +2887,6 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
-"@types/strip-bom@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/strip-bom/-/strip-bom-3.0.0.tgz#14a8ec3956c2e81edb7520790aecf21c290aebd2"
-  integrity sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=
-
-"@types/strip-json-comments@0.0.30":
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
-  integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
-
 "@types/tapable@^1", "@types/tapable@^1.0.5":
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.7.tgz#545158342f949e8fd3bfd813224971ecddc3fac4"
@@ -3591,15 +3751,6 @@ axobject-query@^2.2.0:
   resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
   integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
 
-babel-code-frame@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
-
 babel-core@^7.0.0-bridge.0:
   version "7.0.0-bridge.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
@@ -3660,13 +3811,6 @@ babel-loader@8.2.2, babel-loader@^8.2.2:
     make-dir "^3.1.0"
     schema-utils "^2.6.5"
 
-babel-messages@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
-  integrity sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-apply-mdx-type-prop@1.6.22:
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/babel-plugin-apply-mdx-type-prop/-/babel-plugin-apply-mdx-type-prop-1.6.22.tgz#d216e8fd0de91de3f1478ef3231e05446bc8705b"
@@ -3804,24 +3948,6 @@ babel-plugin-syntax-jsx@^6.18.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
   integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
 
-babel-plugin-transform-es2015-modules-commonjs@^6.26.0:
-  version "6.26.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
-  integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.24.1"
-    babel-runtime "^6.26.0"
-    babel-template "^6.26.0"
-    babel-types "^6.26.0"
-
-babel-plugin-transform-strict-mode@^6.24.1:
-  version "6.24.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
-  integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.24.1"
-
 babel-plugin-transform-vue-jsx@^3.5.0, babel-plugin-transform-vue-jsx@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz#d40492e6692a36b594f7e9a1928f43e969740960"
@@ -3891,50 +4017,6 @@ babel-preset-vue@^2.0.2:
     babel-plugin-syntax-jsx "^6.18.0"
     babel-plugin-transform-vue-jsx "^3.5.0"
 
-babel-runtime@^6.22.0, babel-runtime@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
-babel-template@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
-  integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=
-  dependencies:
-    babel-runtime "^6.26.0"
-    babel-traverse "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    lodash "^4.17.4"
-
-babel-traverse@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
-  integrity sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=
-  dependencies:
-    babel-code-frame "^6.26.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.26.0"
-    babel-types "^6.26.0"
-    babylon "^6.18.0"
-    debug "^2.6.8"
-    globals "^9.18.0"
-    invariant "^2.2.2"
-    lodash "^4.17.4"
-
-babel-types@^6.24.1, babel-types@^6.26.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
-  integrity sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=
-  dependencies:
-    babel-runtime "^6.26.0"
-    esutils "^2.0.2"
-    lodash "^4.17.4"
-    to-fast-properties "^1.0.3"
-
 babel-walk@3.0.0-canary-5:
   version "3.0.0-canary-5"
   resolved "https://registry.yarnpkg.com/babel-walk/-/babel-walk-3.0.0-canary-5.tgz#f66ecd7298357aee44955f235a6ef54219104b11"
@@ -3942,11 +4024,6 @@ babel-walk@3.0.0-canary-5:
   dependencies:
     "@babel/types" "^7.9.6"
 
-babylon@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-  integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
-
 bail@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.5.tgz#b6fa133404a392cbc1f8c4bf63f5953351e7a776"
@@ -4726,7 +4803,7 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone@2.x, clone@^2.1.2:
+clone@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
   integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
@@ -5061,11 +5138,6 @@ core-js@3.11.0, core-js@^3.0.4, core-js@^3.11.0, core-js@^3.6.5, core-js@^3.8.2:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.11.0.tgz#05dac6aa70c0a4ad842261f8957b961d36eb8926"
   integrity sha512-bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw==
 
-core-js@^2.4.0:
-  version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
-  integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -5540,14 +5612,6 @@ de-indent@^1.0.2:
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=
 
-deasync@^0.1.15:
-  version "0.1.21"
-  resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.21.tgz#bb11eabd4466c0d8776f0d82deb8a6126460d30f"
-  integrity sha512-kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w==
-  dependencies:
-    bindings "^1.5.0"
-    node-addon-api "^1.7.1"
-
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -6890,14 +6954,6 @@ finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-babel-config@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.2.0.tgz#a9b7b317eb5b9860cda9d54740a8c8337a2283a2"
-  integrity sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==
-  dependencies:
-    json5 "^0.5.1"
-    path-exists "^3.0.0"
-
 find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
@@ -7409,11 +7465,6 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globals@^9.18.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-
 globalthis@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.2.tgz#2a235d34f4d8036219f7e34929b5de9e18166b8b"
@@ -8127,7 +8178,7 @@ interpret@^2.2.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
-invariant@^2.2.2, invariant@^2.2.3, invariant@^2.2.4:
+invariant@^2.2.3, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@@ -9185,7 +9236,7 @@ jest@26.6.3:
     import-local "^3.0.2"
     jest-cli "^26.6.3"
 
-js-beautify@^1.6.12, js-beautify@^1.6.14:
+js-beautify@^1.6.12:
   version "1.13.13"
   resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.13.13.tgz#756907d1728f329f2b84c42efd56ad17514620bf"
   integrity sha512-oH+nc0U5mOAqX8M5JO1J0Pw/7Q35sAdOsM5W3i87pir9Ntx6P/5Gx1xLNoK+MGyvHk4rqqRCE4Oq58H6xl2W7A==
@@ -9216,11 +9267,6 @@ js-stringify@^1.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
 js-yaml@^3.13.1, js-yaml@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
@@ -9335,11 +9381,6 @@ json3@^3.3.3:
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
-json5@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
@@ -10398,19 +10439,6 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-addon-api@^1.7.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
-  integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
-
-node-cache@^4.1.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/node-cache/-/node-cache-4.2.1.tgz#efd8474dee4edec4138cdded580f5516500f7334"
-  integrity sha512-BOb67bWg2dTyax5kdef5WfU3X8xu4wPg+zHzkvls0Q/QpYycIFRLEEIdAx9Wma43DxG6Qzn4illdZoYseKWa4A==
-  dependencies:
-    clone "2.x"
-    lodash "^4.17.15"
-
 node-dir@^0.1.17:
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/node-dir/-/node-dir-0.1.17.tgz#5f5665d93351335caabef8f1c554516cf5f1e4e5"
@@ -12903,11 +12931,6 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
@@ -13799,6 +13822,11 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
 source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -14172,11 +14200,6 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-json-comments@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 strip-json-comments@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
@@ -14534,11 +14557,6 @@ to-arraybuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
   integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
 
-to-fast-properties@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
-  integrity sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -14676,16 +14694,6 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tsconfig@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
-  integrity sha512-vZXmzPrL+EmC4T/4rVlT2jNVMWCi/O4DIiSj3UHg1OE5kCKbk4mfrXc6dZksLgRM/TZlKnousKH9bbTazUWRRw==
-  dependencies:
-    "@types/strip-bom" "^3.0.0"
-    "@types/strip-json-comments" "0.0.30"
-    strip-bom "^3.0.0"
-    strip-json-comments "^2.0.0"
-
 tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
@@ -15330,22 +15338,16 @@ vue-inbrowser-compiler-utils@^4.37.0:
   dependencies:
     camelcase "^5.3.1"
 
-vue-jest@3.0.7:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.7.tgz#a6d29758a5cb4d750f5d1242212be39be4296a33"
-  integrity sha512-PIOxFM+wsBMry26ZpfBvUQ/DGH2hvp5khDQ1n51g3bN0TwFwTy4J85XVfxTRMukqHji/GnAoGUnlZ5Ao73K62w==
+vue-jest@4:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-4.0.1.tgz#683efc351c24456865b1356bae69d5bb663dafb5"
+  integrity sha512-4jewjN8HVgpIW0ZdEwzCWz5vcRLIs1PxMs+5IqJ/6f9KRbEQ+DEqEKHUzIjoNzW2UJOUYBZzWpBnVHakpc/k5w==
   dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
+    "@babel/plugin-transform-modules-commonjs" "^7.2.0"
+    "@vue/component-compiler-utils" "^3.1.0"
     chalk "^2.1.0"
-    deasync "^0.1.15"
     extract-from-css "^0.4.4"
-    find-babel-config "^1.1.0"
-    js-beautify "^1.6.14"
-    node-cache "^4.1.1"
-    object-assign "^4.1.1"
-    source-map "^0.5.6"
-    tsconfig "^7.0.0"
-    vue-template-es2015-compiler "^1.6.0"
+    source-map "0.5.6"
 
 vue-loader@15.9.6:
   version "15.9.6"
@@ -15391,7 +15393,7 @@ vue-template-compiler@2.6.12, vue-template-compiler@^2.6.11:
     de-indent "^1.0.2"
     he "^1.1.0"
 
-vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
+vue-template-es2015-compiler@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==

From e924ce8b4e60530e5f4d1fe284413f3465c339da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 17:18:18 +0530
Subject: [PATCH 136/177] chore(deps): bump rack from 2.2.3 to 2.2.3.1 (#4756)

Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.3.1.
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1)

---
updated-dependencies:
- dependency-name: rack
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3ba3e0a36..b12a2fc5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -409,7 +409,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-attack (6.6.0)
       rack (>= 1.0, < 3)
     rack-cors (1.1.1)

From afc7c1ac64f96fe754d16f5a15bf39c6ed6f70dc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 30 May 2022 18:39:20 +0530
Subject: [PATCH 137/177] chore: Update translations (#4755)

---
 .../dashboard/i18n/locale/cs/conversation.json | 16 ++++++++--------
 .../i18n/locale/cs/setNewPassword.json         |  2 +-
 .../i18n/locale/pt/attributesMgmt.json         | 18 +++++++++---------
 .../dashboard/i18n/locale/pt/automation.json   | 16 ++++++++--------
 .../dashboard/i18n/locale/pt/chatlist.json     |  2 +-
 config/locales/ar.yml                          | 11 +++++++++++
 config/locales/bg.yml                          | 11 +++++++++++
 config/locales/ca.yml                          | 11 +++++++++++
 config/locales/cs.yml                          | 11 +++++++++++
 config/locales/da.yml                          | 11 +++++++++++
 config/locales/de.yml                          | 11 +++++++++++
 config/locales/el.yml                          | 11 +++++++++++
 config/locales/es.yml                          | 11 +++++++++++
 config/locales/fa.yml                          | 11 +++++++++++
 config/locales/fi.yml                          | 11 +++++++++++
 config/locales/fr.yml                          | 11 +++++++++++
 config/locales/he.yml                          | 11 +++++++++++
 config/locales/hi.yml                          | 11 +++++++++++
 config/locales/hu.yml                          | 11 +++++++++++
 config/locales/id.yml                          | 11 +++++++++++
 config/locales/it.yml                          | 11 +++++++++++
 config/locales/ja.yml                          | 11 +++++++++++
 config/locales/ko.yml                          | 11 +++++++++++
 config/locales/lv.yml                          | 11 +++++++++++
 config/locales/ml.yml                          | 11 +++++++++++
 config/locales/ne.yml                          | 11 +++++++++++
 config/locales/nl.yml                          | 11 +++++++++++
 config/locales/no.yml                          | 11 +++++++++++
 config/locales/pl.yml                          | 11 +++++++++++
 config/locales/pt.yml                          | 11 +++++++++++
 config/locales/pt_BR.yml                       | 11 +++++++++++
 config/locales/ro.yml                          | 11 +++++++++++
 config/locales/ru.yml                          | 11 +++++++++++
 config/locales/sk.yml                          | 11 +++++++++++
 config/locales/sr.yml                          | 11 +++++++++++
 config/locales/sv.yml                          | 11 +++++++++++
 config/locales/ta.yml                          | 11 +++++++++++
 config/locales/th.yml                          | 11 +++++++++++
 config/locales/tr.yml                          | 11 +++++++++++
 config/locales/uk.yml                          | 11 +++++++++++
 config/locales/ur.yml                          | 11 +++++++++++
 config/locales/ur_IN.yml                       | 11 +++++++++++
 config/locales/vi.yml                          | 11 +++++++++++
 config/locales/zh_CN.yml                       | 11 +++++++++++
 config/locales/zh_TW.yml                       | 11 +++++++++++
 45 files changed, 467 insertions(+), 27 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index ee68d3fc0..ac17cd1c7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -24,9 +24,9 @@
     "24_HOURS_WINDOW": "24 hodinové omezení okna",
     "NOT_ASSIGNED_TO_YOU": "Tato konverzace vám není přiřazena. Chcete si přiřadit tuto konverzaci?",
     "ASSIGN_TO_ME": "Přiřadit mi",
-    "TWILIO_WHATSAPP_CAN_REPLY": "You can only reply to this conversation using a template message due to",
+    "TWILIO_WHATSAPP_CAN_REPLY": "Na tuto konverzaci můžete odpovědět pouze pomocí šablony zprávy z důvodu",
     "TWILIO_WHATSAPP_24_HOURS_WINDOW": "24 hodinové omezení okna",
-    "SELECT_A_TWEET_TO_REPLY": "Please select a tweet to reply to.",
+    "SELECT_A_TWEET_TO_REPLY": "Vyberte prosím tweet, na který chcete odpovědět.",
     "REPLYING_TO": "Odpovídáte uživateli:",
     "REMOVE_SELECTION": "Odstranit výběr",
     "DOWNLOAD": "Stáhnout",
@@ -74,13 +74,13 @@
       "TIP_FORMAT_ICON": "Zobrazit formátovaný textový editor",
       "TIP_EMOJI_ICON": "Zobrazit výběr emoji",
       "TIP_ATTACH_ICON": "Přiložit soubory",
-      "TIP_AUDIORECORDER_ICON": "Record audio",
-      "TIP_AUDIORECORDER_PERMISSION": "Allow access to audio",
-      "TIP_AUDIORECORDER_ERROR": "Could not open the audio",
+      "TIP_AUDIORECORDER_ICON": "Nahrát zvuk",
+      "TIP_AUDIORECORDER_PERMISSION": "Povolit přístup ke zvuku",
+      "TIP_AUDIORECORDER_ERROR": "Zvuk se nepodařilo otevřít",
       "ENTER_TO_SEND": "Enterem odeslat",
-      "DRAG_DROP": "Drag and drop here to attach",
-      "START_AUDIO_RECORDING": "Start audio recording",
-      "STOP_AUDIO_RECORDING": "Stop audio recording",
+      "DRAG_DROP": "Přetažením sem připojíte",
+      "START_AUDIO_RECORDING": "Spustit nahrávání zvuku",
+      "STOP_AUDIO_RECORDING": "Zastavit nahrávání zvuku",
       "": "",
       "EMAIL_HEAD": {
         "ADD_BCC": "Přidat bcc",
diff --git a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
index 5c81bea0a..e6421e12c 100644
--- a/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
+++ b/app/javascript/dashboard/i18n/locale/cs/setNewPassword.json
@@ -16,7 +16,7 @@
       "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později"
     },
     "CAPTCHA": {
-      "ERROR": "Verification expired. Please solve captcha again."
+      "ERROR": "Ověření vypršelo. Vyřešte captchu znovu."
     },
     "SUBMIT": "Odeslat"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
index 2aaac9bd4..dba146efd 100644
--- a/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/attributesMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Atributos personalizados",
     "HEADER_BTN_TXT": "Adicionar Atributo Personalizado",
     "LOADING": "Obtendo atributos personalizados",
-    "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>Atributos personalizados</b> <p>Um atributo personalizado rastreia factos sobre os seus contactos/conversação - como o plano de assinatura, ou quando encomendaram o primeiro artigo, etc. <br /><br />Para criar um Atributo Personalizado, basta clicar no botão <b>Adicionar Atributo Personalizado.</b> Também pode editar ou apagar um Atributo Personalizado existente, clicando no botão Editar ou Apagar.</p>",
     "ADD": {
       "TITLE": "Adicionar Atributo Personalizado",
       "SUBMIT": "Criar",
@@ -11,12 +11,12 @@
       "FORM": {
         "NAME": {
           "LABEL": "Mostrar Nome",
-          "PLACEHOLDER": "Enter custom attribute display name",
+          "PLACEHOLDER": "Introduzia um nome de exibição de atributo personalizado",
           "ERROR": "Nome é obrigatório"
         },
         "DESC": {
           "LABEL": "Descrição",
-          "PLACEHOLDER": "Enter custom attribute description",
+          "PLACEHOLDER": "Introduza a descrição do atributo personalizado",
           "ERROR": "Descrição é obrigatória"
         },
         "MODEL": {
@@ -43,19 +43,19 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Atributo Personalizado adicionado com sucesso",
-        "ERROR_MESSAGE": "Could not able to create a custom attribute, Please try again later"
+        "ERROR_MESSAGE": "Não foi possível criar um atributo personalizado, por favor tente novamente mais tarde"
       }
     },
     "DELETE": {
       "BUTTON_TEXT": "excluir",
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute deleted successfully.",
-        "ERROR_MESSAGE": "Couldn't delete the custom attribute. Try again."
+        "SUCCESS_MESSAGE": "Atributo personalizado eliminado com sucesso.",
+        "ERROR_MESSAGE": "Não foi possível apagar o atributo personalizado. Tente novamente."
       },
       "CONFIRM": {
         "TITLE": "Tem a certeza que quer apagar a equipa - %{attributeName}",
         "PLACE_HOLDER": "Por favor, digite {attributeName} para confirmar",
-        "MESSAGE": "Deleting will remove the custom attribute",
+        "MESSAGE": "A eliminação irá remover o atributo personalizado",
         "YES": "excluir ",
         "NO": "cancelar"
       }
@@ -70,8 +70,8 @@
         }
       },
       "API": {
-        "SUCCESS_MESSAGE": "Custom Attribute updated successfully",
-        "ERROR_MESSAGE": "There was an error updating custom attribute, please try again"
+        "SUCCESS_MESSAGE": "Atributo personalizado atualizado com sucesso",
+        "ERROR_MESSAGE": "Houve um erro na actualização do atributo personalizado, por favor tente novamente"
       }
     },
     "TABS": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/automation.json b/app/javascript/dashboard/i18n/locale/pt/automation.json
index b83b9f772..cee202fbc 100644
--- a/app/javascript/dashboard/i18n/locale/pt/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/automation.json
@@ -34,8 +34,8 @@
       "CONDITION_BUTTON_LABEL": "Adicionar Condição",
       "ACTION_BUTTON_LABEL": "Adicionar Ação",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
-        "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Regra de automatização adicionada com sucesso",
+        "ERROR_MESSAGE": "Não foi possível criar uma regra de automatização, por favor tente novamente mais tarde"
       }
     },
     "LIST": {
@@ -58,7 +58,7 @@
         "NO": "Não, Manter "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
+        "SUCCESS_MESSAGE": "Regra de automatização eliminada com sucesso",
         "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
       }
     },
@@ -90,8 +90,8 @@
     },
     "ACTION": {
       "DELETE_MESSAGE": "É necessário ter pelo menos uma ação para salvar",
-      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Enter your message here",
-      "TEAM_DROPDOWN_PLACEHOLDER": "Select teams"
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Introduza aqui a sua mensagem",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Selecionar equipas"
     },
     "TOGGLE": {
       "ACTIVATION_TITLE": "Ativar Regra de Automação",
@@ -106,10 +106,10 @@
       "CANCEL_LABEL": "Não"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "Não foi possível carregar anexo, por favor tente novamente",
+      "LABEL_IDLE": "Carregar anexo",
       "LABEL_UPLOADING": "A carregar...",
-      "LABEL_UPLOADED": "Succesfully Uploaded",
+      "LABEL_UPLOADED": "Carregado com sucesso",
       "LABEL_UPLOAD_FAILED": "Upload Failed"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt/chatlist.json b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
index d344a1076..21a2eaac8 100644
--- a/app/javascript/dashboard/i18n/locale/pt/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pt/chatlist.json
@@ -15,7 +15,7 @@
     "ASSIGNEE_TYPE_TABS": {
       "me": "Minerar",
       "unassigned": "Não atribuído",
-      "all": "Todos"
+      "all": "TODOS"
     },
     "CHAT_STATUS_FILTER_ITEMS": {
       "open": {
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index c5afdb402..58d316646 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -39,6 +39,17 @@ ar:
       conversations_count: عدد المحادثات
       avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
       avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
+      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
+    label_csv:
+      label_title: الوسم
+      conversations_count: No. of conversations
+      avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
+      avg_resolution_time: متوسط وقت المحادثة (الدقائق)
     team_csv:
       team_name: اسم الفريق
       conversations_count: عدد المحادثات
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 6469857f4..101b76ee9 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -39,6 +39,17 @@ bg:
       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
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 269b98285..f23afb7a7 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -39,6 +39,17 @@ ca:
       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
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5cb16ce18..afd830dbd 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -39,6 +39,17 @@ cs:
       conversations_count: Conversations count
       avg_first_response_time: Prům. doba první odpovědi (minuty)
       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: Prům. doba první odpovědi (minuty)
+      avg_resolution_time: Avg resolution time (Minutes)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Prům. doba první odpovědi (minuty)
+      avg_resolution_time: Avg resolution time (Minutes)
     team_csv:
       team_name: Team name
       conversations_count: Conversations count
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 34e42b394..ce6b0479e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -39,6 +39,17 @@ da:
       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
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 82354838b..ecda08060 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -39,6 +39,17 @@ de:
       conversations_count: Anzahl Gespräche
       avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
       avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+    inbox_csv:
+      inbox_name: Posteingangsname
+      inbox_type: Posteingangstyp
+      conversations_count: Anzahl der Konversationen
+      avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
+      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
+    label_csv:
+      label_title: Label
+      conversations_count: Anzahl der Konversationen
+      avg_first_response_time: Durchschnittliche Reaktionszeit (Minuten)
+      avg_resolution_time: Durchschnittliche Auflösungszeit (Minuten)
     team_csv:
       team_name: Teamname
       conversations_count: Anzahl Gespräche
diff --git a/config/locales/el.yml b/config/locales/el.yml
index e7f9d219b..456731e7c 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -39,6 +39,17 @@ el:
       conversations_count: Αριθμός συνομιλιών
       avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
       avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+    inbox_csv:
+      inbox_name: Όνομα Κιβωτίου
+      inbox_type: Τύπος κιβωτίου εισερχόμενων
+      conversations_count: Αριθμός συνομιλιών
+      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
+      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
+    label_csv:
+      label_title: Ετικέτα
+      conversations_count: Αριθμός συνομιλιών
+      avg_first_response_time: Μέσος χρόνος πρώτης ανταπόκρισης (λεπτά)
+      avg_resolution_time: Μέσος χρόνος επίλυσης (λεπτά)
     team_csv:
       team_name: Όνομα ομάδας
       conversations_count: Αριθμός συνομιλιών
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9ae7f5ab0..680eb5da7 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -39,6 +39,17 @@ es:
       conversations_count: Cantidad de conversaciones
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
+      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
+      avg_resolution_time: Promedio de tiempo de resolución (Minutos)
     team_csv:
       team_name: Nombre del equipo
       conversations_count: Cantidad de conversaciones
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 94d15d78a..cdf50fedc 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -39,6 +39,17 @@ fa:
       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_type: نوع صندوق ورودی
+      conversations_count: تعداد گفتگوها
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
+    label_csv:
+      label_title: برچسب
+      conversations_count: تعداد گفتگوها
+      avg_first_response_time: Avg first response time (Minutes)
+      avg_resolution_time: Avg resolution time (Minutes)
     team_csv:
       team_name: نام تیم
       conversations_count: Conversations count
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index abc42d30c..8331ee75a 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -39,6 +39,17 @@ fi:
       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
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index f24823871..e9eddddbc 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -39,6 +39,17 @@ fr:
       conversations_count: Nombre de conversations
       avg_first_response_time: Temps de réponse moyen (Minutes)
       avg_resolution_time: Temps moyen de résolution (Minutes)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Temps de réponse moyen (Minutes)
+      avg_resolution_time: Temps moyen de résolution (Minutes)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Temps de réponse moyen (Minutes)
+      avg_resolution_time: Temps moyen de résolution (Minutes)
     team_csv:
       team_name: Nom de l'équipe
       conversations_count: Nombre de conversations
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 7013aeec9..7a3cca980 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -39,6 +39,17 @@ he:
       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
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index fe9e0e127..eeeccb9f2 100644
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -39,6 +39,17 @@ hi:
       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
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 03949320d..7d401d86f 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -39,6 +39,17 @@ hu:
       conversations_count: Beszélgetésszám
       avg_first_response_time: Átlagos első reakcióidő (perc)
       avg_resolution_time: Átlagos megoldási idő (perc)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Átlagos első reakcióidő (perc)
+      avg_resolution_time: Átlagos megoldási idő (perc)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Átlagos első reakcióidő (perc)
+      avg_resolution_time: Átlagos megoldási idő (perc)
     team_csv:
       team_name: Csapatnév
       conversations_count: Beszélgetésszám
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 598a2952f..ab38f992f 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -39,6 +39,17 @@ id:
       conversations_count: Jumlah percakapan
       avg_first_response_time: Rata-rata waktu respons pertama (Menit)
       avg_resolution_time: Rata-rata waktu resolusi (Menit)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
+      avg_resolution_time: Rata-rata waktu resolusi (Menit)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Rata-rata waktu respons pertama (Menit)
+      avg_resolution_time: Rata-rata waktu resolusi (Menit)
     team_csv:
       team_name: Nama Tim
       conversations_count: Jumlah percakapan
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1d8d6c444..97dfb0ffb 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -39,6 +39,17 @@ it:
       conversations_count: Numero di conversazioni
       avg_first_response_time: Tempo medio di prima risposta (minuti)
       avg_resolution_time: Tempo medio di risoluzione (minuti)
+    inbox_csv:
+      inbox_name: Nome casella
+      inbox_type: Tipo casella
+      conversations_count: Numero di conversazioni
+      avg_first_response_time: Tempo medio di prima risposta (minuti)
+      avg_resolution_time: Tempo medio di risoluzione (minuti)
+    label_csv:
+      label_title: Etichetta
+      conversations_count: Numero di conversazioni
+      avg_first_response_time: Tempo medio di prima risposta (minuti)
+      avg_resolution_time: Tempo medio di risoluzione (minuti)
     team_csv:
       team_name: Nome del team
       conversations_count: Numero di conversazioni
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 50f1afb0e..51ec1b922 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -39,6 +39,17 @@ ja:
       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
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a9032f824..2a5eea72c 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -39,6 +39,17 @@ ko:
       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
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 6ed29e8f7..cf12dc0eb 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -39,6 +39,17 @@ lv:
       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
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 7c80c69f4..0896849fb 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -39,6 +39,17 @@ ml:
       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: ടീമിന്റെ പേര്
       conversations_count: സംഭാഷണങ്ങളുടെ എണ്ണം
diff --git a/config/locales/ne.yml b/config/locales/ne.yml
index 15f26703f..f0edba6a8 100644
--- a/config/locales/ne.yml
+++ b/config/locales/ne.yml
@@ -39,6 +39,17 @@ ne:
       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
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index ed10eba6c..7780f960c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -39,6 +39,17 @@ nl:
       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
diff --git a/config/locales/no.yml b/config/locales/no.yml
index f134f24af..e5b592df0 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -39,6 +39,17 @@
       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
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index cf3676f1e..ec1773e9a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -39,6 +39,17 @@ pl:
       conversations_count: Liczba rozmów
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
+      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
+      avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     team_csv:
       team_name: Nazwa zespołu
       conversations_count: Liczba rozmów
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index c8a310aff..86890ee02 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -39,6 +39,17 @@ pt:
       conversations_count: Número de conversas
       avg_first_response_time: Média do tempo de resposta (minutos)
       avg_resolution_time: Média do tempo de resolução (minutos)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Média do tempo de resposta (minutos)
+      avg_resolution_time: Média do tempo de resolução (minutos)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Média do tempo de resposta (minutos)
+      avg_resolution_time: Média do tempo de resolução (minutos)
     team_csv:
       team_name: Nome da equipa
       conversations_count: Número de conversas
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index c8fb9090b..a7e0425cd 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -39,6 +39,17 @@ pt_BR:
       conversations_count: Contagem de conversas
       avg_first_response_time: Tempo médio de primeira resposta (minutos)
       avg_resolution_time: Tempo médio de resolução (minutos)
+    inbox_csv:
+      inbox_name: Nome da Caixa de Entrada
+      inbox_type: Tipo da Caixa de Entrada
+      conversations_count: Nº de Conversas
+      avg_first_response_time: Média de tempo da primeira resposta (minutos)
+      avg_resolution_time: Tempo médio de resolução (minutos)
+    label_csv:
+      label_title: Nome do campo
+      conversations_count: Nº de Conversas
+      avg_first_response_time: Tempo médio de primeira resposta (minutos)
+      avg_resolution_time: Tempo médio de resolução (minutos)
     team_csv:
       team_name: Nome do departamento
       conversations_count: Contagem de conversas
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index adcad7a68..0ac716b04 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -39,6 +39,17 @@ ro:
       conversations_count: Conversațiile contează
       avg_first_response_time: Avg primul timp de răspuns (minute)
       avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Avg primul timp de răspuns (minute)
+      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Avg primul timp de răspuns (minute)
+      avg_resolution_time: Timp de rezoluție AVG (proces-verbal)
     team_csv:
       team_name: Numele echipei
       conversations_count: Conversațiile contează
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ce5ae1d54..47ded8644 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -39,6 +39,17 @@ ru:
       conversations_count: Количество бесед
       avg_first_response_time: Среднее время первого ответа (в минутах)
       avg_resolution_time: Среднее время решения (в минутах)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Среднее время первого ответа (в минутах)
+      avg_resolution_time: Среднее время решения (в минутах)
+    label_csv:
+      label_title: Метка
+      conversations_count: No. of conversations
+      avg_first_response_time: Среднее время первого ответа (в минутах)
+      avg_resolution_time: Среднее время решения (в минутах)
     team_csv:
       team_name: Название команды
       conversations_count: Количество бесед
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 02406b0b3..8a592a040 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -39,6 +39,17 @@ sk:
       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: Názov tímu
       conversations_count: Conversations count
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 04ab3bf57..9bbea927b 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -39,6 +39,17 @@ sr-Latn:
       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
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index ef685a384..930b481d1 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -39,6 +39,17 @@ sv:
       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
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
index e8c2d09c5..e1a340b5a 100644
--- a/config/locales/ta.yml
+++ b/config/locales/ta.yml
@@ -39,6 +39,17 @@ ta:
       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
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 4290ff009..211e3392f 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -39,6 +39,17 @@ th:
       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: ป้ายกำกับ
+      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: ชื่อทีม
       conversations_count: Conversations count
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 3a79c0791..5470142ab 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -39,6 +39,17 @@ tr:
       conversations_count: Konuşma sayısı
       avg_first_response_time: Ortalama cevap süresi(dakika)
       avg_resolution_time: Ortalama çözüm üretme süresi(dakika)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Ortalama cevap süresi(dakika)
+      avg_resolution_time: Ortalama çözüm üretme süresi(dakika)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Ortalama cevap süresi(dakika)
+      avg_resolution_time: Ortalama çözüm üretme süresi(dakika)
     team_csv:
       team_name: Ekip İsmi
       conversations_count: Konuşma sayısı
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 956eb0a9b..bd7b9718e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -39,6 +39,17 @@ uk:
       conversations_count: Кількість бесід
       avg_first_response_time: Середній час першої відповіді (Хвилин)
       avg_resolution_time: Середній час вирішення (Хвилин)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Середній час першої відповіді (Хвилин)
+      avg_resolution_time: Середній час вирішення (Хвилин)
+    label_csv:
+      label_title: Мітка
+      conversations_count: No. of conversations
+      avg_first_response_time: Середній час першої відповіді (Хвилин)
+      avg_resolution_time: Середній час вирішення (Хвилин)
     team_csv:
       team_name: Назва команди
       conversations_count: Кількість бесід
diff --git a/config/locales/ur.yml b/config/locales/ur.yml
index 633be0001..a14706483 100644
--- a/config/locales/ur.yml
+++ b/config/locales/ur.yml
@@ -39,6 +39,17 @@ ur:
       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
diff --git a/config/locales/ur_IN.yml b/config/locales/ur_IN.yml
index 6887bb4b9..0f05aec46 100644
--- a/config/locales/ur_IN.yml
+++ b/config/locales/ur_IN.yml
@@ -39,6 +39,17 @@ ur:
       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
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e82342c64..f1e0faca3 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -39,6 +39,17 @@ vi:
       conversations_count: Số cuộc trò chuyện
       avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
       avg_resolution_time: Thời gian giải quyết trung bình (phút)
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
+      avg_resolution_time: Thời gian giải quyết trung bình (phút)
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: Thời gian trung bình của phản hồi đầu tiên (phút)
+      avg_resolution_time: Thời gian giải quyết trung bình (phút)
     team_csv:
       team_name: Tên nhóm
       conversations_count: Số cuộc trò chuyện
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
index 0c9f79573..0bc5acad0 100644
--- a/config/locales/zh_CN.yml
+++ b/config/locales/zh_CN.yml
@@ -39,6 +39,17 @@ zh_CN:
       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
diff --git a/config/locales/zh_TW.yml b/config/locales/zh_TW.yml
index e8cde15fd..b76b65e0a 100644
--- a/config/locales/zh_TW.yml
+++ b/config/locales/zh_TW.yml
@@ -39,6 +39,17 @@ zh_TW:
       conversations_count: 對話數量
       avg_first_response_time: 平均第一次回覆時間（分鐘）
       avg_resolution_time: 平均解決時間（分鐘）
+    inbox_csv:
+      inbox_name: Inbox name
+      inbox_type: Inbox type
+      conversations_count: No. of conversations
+      avg_first_response_time: 平均第一次回覆時間（分鐘）
+      avg_resolution_time: 平均解決時間（分鐘）
+    label_csv:
+      label_title: Label
+      conversations_count: No. of conversations
+      avg_first_response_time: 平均第一次回覆時間（分鐘）
+      avg_resolution_time: 平均解決時間（分鐘）
     team_csv:
       team_name: 團隊名稱
       conversations_count: 對話數量

From 3f382e5979d508fbd6d9f153b37433c7fe6f0cbe Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Tue, 31 May 2022 16:38:24 +0530
Subject: [PATCH 138/177] Handle falsy values for filename (#4766)

---
 .../components/widgets/conversation/bubble/File.vue        | 7 +++++--
 app/javascript/dashboard/i18n/locale/en/conversation.json  | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
index a8f2993d3..5861e0df1 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/File.vue
@@ -29,8 +29,11 @@ export default {
   },
   computed: {
     fileName() {
-      const filename = this.url.substring(this.url.lastIndexOf('/') + 1);
-      return filename;
+      if (this.url) {
+        const filename = this.url.substring(this.url.lastIndexOf('/') + 1);
+        return filename || this.$t('CONVERSATION.UNKNOWN_FILE_TYPE');
+      }
+      return this.$t('CONVERSATION.UNKNOWN_FILE_TYPE');
     },
   },
   methods: {
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index ac25a5aed..e545ce0d2 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -30,6 +30,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",

From 55f7be4ffc429aadefb0b814636a0023456e00f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Jun 2022 10:57:18 +0530
Subject: [PATCH 139/177] chore(deps): bump eventsource from 1.1.0 to 1.1.1
 (#4774)

Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.1)

---
updated-dependencies:
- dependency-name: eventsource
  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 bd138a972..a4e62441d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6563,9 +6563,9 @@ events@^3.0.0:
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
-  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.1.tgz#4544a35a57d7120fba4fa4c86cb4023b2c09df2f"
+  integrity sha512-qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA==
   dependencies:
     original "^1.0.0"
 

From b9aa4444b3ed87026cd060e9a062ba80e7373afa Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Wed, 1 Jun 2022 11:13:10 +0530
Subject: [PATCH 140/177] feat: Allow users to create dashboard apps to give
 agents more context (#4761)

---
 .../v1/accounts/dashboard_apps_controller.rb  |  44 +++++
 app/javascript/dashboard/api/dashboardApps.js |   9 +
 .../dashboard/api/specs/dashboardApps.spec.js |  13 ++
 .../components/widgets/DashboardApp/Frame.vue |  64 +++++++
 .../widgets/conversation/ConversationBox.vue  |  57 ++++++-
 .../i18n/locale/en/conversation.json          |   1 +
 app/javascript/dashboard/store/index.js       |  14 +-
 .../dashboard/store/modules/dashboardApps.js  |  54 ++++++
 .../specs/dashboardApps/actions.spec.js       |  21 +++
 .../specs/dashboardApps/getters.spec.js       |  29 ++++
 .../specs/dashboardApps/mutations.spec.js     |  20 +++
 .../dashboard/store/mutation-types.js         |   4 +
 .../widget/store/modules/contacts.js          |   5 +-
 app/models/account.rb                         |  13 +-
 app/models/dashboard_app.rb                   |  49 ++++++
 app/models/user.rb                            |   3 +-
 .../dashboard_apps/create.json.jbuilder       |   1 +
 .../dashboard_apps/index.json.jbuilder        |   3 +
 .../dashboard_apps/show.json.jbuilder         |   1 +
 .../dashboard_apps/update.json.jbuilder       |   1 +
 .../v1/models/_dashboard_app.json.jbuilder    |   4 +
 config/routes.rb                              |   2 +-
 .../20220525141844_create_dashboard_apps.rb   |  11 ++
 db/schema.rb                                  |  15 +-
 .../dashboard_apps_controller_spec.rb         | 158 ++++++++++++++++++
 spec/factories/dashboard_app.rb               |  10 ++
 26 files changed, 585 insertions(+), 21 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/dashboard_apps_controller.rb
 create mode 100644 app/javascript/dashboard/api/dashboardApps.js
 create mode 100644 app/javascript/dashboard/api/specs/dashboardApps.spec.js
 create mode 100644 app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
 create mode 100644 app/javascript/dashboard/store/modules/dashboardApps.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/dashboardApps/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/dashboardApps/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/dashboardApps/mutations.spec.js
 create mode 100644 app/models/dashboard_app.rb
 create mode 100644 app/views/api/v1/accounts/dashboard_apps/create.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/dashboard_apps/index.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/dashboard_apps/show.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/dashboard_apps/update.json.jbuilder
 create mode 100644 app/views/api/v1/models/_dashboard_app.json.jbuilder
 create mode 100644 db/migrate/20220525141844_create_dashboard_apps.rb
 create mode 100644 spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
 create mode 100644 spec/factories/dashboard_app.rb

diff --git a/app/controllers/api/v1/accounts/dashboard_apps_controller.rb b/app/controllers/api/v1/accounts/dashboard_apps_controller.rb
new file mode 100644
index 000000000..a8d7ebcb9
--- /dev/null
+++ b/app/controllers/api/v1/accounts/dashboard_apps_controller.rb
@@ -0,0 +1,44 @@
+class Api::V1::Accounts::DashboardAppsController < Api::V1::Accounts::BaseController
+  before_action :fetch_dashboard_apps, except: [:create]
+  before_action :fetch_dashboard_app, only: [:show, :update, :destroy]
+
+  def index; end
+
+  def show; end
+
+  def create
+    @dashboard_app = Current.account.dashboard_apps.create!(
+      permitted_payload.merge(user_id: Current.user.id)
+    )
+  end
+
+  def update
+    @dashboard_app.update!(permitted_payload)
+  end
+
+  def destroy
+    @dashboard_app.destroy!
+    head :no_content
+  end
+
+  private
+
+  def fetch_dashboard_apps
+    @dashboard_apps = Current.account.dashboard_apps
+  end
+
+  def fetch_dashboard_app
+    @dashboard_app = @dashboard_apps.find(permitted_params[:id])
+  end
+
+  def permitted_payload
+    params.require(:dashboard_app).permit(
+      :title,
+      content: [:url, :type]
+    )
+  end
+
+  def permitted_params
+    params.permit(:id)
+  end
+end
diff --git a/app/javascript/dashboard/api/dashboardApps.js b/app/javascript/dashboard/api/dashboardApps.js
new file mode 100644
index 000000000..b22ab698e
--- /dev/null
+++ b/app/javascript/dashboard/api/dashboardApps.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class DashboardAppsAPI extends ApiClient {
+  constructor() {
+    super('dashboard_apps', { accountScoped: true });
+  }
+}
+
+export default new DashboardAppsAPI();
diff --git a/app/javascript/dashboard/api/specs/dashboardApps.spec.js b/app/javascript/dashboard/api/specs/dashboardApps.spec.js
new file mode 100644
index 000000000..f3196ae2a
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/dashboardApps.spec.js
@@ -0,0 +1,13 @@
+import dashboardAppsAPI from '../dashboardApps';
+import ApiClient from '../ApiClient';
+
+describe('#dashboardAppsAPI', () => {
+  it('creates correct instance', () => {
+    expect(dashboardAppsAPI).toBeInstanceOf(ApiClient);
+    expect(dashboardAppsAPI).toHaveProperty('get');
+    expect(dashboardAppsAPI).toHaveProperty('show');
+    expect(dashboardAppsAPI).toHaveProperty('create');
+    expect(dashboardAppsAPI).toHaveProperty('update');
+    expect(dashboardAppsAPI).toHaveProperty('delete');
+  });
+});
diff --git a/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue b/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
new file mode 100644
index 000000000..0c2c0e8ed
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/DashboardApp/Frame.vue
@@ -0,0 +1,64 @@
+<template>
+  <div class="dashboard-app--container">
+    <div
+      v-for="(configItem, index) in config"
+      :key="index"
+      class="dashboard-app--list"
+    >
+      <iframe
+        v-if="configItem.type === 'frame' && configItem.url"
+        :id="`dashboard-app--frame-${index}`"
+        :src="configItem.url"
+        @load="() => onIframeLoad(index)"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    config: {
+      type: Array,
+      default: () => [],
+    },
+    currentChat: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    dashboardAppContext() {
+      return {
+        conversation: this.currentChat,
+        contact: this.$store.getters['contacts/getContact'](this.contactId),
+      };
+    },
+    contactId() {
+      return this.currentChat?.meta?.sender?.id;
+    },
+  },
+  methods: {
+    onIframeLoad(index) {
+      const frameElement = document.getElementById(
+        `dashboard-app--frame-${index}`
+      );
+      const eventData = { event: 'appContext', data: this.dashboardAppContext };
+      frameElement.contentWindow.postMessage(JSON.stringify(eventData), '*');
+    },
+  },
+};
+</script>
+
+<style scoped>
+.dashboard-app--container,
+.dashboard-app--list,
+.dashboard-app--list iframe {
+  height: 100%;
+  width: 100%;
+}
+
+.dashboard-app--list iframe {
+  border: 0;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 4849c2e97..494bd5c82 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -6,7 +6,20 @@
       :is-contact-panel-open="isContactPanelOpen"
       @contact-panel-toggle="onToggleContactPanel"
     />
-    <div class="messages-and-sidebar">
+    <woot-tabs
+      v-if="dashboardApps.length && currentChat.id"
+      :index="activeIndex"
+      class="dashboard-app--tabs"
+      @change="onDashboardAppTabChange"
+    >
+      <woot-tabs-item
+        v-for="tab in dashboardAppTabs"
+        :key="tab.key"
+        :name="tab.name"
+        :show-badge="false"
+      />
+    </woot-tabs>
+    <div v-if="!activeIndex" class="messages-and-sidebar">
       <messages-view
         v-if="currentChat.id"
         :inbox-id="inboxId"
@@ -14,7 +27,6 @@
         @contact-panel-toggle="onToggleContactPanel"
       />
       <empty-state v-else />
-
       <div v-show="showContactPanel" class="conversation-sidebar-wrap">
         <contact-panel
           v-if="showContactPanel"
@@ -24,21 +36,29 @@
         />
       </div>
     </div>
+    <dashboard-app-frame
+      v-else
+      :key="currentChat.id"
+      :config="dashboardApps[activeIndex - 1].content"
+      :current-chat="currentChat"
+    />
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import ContactPanel from 'dashboard/routes/dashboard/conversation/ContactPanel';
 import ConversationHeader from './ConversationHeader';
+import DashboardAppFrame from '../DashboardApp/Frame.vue';
 import EmptyState from './EmptyState';
 import MessagesView from './MessagesView';
 
 export default {
   components: {
-    EmptyState,
-    MessagesView,
     ContactPanel,
     ConversationHeader,
+    DashboardAppFrame,
+    EmptyState,
+    MessagesView,
   },
 
   props: {
@@ -52,8 +72,26 @@ export default {
       default: true,
     },
   },
+  data() {
+    return { activeIndex: 0 };
+  },
   computed: {
-    ...mapGetters({ currentChat: 'getSelectedChat' }),
+    ...mapGetters({
+      currentChat: 'getSelectedChat',
+      dashboardApps: 'dashboardApps/getRecords',
+    }),
+    dashboardAppTabs() {
+      return [
+        {
+          key: 'messages',
+          name: this.$t('CONVERSATION.DASHBOARD_APP_TAB_MESSAGES'),
+        },
+        ...this.dashboardApps.map(dashboardApp => ({
+          key: `dashboard-${dashboardApp.id}`,
+          name: dashboardApp.title,
+        })),
+      ];
+    },
     showContactPanel() {
       return this.isContactPanelOpen && this.currentChat.id;
     },
@@ -70,6 +108,7 @@ export default {
   },
   mounted() {
     this.fetchLabels();
+    this.$store.dispatch('dashboardApps/get');
   },
   methods: {
     fetchLabels() {
@@ -81,6 +120,9 @@ export default {
     onToggleContactPanel() {
       this.$emit('contact-panel-toggle');
     },
+    onDashboardAppTabChange(index) {
+      this.activeIndex = index;
+    },
   },
 };
 </script>
@@ -96,6 +138,11 @@ export default {
   background: var(--color-background-light);
 }
 
+.dashboard-app--tabs {
+  background: var(--white);
+  margin-top: -1px;
+}
+
 .messages-and-sidebar {
   display: flex;
   background: var(--color-background-light);
diff --git a/app/javascript/dashboard/i18n/locale/en/conversation.json b/app/javascript/dashboard/i18n/locale/en/conversation.json
index e545ce0d2..c38fb16a4 100644
--- a/app/javascript/dashboard/i18n/locale/en/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/en/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 88c36cdf8..5cd1a0112 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -3,7 +3,9 @@ import Vuex from 'vuex';
 
 import accounts from './modules/accounts';
 import agents from './modules/agents';
+import attributes from './modules/attributes';
 import auth from './modules/auth';
+import automations from './modules/automations';
 import campaigns from './modules/campaigns';
 import cannedResponse from './modules/cannedResponse';
 import contactConversations from './modules/contactConversations';
@@ -18,6 +20,8 @@ import conversationSearch from './modules/conversationSearch';
 import conversationStats from './modules/conversationStats';
 import conversationTypingStatus from './modules/conversationTypingStatus';
 import csat from './modules/csat';
+import customViews from './modules/customViews';
+import dashboardApps from './modules/dashboardApps';
 import globalConfig from 'shared/store/globalConfig';
 import inboxAssignableAgents from './modules/inboxAssignableAgents';
 import inboxes from './modules/inboxes';
@@ -30,16 +34,15 @@ import teamMembers from './modules/teamMembers';
 import teams from './modules/teams';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
-import attributes from './modules/attributes';
-import automations from './modules/automations';
-import customViews from './modules/customViews';
 
 Vue.use(Vuex);
 export default new Vuex.Store({
   modules: {
     accounts,
     agents,
+    attributes,
     auth,
+    automations,
     campaigns,
     cannedResponse,
     contactConversations,
@@ -54,6 +57,8 @@ export default new Vuex.Store({
     conversationStats,
     conversationTypingStatus,
     csat,
+    customViews,
+    dashboardApps,
     globalConfig,
     inboxAssignableAgents,
     inboxes,
@@ -66,8 +71,5 @@ export default new Vuex.Store({
     teams,
     userNotificationSettings,
     webhooks,
-    attributes,
-    automations,
-    customViews,
   },
 });
diff --git a/app/javascript/dashboard/store/modules/dashboardApps.js b/app/javascript/dashboard/store/modules/dashboardApps.js
new file mode 100644
index 000000000..fda1f4de4
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/dashboardApps.js
@@ -0,0 +1,54 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import DashboardAppsAPI from '../../api/dashboardApps';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+  getRecords(_state) {
+    return _state.records;
+  },
+};
+
+export const actions = {
+  get: async function getDashboardApps({ commit }) {
+    commit(types.SET_DASHBOARD_APPS_UI_FLAG, { isFetching: true });
+    try {
+      const response = await DashboardAppsAPI.get();
+      commit(types.SET_DASHBOARD_APPS, response.data);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_DASHBOARD_APPS_UI_FLAG, { isFetching: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_DASHBOARD_APPS_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.SET_DASHBOARD_APPS]: MutationHelpers.set,
+};
+
+export default {
+  namespaced: true,
+  actions,
+  state,
+  getters,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/dashboardApps/actions.spec.js b/app/javascript/dashboard/store/modules/specs/dashboardApps/actions.spec.js
new file mode 100644
index 000000000..d24d879bf
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/dashboardApps/actions.spec.js
@@ -0,0 +1,21 @@
+import axios from 'axios';
+import { actions } from '../../dashboardApps';
+import types from '../../../mutation-types';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: [{ title: 'Title 1' }] });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.SET_DASHBOARD_APPS_UI_FLAG, { isFetching: true }],
+        [types.SET_DASHBOARD_APPS, [{ title: 'Title 1' }]],
+        [types.SET_DASHBOARD_APPS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/dashboardApps/getters.spec.js b/app/javascript/dashboard/store/modules/specs/dashboardApps/getters.spec.js
new file mode 100644
index 000000000..c27788581
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/dashboardApps/getters.spec.js
@@ -0,0 +1,29 @@
+import { getters } from '../../dashboardApps';
+
+describe('#getters', () => {
+  it('getRecords', () => {
+    const state = {
+      records: [
+        {
+          title: '1',
+          content: [{ link: 'https://google.com', type: 'frame' }],
+        },
+      ],
+    };
+    expect(getters.getRecords(state)).toEqual(state.records);
+  });
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isCreating: false,
+        isDeleting: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isCreating: false,
+      isDeleting: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/dashboardApps/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/dashboardApps/mutations.spec.js
new file mode 100644
index 000000000..aaf4da33e
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/dashboardApps/mutations.spec.js
@@ -0,0 +1,20 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../dashboardApps';
+
+describe('#mutations', () => {
+  describe('#SET_DASHBOARD_APPS_UI_FLAG', () => {
+    it('set dashboard app ui flags', () => {
+      const state = { uiFlags: { isCreating: false, isUpdating: false } };
+      mutations[types.SET_DASHBOARD_APPS_UI_FLAG](state, { isUpdating: true });
+      expect(state.uiFlags).toEqual({ isCreating: false, isUpdating: true });
+    });
+  });
+
+  describe('#SET_DASHBOARD_APPS', () => {
+    it('set dashboard records', () => {
+      const state = { records: [{ title: 'Title 0' }] };
+      mutations[types.SET_DASHBOARD_APPS](state, [{ title: 'Title 1' }]);
+      expect(state.records).toEqual([{ title: 'Title 1' }]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index f89a5205d..b78e468a1 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -210,4 +210,8 @@ export default {
   SET_CUSTOM_VIEW: 'SET_CUSTOM_VIEW',
   ADD_CUSTOM_VIEW: 'ADD_CUSTOM_VIEW',
   DELETE_CUSTOM_VIEW: 'DELETE_CUSTOM_VIEW',
+
+  // Dashboard Apps
+  SET_DASHBOARD_APPS_UI_FLAG: 'SET_DASHBOARD_APPS_UI_FLAG',
+  SET_DASHBOARD_APPS: 'SET_DASHBOARD_APPS',
 };
diff --git a/app/javascript/widget/store/modules/contacts.js b/app/javascript/widget/store/modules/contacts.js
index 587b84ac6..b82cda8ad 100644
--- a/app/javascript/widget/store/modules/contacts.js
+++ b/app/javascript/widget/store/modules/contacts.js
@@ -61,7 +61,10 @@ export const actions = {
         dispatch('conversationAttributes/getAttributes', {}, { root: true });
       }
     } catch (error) {
-      const data = error && error.response && error.response.data ? error.response.data : error
+      const data =
+        error && error.response && error.response.data
+          ? error.response.data
+          : error;
       IFrameHelper.sendMessage({
         event: 'error',
         errorType: SET_USER_ERROR,
diff --git a/app/models/account.rb b/app/models/account.rb
index b14887957..7dd1cc229 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -39,27 +39,31 @@ class Account < ApplicationRecord
   has_many :agent_bot_inboxes, dependent: :destroy_async
   has_many :agent_bots, dependent: :destroy_async
   has_many :api_channels, dependent: :destroy_async, class_name: '::Channel::Api'
+  has_many :articles, dependent: :destroy_async, class_name: '::Article'
+  has_many :automation_rules, dependent: :destroy
   has_many :campaigns, dependent: :destroy_async
   has_many :canned_responses, dependent: :destroy_async
+  has_many :categories, dependent: :destroy_async, class_name: '::Category'
   has_many :contacts, dependent: :destroy_async
   has_many :conversations, dependent: :destroy_async
   has_many :csat_survey_responses, dependent: :destroy_async
   has_many :custom_attribute_definitions, dependent: :destroy_async
   has_many :custom_filters, dependent: :destroy_async
+  has_many :dashboard_apps, dependent: :destroy
   has_many :data_imports, dependent: :destroy_async
   has_many :email_channels, dependent: :destroy_async, class_name: '::Channel::Email'
   has_many :facebook_pages, dependent: :destroy_async, class_name: '::Channel::FacebookPage'
   has_many :hooks, dependent: :destroy_async, class_name: 'Integrations::Hook'
   has_many :inboxes, dependent: :destroy_async
-  has_many :articles, dependent: :destroy_async, class_name: '::Article'
-  has_many :categories, dependent: :destroy_async, class_name: '::Category'
-  has_many :portals, dependent: :destroy_async, class_name: '::Portal'
   has_many :labels, dependent: :destroy_async
   has_many :line_channels, dependent: :destroy_async, class_name: '::Channel::Line'
   has_many :mentions, dependent: :destroy_async
   has_many :messages, dependent: :destroy_async
   has_many :notes, dependent: :destroy_async
   has_many :notification_settings, dependent: :destroy_async
+  has_many :notifications, dependent: :destroy
+  has_many :portals, dependent: :destroy_async, class_name: '::Portal'
+  has_many :sms_channels, dependent: :destroy_async, class_name: '::Channel::Sms'
   has_many :teams, dependent: :destroy_async
   has_many :telegram_bots, dependent: :destroy_async
   has_many :telegram_channels, dependent: :destroy_async, class_name: '::Channel::Telegram'
@@ -69,10 +73,7 @@ class Account < ApplicationRecord
   has_many :web_widgets, dependent: :destroy_async, class_name: '::Channel::WebWidget'
   has_many :webhooks, dependent: :destroy_async
   has_many :whatsapp_channels, dependent: :destroy_async, class_name: '::Channel::Whatsapp'
-  has_many :sms_channels, dependent: :destroy_async, class_name: '::Channel::Sms'
   has_many :working_hours, dependent: :destroy_async
-  has_many :automation_rules, dependent: :destroy
-  has_many :notifications, dependent: :destroy
 
   has_flags ACCOUNT_SETTINGS_FLAGS.merge(column: 'settings_flags').merge(DEFAULT_QUERY_SETTING)
 
diff --git a/app/models/dashboard_app.rb b/app/models/dashboard_app.rb
new file mode 100644
index 000000000..1f1b73d5c
--- /dev/null
+++ b/app/models/dashboard_app.rb
@@ -0,0 +1,49 @@
+# == Schema Information
+#
+# Table name: dashboard_apps
+#
+#  id         :bigint           not null, primary key
+#  content    :jsonb
+#  title      :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#  account_id :bigint           not null
+#  user_id    :bigint
+#
+# Indexes
+#
+#  index_dashboard_apps_on_account_id  (account_id)
+#  index_dashboard_apps_on_user_id     (user_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (account_id => accounts.id)
+#  fk_rails_...  (user_id => users.id)
+#
+class DashboardApp < ApplicationRecord
+  belongs_to :user
+  belongs_to :account
+  validate :validate_content
+
+  private
+
+  def validate_content
+    has_invalid_data = self[:content].blank? || !self[:content].is_a?(Array)
+    self[:content] = [] if has_invalid_data
+
+    content_schema = {
+      'type' => 'array',
+      'items' => {
+        'type' => 'object',
+        'required' => %w[url type],
+        'properties' => {
+          'type' => { 'enum': ['frame'] },
+          'url' => { 'type': 'string', 'format' => 'uri' }
+        }
+      },
+      'additionalProperties' => false,
+      'minItems' => 1
+    }
+    errors.add(:content, ': Invalid data') unless JSONSchemer.schema(content_schema.to_json).valid?(self[:content])
+  end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 6c3349473..534ebea21 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,14 +83,15 @@ class User < ApplicationRecord
   has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', source: :inviter, dependent: :nullify
 
   has_many :custom_filters, dependent: :destroy_async
+  has_many :dashboard_apps, dependent: :nullify
   has_many :mentions, dependent: :destroy_async
   has_many :notes, dependent: :nullify
   has_many :notification_settings, dependent: :destroy_async
   has_many :notification_subscriptions, dependent: :destroy_async
   has_many :notifications, dependent: :destroy_async
+  has_many :portals, through: :portals_members
   has_many :team_members, dependent: :destroy_async
   has_many :teams, through: :team_members
-  has_many :portals, through: :portals_members
 
   before_validation :set_password_and_uid, on: :create
 
diff --git a/app/views/api/v1/accounts/dashboard_apps/create.json.jbuilder b/app/views/api/v1/accounts/dashboard_apps/create.json.jbuilder
new file mode 100644
index 000000000..fd21053d3
--- /dev/null
+++ b/app/views/api/v1/accounts/dashboard_apps/create.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
diff --git a/app/views/api/v1/accounts/dashboard_apps/index.json.jbuilder b/app/views/api/v1/accounts/dashboard_apps/index.json.jbuilder
new file mode 100644
index 000000000..d7e1f5a06
--- /dev/null
+++ b/app/views/api/v1/accounts/dashboard_apps/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.array! @dashboard_apps do |dashboard_app|
+  json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: dashboard_app
+end
diff --git a/app/views/api/v1/accounts/dashboard_apps/show.json.jbuilder b/app/views/api/v1/accounts/dashboard_apps/show.json.jbuilder
new file mode 100644
index 000000000..fd21053d3
--- /dev/null
+++ b/app/views/api/v1/accounts/dashboard_apps/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
diff --git a/app/views/api/v1/accounts/dashboard_apps/update.json.jbuilder b/app/views/api/v1/accounts/dashboard_apps/update.json.jbuilder
new file mode 100644
index 000000000..fd21053d3
--- /dev/null
+++ b/app/views/api/v1/accounts/dashboard_apps/update.json.jbuilder
@@ -0,0 +1 @@
+json.partial! 'api/v1/models/dashboard_app.json.jbuilder', resource: @dashboard_app
diff --git a/app/views/api/v1/models/_dashboard_app.json.jbuilder b/app/views/api/v1/models/_dashboard_app.json.jbuilder
new file mode 100644
index 000000000..f8632d28a
--- /dev/null
+++ b/app/views/api/v1/models/_dashboard_app.json.jbuilder
@@ -0,0 +1,4 @@
+json.id resource.id
+json.title resource.title
+json.content resource.content
+json.created_at resource.created_at
diff --git a/config/routes.rb b/config/routes.rb
index b2029a739..a09311b3e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,7 +58,7 @@ Rails.application.routes.draw do
             post :attach_file, on: :collection
           end
           resources :campaigns, only: [:index, :create, :show, :update, :destroy]
-
+          resources :dashboard_apps, only: [:index, :show, :create, :update, :destroy]
           namespace :channels do
             resource :twilio_channel, only: [:create]
           end
diff --git a/db/migrate/20220525141844_create_dashboard_apps.rb b/db/migrate/20220525141844_create_dashboard_apps.rb
new file mode 100644
index 000000000..0e4fee9e2
--- /dev/null
+++ b/db/migrate/20220525141844_create_dashboard_apps.rb
@@ -0,0 +1,11 @@
+class CreateDashboardApps < ActiveRecord::Migration[6.1]
+  def change
+    create_table :dashboard_apps do |t|
+      t.string :title, null: false
+      t.jsonb :content, default: []
+      t.references :account, null: false, foreign_key: true
+      t.references :user, foreign_key: true
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e7382572e..4e2ba8095 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_05_13_145010) do
+ActiveRecord::Schema.define(version: 2022_05_25_141844) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -441,6 +441,17 @@ ActiveRecord::Schema.define(version: 2022_05_13_145010) do
     t.index ["user_id"], name: "index_custom_filters_on_user_id"
   end
 
+  create_table "dashboard_apps", force: :cascade do |t|
+    t.string "title", null: false
+    t.jsonb "content", default: []
+    t.bigint "account_id", null: false
+    t.bigint "user_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id"], name: "index_dashboard_apps_on_account_id"
+    t.index ["user_id"], name: "index_dashboard_apps_on_user_id"
+  end
+
   create_table "data_imports", force: :cascade do |t|
     t.bigint "account_id", null: false
     t.string "data_type", null: false
@@ -817,6 +828,8 @@ ActiveRecord::Schema.define(version: 2022_05_13_145010) do
   add_foreign_key "csat_survey_responses", "conversations", on_delete: :cascade
   add_foreign_key "csat_survey_responses", "messages", on_delete: :cascade
   add_foreign_key "csat_survey_responses", "users", column: "assigned_agent_id", on_delete: :cascade
+  add_foreign_key "dashboard_apps", "accounts"
+  add_foreign_key "dashboard_apps", "users"
   add_foreign_key "data_imports", "accounts", on_delete: :cascade
   add_foreign_key "mentions", "conversations", on_delete: :cascade
   add_foreign_key "mentions", "users", on_delete: :cascade
diff --git a/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb b/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
new file mode 100644
index 000000000..9a6b0fa67
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/dashboard_apps_controller_spec.rb
@@ -0,0 +1,158 @@
+require 'rails_helper'
+
+RSpec.describe 'DashboardAppsController', type: :request do
+  let(:account) { create(:account) }
+
+  describe 'GET /api/v1/accounts/{account.id}/dashboard_apps' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/dashboard_apps"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:user) { create(:user, account: account) }
+      let!(:dashboard_app) { create(:dashboard_app, user: user, account: account) }
+
+      it 'returns all dashboard_apps in the account' do
+        get "/api/v1/accounts/#{account.id}/dashboard_apps",
+            headers: user.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        response_body = JSON.parse(response.body)
+        expect(response_body.first['title']).to eq(dashboard_app.title)
+        expect(response_body.first['content']).to eq(dashboard_app.content)
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/dashboard_apps/:id' do
+    let(:user) { create(:user, account: account) }
+    let!(:dashboard_app) { create(:dashboard_app, user: user, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'shows the dashboard app' do
+        get "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}",
+            headers: user.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(response.body).to include(dashboard_app.title)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/dashboard_apps' do
+    let(:payload) { { dashboard_app: { title: 'CRM Dashboard', content: [{ type: 'frame', url: 'https://link.com' }] } } }
+    let(:invalid_type_payload) { { dashboard_app: { title: 'CRM Dashboard', content: [{ type: 'dda', url: 'https://link.com' }] } } }
+    let(:invalid_url_payload) { { dashboard_app: { title: 'CRM Dashboard', content: [{ type: 'frame', url: 'com' }] } } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        expect { post "/api/v1/accounts/#{account.id}/dashboard_apps", params: payload }.to change(CustomFilter, :count).by(0)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:user) { create(:user, account: account) }
+
+      it 'creates the dashboard app' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/dashboard_apps", headers: user.create_new_auth_token,
+                                                                params: payload
+        end.to change(DashboardApp, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['title']).to eq 'CRM Dashboard'
+        expect(json_response['content'][0]['link']).to eq payload[:dashboard_app][:content][0][:link]
+        expect(json_response['content'][0]['type']).to eq payload[:dashboard_app][:content][0][:type]
+      end
+
+      it 'does not create the dashboard app if invalid URL' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/dashboard_apps", headers: user.create_new_auth_token,
+                                                                params: invalid_url_payload
+        end.to change(DashboardApp, :count).by(0)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eq 'Content : Invalid data'
+      end
+
+      it 'does not create the dashboard app if invalid type' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/dashboard_apps", headers: user.create_new_auth_token,
+                                                                params: invalid_type_payload
+        end.to change(DashboardApp, :count).by(0)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/dashboard_apps/:id' do
+    let(:payload) { { dashboard_app: { title: 'CRM Dashboard', content: [{ type: 'frame', url: 'https://link.com' }] } } }
+    let(:user) { create(:user, account: account) }
+    let!(:dashboard_app) { create(:dashboard_app, user: user, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}",
+            params: payload
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'updates the dashboard app' do
+        patch "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}",
+              headers: user.create_new_auth_token,
+              params: payload,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(dashboard_app.reload.title).to eq('CRM Dashboard')
+        expect(json_response['content'][0]['link']).to eq payload[:dashboard_app][:content][0][:link]
+        expect(json_response['content'][0]['type']).to eq payload[:dashboard_app][:content][0][:type]
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/dashboard_apps/:id' do
+    let(:user) { create(:user, account: account) }
+    let!(:dashboard_app) { create(:dashboard_app, user: user, account: account) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated admin user' do
+      it 'deletes dashboard app' do
+        delete "/api/v1/accounts/#{account.id}/dashboard_apps/#{dashboard_app.id}",
+               headers: user.create_new_auth_token,
+               as: :json
+        expect(response).to have_http_status(:no_content)
+        expect(user.dashboard_apps.count).to be 0
+      end
+    end
+  end
+end
diff --git a/spec/factories/dashboard_app.rb b/spec/factories/dashboard_app.rb
new file mode 100644
index 000000000..559e966b6
--- /dev/null
+++ b/spec/factories/dashboard_app.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :dashboard_app do
+    sequence(:title) { |n| "Dashboard App #{n}" }
+    content { [{ type: 'frame', url: 'https://chatwoot.com' }] }
+    user
+    account
+  end
+end

From c7c46463ae78aa6c3a2a0dd1be0f620556ddbdb5 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Wed, 1 Jun 2022 18:41:18 +0530
Subject: [PATCH 141/177] fix: Update text used in personal message signature
 (#4776)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/dashboard/i18n/locale/en/settings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index d51ebe6eb..e8709c62f 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"

From 6b9f4d08ca37c5bd6fd4dd154e3929f7335904b7 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Thu, 2 Jun 2022 11:38:58 +0530
Subject: [PATCH 142/177] fix: Disable marking IMAP connection as invalid for
 Standard Errors (#4764)

---
 app/jobs/inboxes/fetch_imap_emails_job.rb   | 19 ++++++++++++-------
 lib/chatwoot_exception_tracker.rb           |  7 +++++--
 spec/lib/chatwoot_exception_tracker_spec.rb |  5 +++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
index eab5e4701..2b77d068c 100644
--- a/app/jobs/inboxes/fetch_imap_emails_job.rb
+++ b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -6,13 +6,12 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
   def perform(channel)
     return unless should_fetch_email?(channel)
 
-    process_mail_for_channel(channel)
+    fetch_mail_for_channel(channel)
     # clearing old failures like timeouts since the mail is now successfully processed
     channel.reauthorized!
   rescue Errno::ECONNREFUSED, Net::OpenTimeout, Net::IMAP::NoResponseError
     channel.authorization_error!
   rescue StandardError => e
-    channel.authorization_error!
     ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
   end
 
@@ -22,7 +21,7 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     channel.imap_enabled? && !channel.reauthorization_required?
   end
 
-  def process_mail_for_channel(channel)
+  def fetch_mail_for_channel(channel)
     # TODO: rather than setting this as default method for all mail objects, lets if can do new mail object
     # using Mail.retriever_method.new(params)
     Mail.defaults do
@@ -36,12 +35,18 @@ class Inboxes::FetchImapEmailsJob < ApplicationJob
     new_mails = false
 
     Mail.find(what: :last, count: 10, order: :desc).each do |inbound_mail|
-      if inbound_mail.date.utc >= channel.imap_inbox_synced_at
-        Imap::ImapMailbox.new.process(inbound_mail, channel)
-        new_mails = true
-      end
+      next unless inbound_mail.date.utc >= channel.imap_inbox_synced_at
+
+      process_mail(inbound_mail, channel)
+      new_mails = true
     end
 
     channel.update(imap_inbox_synced_at: Time.now.utc) if new_mails
   end
+
+  def process_mail(inbound_mail, channel)
+    Imap::ImapMailbox.new.process(inbound_mail, channel)
+  rescue StandardError => e
+    ChatwootExceptionTracker.new(e, account: channel.account).capture_exception
+  end
 end
diff --git a/lib/chatwoot_exception_tracker.rb b/lib/chatwoot_exception_tracker.rb
index 5e08d2dad..e525f3e89 100644
--- a/lib/chatwoot_exception_tracker.rb
+++ b/lib/chatwoot_exception_tracker.rb
@@ -12,8 +12,11 @@ class ChatwootExceptionTracker
   end
 
   def capture_exception
-    capture_exception_with_sentry if ENV['SENTRY_DSN'].present?
-    # Implement other providers like honeybadger, rollbar etc in future
+    if ENV['SENTRY_DSN'].present?
+      capture_exception_with_sentry
+    else
+      Rails.logger.error @exception
+    end
   end
 
   private
diff --git a/spec/lib/chatwoot_exception_tracker_spec.rb b/spec/lib/chatwoot_exception_tracker_spec.rb
index 5e8164d6d..d0d1b37a3 100644
--- a/spec/lib/chatwoot_exception_tracker_spec.rb
+++ b/spec/lib/chatwoot_exception_tracker_spec.rb
@@ -1,8 +1,9 @@
 require 'rails_helper'
 
 describe ChatwootExceptionTracker do
-  it 'returns nil if no tracker is configured' do
-    expect(described_class.new('random').capture_exception).to eq(nil)
+  it 'use rails logger if no tracker is configured' do
+    expect(Rails.logger).to receive(:error).with('random')
+    described_class.new('random').capture_exception
   end
 
   context 'with sentry DSN' do

From 43a0b4c039b76d1eb752143a9c5989b5b67f63c3 Mon Sep 17 00:00:00 2001
From: Vishnu Narayanan <vishnu@chatwoot.com>
Date: Thu, 2 Jun 2022 19:51:50 +0530
Subject: [PATCH 143/177] fix: command execution in heredoc comment (#4783)

---
 deployment/setup_20.04.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/deployment/setup_20.04.sh b/deployment/setup_20.04.sh
index 6f9512f39..15f538846 100644
--- a/deployment/setup_20.04.sh
+++ b/deployment/setup_20.04.sh
@@ -179,7 +179,8 @@ function main() {
               Chatwoot Installation (latest)
 ***************************************************************************
 
-For more verbose logs, open up a second terminal and follow along using, `tail -f /var/log/chatwoot`.
+For more verbose logs, open up a second terminal and follow along using,
+'tail -f /var/log/chatwoot'.
 
 EOF
 
@@ -199,7 +200,7 @@ EOF
     echo "***** Skipping Postgres and Redis installation. ****"
   fi
 
-  echo -en "\n➥ 1/9 Installing dependencies. This takes a while."
+  echo -en "\n➥ 1/9 Installing dependencies. This takes a while.\n"
   install_dependencies &>> "${LOG_FILE}"
 
   if [ "$install_pg_redis" != "no" ]
@@ -273,7 +274,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 bundle exec rails db:chatwoot_prepare'.
 ***************************************************************************
 EOF
   fi

From 79a525aa62ffeddfc311e998f540704b3a08e20d Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Fri, 3 Jun 2022 11:12:22 +0530
Subject: [PATCH 144/177] feat: Add Bulk actions to conversations (#4647)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/javascript/dashboard/api/bulkActions.js   |   9 +
 .../dashboard/api/specs/bulkAction.spec.js    |   9 +
 .../dashboard/components/ChatList.vue         |  92 ++++++-
 .../widgets/conversation/ConversationBox.vue  |   2 +-
 .../widgets/conversation/ConversationCard.vue |  61 ++++-
 .../conversationBulkActions/Actions.vue       | 135 ++++++++++
 .../conversationBulkActions/AgentSelector.vue | 249 ++++++++++++++++++
 .../dashboard/i18n/locale/en/bulkActions.json |  17 ++
 .../dashboard/i18n/locale/en/index.js         |   2 +
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/bulkActions.js    |  44 ++++
 .../store/modules/inboxAssignableAgents.js    |   9 +-
 .../modules/specs/bulkActions/actions.spec.js |  28 ++
 .../modules/specs/bulkActions/fixtures.js     |   5 +
 .../modules/specs/bulkActions/getters.spec.js |  14 +
 .../specs/bulkActions/mutations.spec.js       |  12 +
 .../inboxAssignableMembers/actions.spec.js    |   4 +-
 .../dashboard/store/mutation-types.js         |   3 +
 .../shared/assets/stylesheets/colors.scss     |   2 +-
 .../shared/assets/stylesheets/shadows.scss    |   5 +
 .../FluentIcon/dashboard-icons.json           |   1 +
 21 files changed, 693 insertions(+), 12 deletions(-)
 create mode 100644 app/javascript/dashboard/api/bulkActions.js
 create mode 100644 app/javascript/dashboard/api/specs/bulkAction.spec.js
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
 create mode 100644 app/javascript/dashboard/i18n/locale/en/bulkActions.json
 create mode 100644 app/javascript/dashboard/store/modules/bulkActions.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/bulkActions/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js

diff --git a/app/javascript/dashboard/api/bulkActions.js b/app/javascript/dashboard/api/bulkActions.js
new file mode 100644
index 000000000..a606c56ac
--- /dev/null
+++ b/app/javascript/dashboard/api/bulkActions.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class BulkActionsAPI extends ApiClient {
+  constructor() {
+    super('bulk_actions', { accountScoped: true });
+  }
+}
+
+export default new BulkActionsAPI();
diff --git a/app/javascript/dashboard/api/specs/bulkAction.spec.js b/app/javascript/dashboard/api/specs/bulkAction.spec.js
new file mode 100644
index 000000000..aec0b1e3e
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/bulkAction.spec.js
@@ -0,0 +1,9 @@
+import bulkActions from '../bulkActions';
+import ApiClient from '../ApiClient';
+
+describe('#BulkActionsAPI', () => {
+  it('creates correct instance', () => {
+    expect(bulkActions).toBeInstanceOf(ApiClient);
+    expect(bulkActions).toHaveProperty('create');
+  });
+});
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 2887e4a08..4a90bf7a1 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -96,6 +96,9 @@
         :chat="chat"
         :conversation-type="conversationType"
         :show-assignee="showAssigneeInConversationCard"
+        :selected="isConversationSelected(chat.id)"
+        @select-conversation="selectConversation"
+        @de-select-conversation="deSelectConversation"
       />
 
       <div v-if="chatListLoading" class="text-center">
@@ -134,6 +137,16 @@
         @applyFilter="onApplyFilter"
       />
     </woot-modal>
+
+    <conversation-bulk-actions
+      v-if="selectedConversations.length"
+      :conversations="selectedConversations"
+      :all-conversations-selected="allConversationsSelected"
+      :selected-inboxes="uniqueInboxes"
+      @select-all-conversations="selectAllConversations"
+      @assign-agent="onAssignAgent"
+      @resolve-conversations="onResolveConversations"
+    />
   </div>
 </template>
 
@@ -152,6 +165,8 @@ import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
 import filterQueryGenerator from '../helper/filterQueryGenerator.js';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews.vue';
+import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Actions.vue';
+import alertMixin from 'shared/mixins/alertMixin';
 
 import {
   hasPressedAltAndJKey,
@@ -166,8 +181,9 @@ export default {
     ChatFilter,
     ConversationAdvancedFilter,
     DeleteCustomViews,
+    ConversationBulkActions,
   },
-  mixins: [timeMixin, conversationMixin, eventListenerMixins],
+  mixins: [timeMixin, conversationMixin, eventListenerMixins, alertMixin],
   props: {
     conversationInbox: {
       type: [String, Number],
@@ -202,6 +218,8 @@ export default {
       foldersQuery: {},
       showAddFoldersModal: false,
       showDeleteFoldersModal: false,
+      selectedConversations: [],
+      selectedInboxes: [],
     };
   },
   computed: {
@@ -217,6 +235,7 @@ export default {
       conversationStats: 'conversationStats/getStats',
       appliedFilters: 'getAppliedConversationFilters',
       folders: 'customViews/getCustomViews',
+      inboxes: 'inboxes/getInboxes',
     }),
     hasAppliedFilters() {
       return this.appliedFilters.length !== 0;
@@ -343,6 +362,15 @@ export default {
       }
       return {};
     },
+    allConversationsSelected() {
+      return (
+        JSON.stringify(this.selectedConversations) ===
+        JSON.stringify(this.conversationList.map(item => item.id))
+      );
+    },
+    uniqueInboxes() {
+      return [...new Set(this.selectedInboxes)];
+    },
   },
   watch: {
     activeTeam() {
@@ -376,6 +404,7 @@ export default {
       if (this.$route.name !== 'home') {
         this.$router.push({ name: 'home' });
       }
+      this.resetBulkActions();
       this.foldersQuery = filterQueryGenerator(payload);
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
@@ -441,6 +470,7 @@ export default {
       }
     },
     resetAndFetchData() {
+      this.resetBulkActions();
       this.$store.dispatch('conversationPage/reset');
       this.$store.dispatch('emptyAllConversations');
       this.$store.dispatch('clearConversationFilters');
@@ -491,6 +521,7 @@ export default {
     },
     updateAssigneeTab(selectedTab) {
       if (this.activeAssigneeTab !== selectedTab) {
+        this.resetBulkActions();
         bus.$emit('clearSearchInput');
         this.activeAssigneeTab = selectedTab;
         if (!this.currentPage) {
@@ -498,6 +529,10 @@ export default {
         }
       }
     },
+    resetBulkActions() {
+      this.selectedConversations = [];
+      this.selectedInboxes = [];
+    },
     updateStatusType(index) {
       if (this.activeStatus !== index) {
         this.activeStatus = index;
@@ -520,6 +555,59 @@ export default {
         this.fetchConversations();
       }
     },
+    isConversationSelected(id) {
+      return this.selectedConversations.includes(id);
+    },
+    selectConversation(conversationId, inboxId) {
+      this.selectedConversations.push(conversationId);
+      this.selectedInboxes.push(inboxId);
+    },
+    deSelectConversation(conversationId, inboxId) {
+      this.selectedConversations = this.selectedConversations.filter(
+        item => item !== conversationId
+      );
+      this.selectedInboxes = this.selectedInboxes.filter(
+        item => item !== inboxId
+      );
+    },
+    selectAllConversations(check) {
+      if (check) {
+        this.selectedConversations = this.conversationList.map(item => item.id);
+        this.selectedInboxes = this.conversationList.map(item => item.inbox_id);
+      } else {
+        this.resetBulkActions();
+      }
+    },
+    async onAssignAgent(agent) {
+      try {
+        await this.$store.dispatch('bulkActions/process', {
+          type: 'Conversation',
+          ids: this.selectedConversations,
+          fields: {
+            assignee_id: agent.id,
+          },
+        });
+        this.selectedConversations = [];
+        this.showAlert(this.$t('BULK_ACTION.ASSIGN_SUCCESFUL'));
+      } catch (err) {
+        this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
+      }
+    },
+    async onResolveConversations() {
+      try {
+        await this.$store.dispatch('bulkActions/process', {
+          type: 'Conversation',
+          ids: this.selectedConversations,
+          fields: {
+            status: 'resolved',
+          },
+        });
+        this.selectedConversations = [];
+        this.showAlert(this.$t('BULK_ACTION.RESOLVE_SUCCESFUL'));
+      } catch (error) {
+        this.showAlert(this.$t('BULK_ACTION.RESOLVE_FAILED'));
+      }
+    },
   },
 };
 </script>
@@ -535,7 +623,7 @@ export default {
 .conversations-list-wrap {
   flex-shrink: 0;
   width: 34rem;
-
+  overflow: hidden;
   @include breakpoint(large up) {
     width: 36rem;
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
index 494bd5c82..d2eb8a4bd 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationBox.vue
@@ -99,7 +99,7 @@ export default {
   watch: {
     'currentChat.inbox_id'(inboxId) {
       if (inboxId) {
-        this.$store.dispatch('inboxAssignableAgents/fetch', { inboxId });
+        this.$store.dispatch('inboxAssignableAgents/fetch', [inboxId]);
       }
     },
     'currentChat.id'() {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 7e6c89bac..ee12b989a 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -5,11 +5,24 @@
       active: isActiveChat,
       'unread-chat': hasUnread,
       'has-inbox-name': showInboxName,
+      'conversation-selected': selected,
     }"
+    @mouseenter="onCardHover"
+    @mouseleave="onCardLeave"
     @click="cardClick(chat)"
   >
+    <label v-if="hovered || selected" class="checkbox-wrapper">
+      <input
+        :value="selected"
+        :checked="selected"
+        class="checkbox"
+        type="checkbox"
+        @change="onSelectConversation($event.target.checked)"
+        @click.stop
+      />
+    </label>
     <thumbnail
-      v-if="!hideThumbnail"
+      v-if="bulkActionCheck"
       :src="currentContact.thumbnail"
       :badge="inboxBadge"
       class="columns"
@@ -142,8 +155,16 @@ export default {
       type: String,
       default: '',
     },
+    selected: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      hovered: false,
+    };
   },
-
   computed: {
     ...mapGetters({
       currentChat: 'getSelectedChat',
@@ -152,7 +173,9 @@ export default {
       currentUser: 'getCurrentUser',
       accountId: 'getCurrentAccountId',
     }),
-
+    bulkActionCheck() {
+      return !this.hideThumbnail && !this.hovered && !this.selected;
+    },
     chatMetadata() {
       return this.chat.meta || {};
     },
@@ -260,6 +283,16 @@ export default {
       }
       router.push({ path: frontendURL(path) });
     },
+    onCardHover() {
+      this.hovered = !this.hideThumbnail;
+    },
+    onCardLeave() {
+      this.hovered = false;
+    },
+    onSelectConversation(checked) {
+      const action = checked ? 'select-conversation' : 'de-select-conversation';
+      this.$emit(action, this.chat.id, this.inbox.id);
+    },
   },
 };
 </script>
@@ -272,6 +305,10 @@ export default {
   }
 }
 
+.conversation-selected {
+  background: var(--color-background-light);
+}
+
 .has-inbox-name {
   &::v-deep .user-thumbnail-box {
     margin-top: var(--space-normal);
@@ -320,4 +357,22 @@ export default {
   margin-top: var(--space-minus-micro);
   vertical-align: middle;
 }
+.checkbox-wrapper {
+  height: 40px;
+  width: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 100%;
+  margin-top: var(--space-normal);
+  cursor: pointer;
+  &:hover {
+    background-color: var(--w-100);
+  }
+
+  input[type='checkbox'] {
+    margin: var(--space-zero);
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue
new file mode 100644
index 000000000..5466f559d
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue
@@ -0,0 +1,135 @@
+<template>
+  <div class="bulk-action__container">
+    <div class="flex-between">
+      <label class="bulk-action__panel flex-between">
+        <input
+          ref="selectAllCheck"
+          type="checkbox"
+          class="checkbox"
+          :checked="allConversationsSelected"
+          @change="selectAll($event)"
+        />
+        <span>
+          {{
+            $t('BULK_ACTION.CONVERSATIONS_SELECTED', {
+              conversationCount: conversations.length,
+            })
+          }}
+        </span>
+      </label>
+      <div class="bulk-action__actions flex-between">
+        <woot-button
+          v-tooltip="$t('BULK_ACTION.RESOLVE_TOOLTIP')"
+          size="tiny"
+          variant="flat"
+          color-scheme="success"
+          icon="checkmark"
+          class="margin-right-smaller"
+          @click="resolveConversations"
+        />
+        <woot-button
+          v-tooltip="$t('BULK_ACTION.ASSIGN_AGENT_TOOLTIP')"
+          size="tiny"
+          variant="flat"
+          color-scheme="secondary"
+          icon="person-assign"
+          @click="showAgentsList = true"
+        />
+      </div>
+      <transition name="menu-slide">
+        <agent-selector
+          v-if="showAgentsList"
+          :selected-inboxes="selectedInboxes"
+          :conversation-count="conversations.length"
+          @select="submit"
+          @close="showAgentsList = false"
+        />
+      </transition>
+    </div>
+    <div v-if="allConversationsSelected" class="bulk-action__alert">
+      {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
+    </div>
+  </div>
+</template>
+
+<script>
+import AgentSelector from './AgentSelector.vue';
+export default {
+  components: {
+    AgentSelector,
+  },
+  props: {
+    conversations: {
+      type: Array,
+      default: () => [],
+    },
+    allConversationsSelected: {
+      type: Boolean,
+      default: false,
+    },
+    selectedInboxes: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  data() {
+    return {
+      showAgentsList: false,
+    };
+  },
+  mounted() {
+    this.$refs.selectAllCheck.indeterminate = true;
+  },
+  methods: {
+    selectAll(e) {
+      this.$emit('select-all-conversations', e.target.checked);
+    },
+    submit(agent) {
+      this.$emit('assign-agent', agent);
+    },
+    resolveConversations() {
+      this.$emit('resolve-conversations');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-between {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+}
+
+.bulk-action__container {
+  background-color: var(--s-50);
+  border-top: 1px solid var(--s-100);
+  box-shadow: var(--shadow-bulk-action-container);
+  padding: var(--space-normal) var(--space-one);
+  position: relative;
+}
+
+.bulk-action__panel {
+  cursor: pointer;
+
+  span {
+    font-size: var(--font-size-mini);
+    margin-left: var(--space-smaller);
+  }
+
+  input[type='checkbox'] {
+    cursor: pointer;
+    margin: var(--space-zero);
+  }
+}
+
+.bulk-action__alert {
+  background-color: var(--y-50);
+  border-radius: var(--border-radius-small);
+  border: 1px solid var(--y-300);
+  color: var(--y-700);
+  font-size: var(--font-size-mini);
+  margin-top: var(--space-small);
+  padding: var(--space-half) var(--space-one);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
new file mode 100644
index 000000000..1d7fe6ec0
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -0,0 +1,249 @@
+<template>
+  <div class="bulk-action__agents">
+    <div class="header flex-between">
+      <span>{{ $t('BULK_ACTION.AGENT_SELECT_LABEL') }}</span>
+      <woot-button
+        size="tiny"
+        variant="clear"
+        color-scheme="secondary"
+        icon="dismiss"
+        @click="onClose"
+      />
+    </div>
+    <div class="container">
+      <div v-if="uiFlags.isUpdating" class="agent__list-loading">
+        <spinner />
+        <p>{{ $t('BULK_ACTION.AGENT_LIST_LOADING') }}</p>
+      </div>
+      <div v-else class="agent__list-container">
+        <ul v-if="!selectedAgent">
+          <li class="search-container">
+            <div class="agent-list-search flex-between">
+              <fluent-icon icon="search" class="search-icon" size="16" />
+              <input
+                ref="search"
+                v-model="query"
+                type="search"
+                placeholder="Search"
+                class="agent--search_input"
+              />
+            </div>
+          </li>
+          <li v-for="agent in filteredAgents" :key="agent.id">
+            <div class="agent-list-item" @click="assignAgent(agent)">
+              <thumbnail
+                src="agent.thumbnail"
+                :username="agent.name"
+                size="22px"
+                class="margin-right-small"
+              />
+              <span class="reports-option__title">{{ agent.name }}</span>
+            </div>
+          </li>
+        </ul>
+        <div v-else class="agent-confirmation-container">
+          <p>
+            {{
+              $t('BULK_ACTION.ASSIGN_CONFIRMATION_LABEL', {
+                conversationCount,
+                conversationLabel,
+              })
+            }}
+            <strong>
+              {{ selectedAgent.name }}
+            </strong>
+          </p>
+          <div class="agent-confirmation-actions">
+            <woot-button
+              color-scheme="primary"
+              variant="smooth"
+              @click="goBack"
+            >
+              {{ $t('BULK_ACTION.GO_BACK_LABEL') }}
+            </woot-button>
+            <woot-button
+              color-scheme="primary"
+              variant="flat"
+              :is-loading="uiFlags.isUpdating"
+              @click="submit"
+            >
+              {{ $t('BULK_ACTION.ASSIGN_LABEL') }}
+            </woot-button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
+import Spinner from 'shared/components/Spinner';
+import { mixin as clickaway } from 'vue-clickaway';
+
+export default {
+  components: {
+    Thumbnail,
+    Spinner,
+  },
+  mixins: [clickaway],
+  props: {
+    selectedInboxes: {
+      type: Array,
+      default: () => [],
+    },
+    conversationCount: {
+      type: Number,
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      query: '',
+      selectedAgent: null,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      uiFlags: 'bulkActions/getUIFlags',
+      inboxes: 'inboxes/getInboxes',
+      assignableAgentsUiFlags: 'inboxAssignableAgents/getUIFlags',
+    }),
+    filteredAgents() {
+      if (this.query) {
+        return this.assignableAgents.filter(agent =>
+          agent.name.toLowerCase().includes(this.query.toLowerCase())
+        );
+      }
+      return this.assignableAgents;
+    },
+    assignableAgents() {
+      return this.$store.getters['inboxAssignableAgents/getAssignableAgents'](
+        this.selectedInboxes.join(',')
+      );
+    },
+    conversationLabel() {
+      return this.conversationCount > 1 ? 'conversations' : 'conversation';
+    },
+  },
+  mounted() {
+    this.$store.dispatch('inboxAssignableAgents/fetch', this.selectedInboxes);
+  },
+  methods: {
+    submit() {
+      this.$emit('select', this.selectedAgent);
+    },
+    goBack() {
+      this.selectedAgent = null;
+    },
+    assignAgent(agent) {
+      this.selectedAgent = agent;
+    },
+    onClose() {
+      this.$emit('close');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-between {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.bulk-action__agents {
+  position: absolute;
+  bottom: 40px;
+  right: var(--space-small);
+  width: 100%;
+  box-shadow: var(--shadow-dropdown-pane);
+  border-radius: var(--border-radius-large);
+  border: 1px solid var(--s-50);
+  background-color: var(--white);
+  width: 75%;
+  .header {
+    padding: var(--space-one);
+    span {
+      font-size: var(--font-size-default);
+      font-weight: var(--font-weight-medium);
+    }
+  }
+  .container {
+    height: 240px;
+    overflow-y: auto;
+    .agent__list-container {
+      height: 100%;
+    }
+    .agent-list-search {
+      padding: 0 var(--space-one);
+      border: 1px solid var(--s-100);
+      border-radius: var(--border-radius-medium);
+      background-color: var(--s-50);
+      .search-icon {
+        color: var(--s-400);
+      }
+
+      .agent--search_input {
+        border: 0;
+        font-size: var(--font-size-mini);
+        margin: 0;
+        background-color: transparent;
+        height: unset;
+      }
+    }
+  }
+}
+ul {
+  margin: 0;
+  list-style: none;
+}
+
+.agent-list-item {
+  display: flex;
+  align-items: center;
+  padding: var(--space-one);
+  cursor: pointer;
+  &:hover {
+    background-color: var(--s-50);
+  }
+  span {
+    font-size: var(--font-size-small);
+  }
+}
+
+.agent-confirmation-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: var(--space-one);
+  p {
+    flex-grow: 1;
+  }
+  .agent-confirmation-actions {
+    width: 100%;
+    display: grid;
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+    gap: var(--space-one);
+  }
+}
+.search-container {
+  padding: 0 var(--space-one);
+  position: sticky;
+  top: 0;
+  z-index: var(--z-index-twenty);
+  background-color: var(--white);
+}
+
+.agent__list-loading {
+  height: calc(95% - var(--space-one));
+  margin: var(--space-one);
+  border-radius: var(--border-radius-medium);
+  background-color: var(--s-50);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 5c1449fab..b21009322 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -21,6 +21,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _bulkActions } from './bulkActions.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +47,5 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 5cd1a0112..4957a27cc 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -6,6 +6,7 @@ import agents from './modules/agents';
 import attributes from './modules/attributes';
 import auth from './modules/auth';
 import automations from './modules/automations';
+import bulkActions from './modules/bulkActions';
 import campaigns from './modules/campaigns';
 import cannedResponse from './modules/cannedResponse';
 import contactConversations from './modules/contactConversations';
@@ -43,6 +44,7 @@ export default new Vuex.Store({
     attributes,
     auth,
     automations,
+    bulkActions,
     campaigns,
     cannedResponse,
     contactConversations,
diff --git a/app/javascript/dashboard/store/modules/bulkActions.js b/app/javascript/dashboard/store/modules/bulkActions.js
new file mode 100644
index 000000000..709f4875a
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/bulkActions.js
@@ -0,0 +1,44 @@
+import types from '../mutation-types';
+import BulkActionsAPI from '../../api/bulkActions';
+
+export const state = {
+  uiFlags: {
+    isUpdating: false,
+  },
+};
+
+export const getters = {
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+};
+
+export const actions = {
+  process: async function processAction({ commit }, payload) {
+    commit(types.SET_BULK_ACTIONS_FLAG, { isUpdating: true });
+    try {
+      await BulkActionsAPI.create(payload);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_BULK_ACTIONS_FLAG, { isUpdating: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_BULK_ACTIONS_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+};
+
+export default {
+  namespaced: true,
+  actions,
+  state,
+  getters,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/inboxAssignableAgents.js b/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
index 1acb6897a..08baeb536 100644
--- a/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
+++ b/app/javascript/dashboard/store/modules/inboxAssignableAgents.js
@@ -26,13 +26,16 @@ export const getters = {
 };
 
 export const actions = {
-  async fetch({ commit }, { inboxId }) {
+  async fetch({ commit }, inboxIds) {
     commit(types.SET_INBOX_ASSIGNABLE_AGENTS_UI_FLAG, { isFetching: true });
     try {
       const {
         data: { payload },
-      } = await AssignableAgentsAPI.get([inboxId]);
-      commit(types.SET_INBOX_ASSIGNABLE_AGENTS, { inboxId, members: payload });
+      } = await AssignableAgentsAPI.get(inboxIds);
+      commit(types.SET_INBOX_ASSIGNABLE_AGENTS, {
+        inboxId: inboxIds.join(','),
+        members: payload,
+      });
     } catch (error) {
       throw new Error(error);
     } finally {
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
new file mode 100644
index 000000000..5342c46fd
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/actions.spec.js
@@ -0,0 +1,28 @@
+import axios from 'axios';
+import { actions } from '../../bulkActions';
+import * as types from '../../../mutation-types';
+import payload from './fixtures';
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: payload });
+      await actions.process({ commit }, payload);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_BULK_ACTIONS_FLAG, { isUpdating: true }],
+        [types.default.SET_BULK_ACTIONS_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.process({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_BULK_ACTIONS_FLAG, { isUpdating: true }],
+        [types.default.SET_BULK_ACTIONS_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/fixtures.js b/app/javascript/dashboard/store/modules/specs/bulkActions/fixtures.js
new file mode 100644
index 000000000..3b3606e36
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/fixtures.js
@@ -0,0 +1,5 @@
+export default {
+  type: 'Conversation',
+  ids: [64, 39],
+  fields: { assignee_id: 6 },
+};
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
new file mode 100644
index 000000000..2349e2efb
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/getters.spec.js
@@ -0,0 +1,14 @@
+import { getters } from '../../bulkActions';
+
+describe('#getters', () => {
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isUpdating: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isUpdating: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js
new file mode 100644
index 000000000..29278c72e
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/bulkActions/mutations.spec.js
@@ -0,0 +1,12 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../bulkActions';
+
+describe('#mutations', () => {
+  describe('#toggleUiFlag', () => {
+    it('set update flags', () => {
+      const state = { uiFlags: { isUpdating: false } };
+      mutations[types.SET_BULK_ACTIONS_FLAG](state, { isUpdating: true });
+      expect(state.uiFlags.isUpdating).toEqual(true);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/inboxAssignableMembers/actions.spec.js b/app/javascript/dashboard/store/modules/specs/inboxAssignableMembers/actions.spec.js
index 480ee657f..39b21b3c0 100644
--- a/app/javascript/dashboard/store/modules/specs/inboxAssignableMembers/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/inboxAssignableMembers/actions.spec.js
@@ -12,12 +12,12 @@ describe('#actions', () => {
       axios.get.mockResolvedValue({
         data: { payload: agentsData },
       });
-      await actions.fetch({ commit }, { inboxId: 1 });
+      await actions.fetch({ commit }, [1]);
       expect(commit.mock.calls).toEqual([
         [types.SET_INBOX_ASSIGNABLE_AGENTS_UI_FLAG, { isFetching: true }],
         [
           types.SET_INBOX_ASSIGNABLE_AGENTS,
-          { inboxId: 1, members: agentsData },
+          { inboxId: '1', members: agentsData },
         ],
         [types.SET_INBOX_ASSIGNABLE_AGENTS_UI_FLAG, { isFetching: false }],
       ]);
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index b78e468a1..e20efbf78 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -211,6 +211,9 @@ export default {
   ADD_CUSTOM_VIEW: 'ADD_CUSTOM_VIEW',
   DELETE_CUSTOM_VIEW: 'DELETE_CUSTOM_VIEW',
 
+  // Bulk Actions
+  SET_BULK_ACTIONS_FLAG: 'SET_BULK_ACTIONS_FLAG',
+
   // Dashboard Apps
   SET_DASHBOARD_APPS_UI_FLAG: 'SET_DASHBOARD_APPS_UI_FLAG',
   SET_DASHBOARD_APPS: 'SET_DASHBOARD_APPS',
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 3f64ce58b..82a700929 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -7,7 +7,7 @@
   --w-75: #D6EBFF;
   --w-100: #C2E1FF;
   --w-200: #99CEFF;
-  --w-300: ##70BAFF;
+  --w-300: #70BAFF;
   --w-400: #47A6FF;
   --w-500: #1F93FF;
   --w-600: #1976CC;
diff --git a/app/javascript/shared/assets/stylesheets/shadows.scss b/app/javascript/shared/assets/stylesheets/shadows.scss
index 0e44e1d26..6b11a427b 100644
--- a/app/javascript/shared/assets/stylesheets/shadows.scss
+++ b/app/javascript/shared/assets/stylesheets/shadows.scss
@@ -8,4 +8,9 @@
         0 4px 6px -2px rgba(0, 0, 0, 0.05);
     --shadow-larger: 0 20px 25px -5px rgba(0, 0, 0, 0.1),
         0 10px 10px -5px rgba(0, 0, 0, 0.04);
+    --shadow-dropdown-pane:
+        0 0.8rem 1.6rem rgb(50 50 93 / 8%),
+        0 0.4rem 1.2rem rgb(0 0 0 / 7%);
+    --shadow-bulk-action-container:
+        6px 3px 22px 9px rgb(181 181 181 / 25%);
 }
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index cd52e47f0..d235ffdec 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -98,6 +98,7 @@
   "people-outline": "M4 13.999 13 14a2 2 0 0 1 1.995 1.85L15 16v1.5C14.999 21 11.284 22 8.5 22c-2.722 0-6.335-.956-6.495-4.27L2 17.5v-1.501c0-1.054.816-1.918 1.85-1.995L4 14ZM15.22 14H20c1.054 0 1.918.816 1.994 1.85L22 16v1c-.001 3.062-2.858 4-5 4a7.16 7.16 0 0 1-2.14-.322c.336-.386.607-.827.802-1.327A6.19 6.19 0 0 0 17 19.5l.267-.006c.985-.043 3.086-.363 3.226-2.289L20.5 17v-1a.501.501 0 0 0-.41-.492L20 15.5h-4.051a2.957 2.957 0 0 0-.595-1.34L15.22 14H20h-4.78ZM4 15.499l-.1.01a.51.51 0 0 0-.254.136.506.506 0 0 0-.136.253l-.01.101V17.5c0 1.009.45 1.722 1.417 2.242.826.445 2.003.714 3.266.753l.317.005.317-.005c1.263-.039 2.439-.308 3.266-.753.906-.488 1.359-1.145 1.412-2.057l.005-.186V16a.501.501 0 0 0-.41-.492L13 15.5l-9-.001ZM8.5 3a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9Zm9 2a3.5 3.5 0 1 1 0 7 3.5 3.5 0 0 1 0-7Zm-9-.5c-1.654 0-3 1.346-3 3s1.346 3 3 3 3-1.346 3-3-1.346-3-3-3Zm9 2c-1.103 0-2 .897-2 2s.897 2 2 2 2-.897 2-2-.897-2-2-2Z",
   "people-team-outline": "M14.754 10c.966 0 1.75.784 1.75 1.75v4.749a4.501 4.501 0 0 1-9.002 0V11.75c0-.966.783-1.75 1.75-1.75h5.502Zm0 1.5H9.252a.25.25 0 0 0-.25.25v4.749a3.001 3.001 0 0 0 6.002 0V11.75a.25.25 0 0 0-.25-.25ZM3.75 10h3.381a2.738 2.738 0 0 0-.618 1.5H3.75a.25.25 0 0 0-.25.25v3.249a2.501 2.501 0 0 0 3.082 2.433c.085.504.24.985.453 1.432A4.001 4.001 0 0 1 2 14.999V11.75c0-.966.784-1.75 1.75-1.75Zm13.125 0h3.375c.966 0 1.75.784 1.75 1.75V15a4 4 0 0 1-5.03 3.866c.214-.448.369-.929.455-1.433A2.5 2.5 0 0 0 20.5 15v-3.25a.25.25 0 0 0-.25-.25h-2.757a2.738 2.738 0 0 0-.618-1.5ZM12 3a3 3 0 1 1 0 6 3 3 0 0 1 0-6Zm6.5 1a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Zm-13 0a2.5 2.5 0 1 1 0 5 2.5 2.5 0 0 1 0-5Zm6.5.5a1.5 1.5 0 1 0 0 3 1.5 1.5 0 0 0 0-3Zm6.5 1a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-13 0a1 1 0 1 0 0 2 1 1 0 0 0 0-2Z",
   "person-add-outline": "M17.5 12a5.5 5.5 0 1 1 0 11a5.5 5.5 0 0 1 0-11zm-5.477 2a6.47 6.47 0 0 0-.709 1.5H4.253a.749.749 0 0 0-.75.75v.577c0 .535.192 1.053.54 1.46c1.253 1.469 3.22 2.214 5.957 2.214c.597 0 1.157-.035 1.68-.106c.246.495.553.954.912 1.367c-.795.16-1.66.24-2.592.24c-3.146 0-5.532-.906-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.578A2.249 2.249 0 0 1 4.253 14h7.77zm5.477 0l-.09.008a.5.5 0 0 0-.402.402L17 14.5V17h-2.496l-.09.008a.5.5 0 0 0-.402.402l-.008.09l.008.09a.5.5 0 0 0 .402.402l.09.008H17L17 20.5l.008.09a.5.5 0 0 0 .402.402l.09.008l.09-.008a.5.5 0 0 0 .402-.402L18 20.5V18h2.504l.09-.008a.5.5 0 0 0 .402-.402l.008-.09l-.008-.09a.5.5 0 0 0-.402-.402l-.09-.008H18L18 14.5l-.008-.09a.5.5 0 0 0-.402-.402L17.5 14zM10 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10zm0 1.5a3.5 3.5 0 1 0 0 7a3.5 3.5 0 0 0 0-7z",
+  "person-assign-outline": "M11.313 15.5a6.471 6.471 0 0 1 .709-1.5h-7.77a2.249 2.249 0 0 0-2.249 2.25v.577c0 .892.319 1.756.899 2.435c1.566 1.834 3.952 2.74 7.098 2.74c.931 0 1.796-.08 2.592-.24a6.51 6.51 0 0 1-.913-1.366c-.524.07-1.083.105-1.68.105c-2.737 0-4.703-.745-5.957-2.213a2.25 2.25 0 0 1-.539-1.461v-.578a.75.75 0 0 1 .75-.749h7.06ZM10 2.005a5 5 0 1 1 0 10a5 5 0 0 1 0-10Zm0 1.5a3.5 3.5 0 1 0 0 7a3.5 3.5 0 0 0 0-7ZM23 17.5a5.5 5.5 0 1 1-11 0a5.5 5.5 0 0 1 11 0Zm-4.647-2.853a.5.5 0 0 0-.707.707L19.293 17H15a.5.5 0 1 0 0 1h4.293l-1.647 1.647a.5.5 0 0 0 .707.707l2.5-2.5a.497.497 0 0 0 .147-.345V17.5a.498.498 0 0 0-.15-.357l-2.497-2.496Z",
   "person-outline": "M17.754 14a2.249 2.249 0 0 1 2.25 2.249v.575c0 .894-.32 1.76-.902 2.438-1.57 1.834-3.957 2.739-7.102 2.739-3.146 0-5.532-.905-7.098-2.74a3.75 3.75 0 0 1-.898-2.435v-.577a2.249 2.249 0 0 1 2.249-2.25h11.501Zm0 1.5H6.253a.749.749 0 0 0-.75.749v.577c0 .536.192 1.054.54 1.461 1.253 1.468 3.219 2.214 5.957 2.214s4.706-.746 5.962-2.214a2.25 2.25 0 0 0 .541-1.463v-.575a.749.749 0 0 0-.749-.75ZM12 2.004a5 5 0 1 1 0 10 5 5 0 0 1 0-10Zm0 1.5a3.5 3.5 0 1 0 0 7 3.5 3.5 0 0 0 0-7Z",
   "power-outline": "M8.204 4.82a.75.75 0 0 1 .634 1.36A7.51 7.51 0 0 0 4.5 12.991c0 4.148 3.358 7.51 7.499 7.51s7.499-3.362 7.499-7.51a7.51 7.51 0 0 0-4.323-6.804.75.75 0 1 1 .637-1.358 9.01 9.01 0 0 1 5.186 8.162c0 4.976-4.029 9.01-9 9.01C7.029 22 3 17.966 3 12.99a9.01 9.01 0 0 1 5.204-8.17ZM12 2.496a.75.75 0 0 1 .743.648l.007.102v7.5a.75.75 0 0 1-1.493.102l-.007-.102v-7.5a.75.75 0 0 1 .75-.75Z",
   "quote-outline": "M7.5 6a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.555-1.24 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.64-1.737 2.66-3.674 3.077-5.859A2.5 2.5 0 1 1 7.5 6Zm9 0a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.56-1.238 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.643-1.738 2.662-3.672 3.078-5.859A2.5 2.5 0 1 1 16.5 6Zm-9 1.5a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Zm9 0a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Z",

From 267252d13ad9043c5a778a7c2b09680c18ac42e7 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 6 Jun 2022 12:43:19 +0530
Subject: [PATCH 145/177] chore: Remove flay, rspec from development/test group
 (#4795)

---
 Gemfile      |  5 -----
 Gemfile.lock | 17 ++---------------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index f7cac3c70..b8e511b1b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -156,11 +156,6 @@ group :test do
 end
 
 group :development, :test do
-  # TODO: is this needed ?
-  # errors thrown by devise password gem
-  gem 'flay'
-  gem 'rspec'
-  # for error thrown by devise password gem
   gem 'active_record_query_trace'
   gem 'bundle-audit', require: false
   gem 'byebug', platform: :mri
diff --git a/Gemfile.lock b/Gemfile.lock
index b12a2fc5c..92639c0d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/chatwoot/devise-secure_password
-  revision: de11e8765654b8242d42101ee9c8ffc8126f7975
+  revision: d777b04f12652d576b1272b8f39857e3e0b3fc26
   specs:
     devise-secure_password (2.0.1)
       devise (>= 4.0.0, < 5.0.0)
@@ -182,7 +182,6 @@ GEM
       regexp_parser (~> 2.2)
     email_reply_trimmer (0.1.13)
     erubi (1.10.0)
-    erubis (2.7.0)
     et-orbi (1.2.7)
       tzinfo
     execjs (2.8.1)
@@ -204,11 +203,6 @@ GEM
       faraday (~> 1)
     ffi (1.15.5)
     flag_shih_tzu (0.3.23)
-    flay (2.12.1)
-      erubis (~> 2.7.0)
-      path_expander (~> 1.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
     foreman (0.87.2)
     fugit (1.5.3)
       et-orbi (~> 1, >= 1.2.7)
@@ -393,7 +387,6 @@ GEM
     parallel (1.21.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    path_expander (1.1.0)
     pg (1.3.2)
     procore-sift (0.16.0)
       rails (> 4.2.0)
@@ -468,10 +461,6 @@ GEM
       netrc (~> 0.8)
     retriable (3.1.2)
     rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
     rspec-expectations (3.11.0)
@@ -681,7 +670,6 @@ DEPENDENCIES
   faker
   fcm
   flag_shih_tzu
-  flay
   foreman
   geocoder
   google-cloud-dialogflow
@@ -718,7 +706,6 @@ DEPENDENCIES
   redis-namespace
   responders
   rest-client
-  rspec
   rspec-rails (~> 5.0.0)
   rubocop
   rubocop-performance
@@ -755,4 +742,4 @@ RUBY VERSION
    ruby 3.0.4p208
 
 BUNDLED WITH
-   2.3.10
+   2.3.14

From 56f668db6bca4ad7c91ca88a9e258d00bfb46f7a Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 7 Jun 2022 13:01:01 +0530
Subject: [PATCH 146/177] feat: Attribute changed filter for automations
 (#4621)

---
 .../accounts/automation_rules_controller.rb   | 12 ++-
 app/listeners/automation_rule_listener.rb     | 10 +-
 .../conditions_filter_service.rb              | 37 ++++++++
 .../automation_rule_listener_spec.rb          | 95 +++++++++++++++++++
 4 files changed, 148 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 5e649b6e0..78cd15e31 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -9,6 +9,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
   def create
     @automation_rule = Current.account.automation_rules.new(automation_rules_permit)
     @automation_rule.actions = params[:actions]
+    @automation_rule.conditions = params[:conditions]
 
     render json: { error: @automation_rule.errors.messages }, status: :unprocessable_entity and return unless @automation_rule.valid?
 
@@ -31,9 +32,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
 
   def update
     ActiveRecord::Base.transaction do
-      @automation_rule.update!(automation_rules_permit)
-      @automation_rule.actions = params[:actions] if params[:actions]
-      @automation_rule.save!
+      automation_rule_update
       process_attachments
 
     rescue StandardError => e
@@ -67,6 +66,13 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
 
   private
 
+  def automation_rule_update
+    @automation_rule.update!(automation_rules_permit)
+    @automation_rule.actions = params[:actions] if params[:actions]
+    @automation_rule.conditions = params[:conditions] if params[:conditions]
+    @automation_rule.save!
+  end
+
   def automation_rules_permit
     params.permit(
       :name, :description, :event_name, :account_id, :active,
diff --git a/app/listeners/automation_rule_listener.rb b/app/listeners/automation_rule_listener.rb
index 0f445fea7..f778dcd69 100644
--- a/app/listeners/automation_rule_listener.rb
+++ b/app/listeners/automation_rule_listener.rb
@@ -4,11 +4,12 @@ class AutomationRuleListener < BaseListener
 
     conversation = event_obj.data[:conversation]
     account = conversation.account
+    changed_attributes = event_obj.data[:changed_attributes]
 
     return unless rule_present?('conversation_updated', account)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).perform
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation, { changed_attributes: changed_attributes }).perform
       AutomationRules::ActionService.new(rule, account, conversation).perform if conditions_match.present?
     end
   end
@@ -18,11 +19,12 @@ class AutomationRuleListener < BaseListener
 
     conversation = event_obj.data[:conversation]
     account = conversation.account
+    changed_attributes = event_obj.data[:changed_attributes]
 
     return unless rule_present?('conversation_created', account)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation).perform
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, conversation, { changed_attributes: changed_attributes }).perform
       ::AutomationRules::ActionService.new(rule, account, conversation).perform if conditions_match.present?
     end
   end
@@ -32,11 +34,13 @@ class AutomationRuleListener < BaseListener
 
     message = event_obj.data[:message]
     account = message.try(:account)
+    changed_attributes = event_obj.data[:changed_attributes]
 
     return unless rule_present?('message_created', account)
 
     @rules.each do |rule|
-      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation, { message: message }).perform
+      conditions_match = ::AutomationRules::ConditionsFilterService.new(rule, message.conversation,
+                                                                        { message: message, changed_attributes: changed_attributes }).perform
       ::AutomationRules::ActionService.new(rule, account, message.conversation).perform if conditions_match.present?
     end
   end
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index 67cd2a62c..e32a95751 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -11,18 +11,24 @@ class AutomationRules::ConditionsFilterService < FilterService
     file = File.read('./lib/filters/filter_keys.json')
     @filters = JSON.parse(file)
     @options = options
+    @changed_attributes = options[:changed_attributes]
   end
 
   def perform
     @conversation_filters = @filters['conversations']
     @contact_filters = @filters['contacts']
     @message_filters = @filters['messages']
+    @attribute_changed_query_filter = []
 
     @rule.conditions.each_with_index do |query_hash, current_index|
+      @attribute_changed_query_filter << query_hash and next if query_hash['filter_operator'] == 'attribute_changed'
+
       apply_filter(query_hash, current_index)
     end
 
     records = base_relation.where(@query_string, @filter_values.with_indifferent_access)
+    records = perform_attribute_changed_filter(records) if @attribute_changed_query_filter.any?
+
     records.any?
   end
 
@@ -43,6 +49,37 @@ class AutomationRules::ConditionsFilterService < FilterService
     end
   end
 
+  # If attribute_changed type filter is present perform this against array
+  def perform_attribute_changed_filter(records)
+    @attribute_changed_records = []
+    current_attribute_changed_record = base_relation
+    filter_based_on_attribute_change(records, current_attribute_changed_record)
+
+    @attribute_changed_records.uniq
+  end
+
+  # Loop through attribute_changed_query_filter
+  def filter_based_on_attribute_change(records, current_attribute_changed_record)
+    @attribute_changed_query_filter.each do |filter|
+      @changed_attributes = @changed_attributes.with_indifferent_access
+      changed_attribute = @changed_attributes[filter['attribute_key']].presence
+
+      if changed_attribute[0].in?(filter['values']['from']) && changed_attribute[1].in?(filter['values']['to'])
+        @attribute_changed_records = attribute_changed_filter_query(filter, records, current_attribute_changed_record)
+      end
+      current_attribute_changed_record = @attribute_changed_records
+    end
+  end
+
+  # We intersect with the record if query_operator-AND is present and union if query_operator-OR is present
+  def attribute_changed_filter_query(filter, records, current_attribute_changed_record)
+    if filter['query_operator'] == 'AND'
+      @attribute_changed_records + (current_attribute_changed_record & records)
+    else
+      @attribute_changed_records + (current_attribute_changed_record | records)
+    end
+  end
+
   def message_query_string(current_filter, query_hash, current_index)
     attribute_key = query_hash['attribute_key']
     query_operator = query_hash['query_operator']
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 6ab931554..8f4213137 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -259,6 +259,101 @@ describe AutomationRuleListener do
         expect(conversation.messages.first.content).to eq('Send this message.')
       end
     end
+
+    context 'when conditions based on attribute_changed' do
+      before do
+        automation_rule.update!(
+          event_name: 'conversation_updated',
+          name: 'Call actions conversation updated when company changed from DC to Marvel',
+          description: 'Add labels, assign team after conversation updated',
+          conditions: [
+            {
+              attribute_key: 'company',
+              filter_operator: 'attribute_changed',
+              values: { from: ['DC'], to: ['Marvel'] },
+              query_operator: 'AND'
+            }.with_indifferent_access,
+            {
+              attribute_key: 'status',
+              filter_operator: 'equal_to',
+              values: ['snoozed'],
+              query_operator: nil
+            }.with_indifferent_access
+          ]
+        )
+        conversation.update(status: :snoozed)
+      end
+
+      let!(:event) do
+        Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation, changed_attributes: {
+                           company: %w[DC Marvel]
+                         } })
+      end
+
+      context 'when rule matches' do
+        it 'triggers automation rule to assign team' do
+          expect(conversation.team_id).not_to eq(team.id)
+
+          listener.conversation_updated(event)
+
+          conversation.reload
+          expect(conversation.team_id).to eq(team.id)
+        end
+
+        it 'triggers automation rule to assign team with OR operator' do
+          conversation.update(status: :open)
+          automation_rule.update!(
+            conditions: [
+              {
+                attribute_key: 'company',
+                filter_operator: 'attribute_changed',
+                values: { from: ['DC'], to: ['Marvel'] },
+                query_operator: 'OR'
+              }.with_indifferent_access,
+              {
+                attribute_key: 'status',
+                filter_operator: 'equal_to',
+                values: ['snoozed'],
+                query_operator: nil
+              }.with_indifferent_access
+            ]
+          )
+
+          expect(conversation.team_id).not_to eq(team.id)
+
+          listener.conversation_updated(event)
+
+          conversation.reload
+          expect(conversation.team_id).to eq(team.id)
+        end
+      end
+
+      context 'when rule doesnt match' do
+        it 'when automation rule is triggered it will not assign team' do
+          conversation.update(status: :open)
+
+          expect(conversation.team_id).not_to eq(team.id)
+
+          listener.conversation_updated(event)
+
+          conversation.reload
+          expect(conversation.team_id).not_to eq(team.id)
+        end
+
+        it 'when automation rule is triggers, it will not assign team on attribute_changed values' do
+          conversation.update(status: :snoozed)
+          event = Events::Base.new('conversation_updated', Time.zone.now, { conversation: conversation,
+                                                                            changed_attributes: { company: %w[Marvel DC] } })
+
+          expect(conversation.team_id).not_to eq(team.id)
+
+          listener.conversation_updated(event)
+
+          conversation.reload
+          expect(conversation.team_id).not_to eq(team.id)
+        end
+      end
+    end
   end
 
   describe '#message_created' do

From bad24f97abd3f839d40f890b24f797c09e25a9c6 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Tue, 7 Jun 2022 17:33:33 +0530
Subject: [PATCH 147/177] feat: Add support for Whatsapp template messages in
 the UI (#4711)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 app/builders/messages/message_builder.rb      |   6 +-
 app/javascript/dashboard/api/inbox/message.js |   4 +
 app/javascript/dashboard/components/Modal.vue |   3 +
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  17 ++
 .../widgets/conversation/ReplyBox.vue         |  63 ++++--
 .../conversation/WhatsappTemplates/Modal.vue  |  76 ++++++++
 .../WhatsappTemplates/TemplateParser.vue      | 183 ++++++++++++++++++
 .../WhatsappTemplates/TemplatesPicker.vue     | 163 ++++++++++++++++
 .../widgets/conversation/bubble/Actions.vue   |   8 +-
 .../components/widgets/forms/Input.vue        |   5 +
 .../dashboard/i18n/locale/en/index.js         |   2 +
 .../i18n/locale/en/whatsappTemplates.json     |  25 +++
 .../conversation/contact/ConversationForm.vue |  58 ++++--
 .../contact/WhatsappTemplates.vue             |  59 ++++++
 .../dashboard/settings/inbox/Settings.vue     |   2 +-
 .../dashboard/store/modules/inboxes.js        |  14 ++
 .../FluentIcon/dashboard-icons.json           |   1 +
 app/models/channel/whatsapp.rb                |  34 ++--
 app/models/inbox.rb                           |   4 +
 .../whatsapp/send_on_whatsapp_service.rb      |  26 ++-
 app/views/api/v1/models/_inbox.json.jbuilder  |   3 +
 .../whatsapp/send_on_whatsapp_service_spec.rb |  31 +++
 22 files changed, 733 insertions(+), 54 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
 create mode 100644 app/javascript/dashboard/i18n/locale/en/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/contact/WhatsappTemplates.vue

diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 5c8cadbcd..e9bf0802b 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -73,6 +73,10 @@ class Messages::MessageBuilder
     @params[:campaign_id].present? ? { additional_attributes: { campaign_id: @params[:campaign_id] } } : {}
   end
 
+  def template_params
+    @params[:template_params].present? ? { additional_attributes: { template_params: JSON.parse(@params[:template_params].to_json) } } : {}
+  end
+
   def message_sender
     return if @params[:sender_type] != 'AgentBot'
 
@@ -91,6 +95,6 @@ class Messages::MessageBuilder
       items: @items,
       in_reply_to: @in_reply_to,
       echo_id: @params[:echo_id]
-    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id)
+    }.merge(external_created_at).merge(automation_rule_id).merge(campaign_id).merge(template_params)
   end
 end
diff --git a/app/javascript/dashboard/api/inbox/message.js b/app/javascript/dashboard/api/inbox/message.js
index f3c5e83e9..f0096cf23 100644
--- a/app/javascript/dashboard/api/inbox/message.js
+++ b/app/javascript/dashboard/api/inbox/message.js
@@ -10,6 +10,7 @@ export const buildCreatePayload = ({
   files,
   ccEmails = '',
   bccEmails = '',
+  templateParams,
 }) => {
   let payload;
   if (files && files.length !== 0) {
@@ -32,6 +33,7 @@ export const buildCreatePayload = ({
       content_attributes: contentAttributes,
       cc_emails: ccEmails,
       bcc_emails: bccEmails,
+      template_params: templateParams,
     };
   }
   return payload;
@@ -51,6 +53,7 @@ class MessageApi extends ApiClient {
     files,
     ccEmails = '',
     bccEmails = '',
+    templateParams,
   }) {
     return axios({
       method: 'post',
@@ -63,6 +66,7 @@ class MessageApi extends ApiClient {
         files,
         ccEmails,
         bccEmails,
+        templateParams,
       }),
     });
   }
diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue
index f86935959..f4cad844a 100644
--- a/app/javascript/dashboard/components/Modal.vue
+++ b/app/javascript/dashboard/components/Modal.vue
@@ -98,4 +98,7 @@ export default {
     width: 48rem;
   }
 }
+.modal-big {
+  width: 60%;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index 6dcb47532..e7a0b5995 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -79,6 +79,16 @@
         :title="signatureToggleTooltip"
         @click="toggleMessageSignature"
       />
+      <woot-button
+        v-if="showWhatsappTemplatesButton"
+        v-tooltip.top-end="'Whatsapp Templates'"
+        icon="whatsapp"
+        color-scheme="secondary"
+        variant="smooth"
+        size="small"
+        :title="'Whatsapp Templates'"
+        @click="$emit('selectWhatsappTemplate')"
+      />
       <transition name="modal-fade">
         <div
           v-show="$refs.upload && $refs.upload.dropActive"
@@ -218,6 +228,10 @@ export default {
       type: Boolean,
       default: true,
     },
+    hasWhatsappTemplates: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     isNote() {
@@ -261,6 +275,9 @@ export default {
     showMessageSignatureButton() {
       return !this.isPrivate && this.isAnEmailChannel;
     },
+    showWhatsappTemplatesButton() {
+      return !this.isOnPrivateNote && this.hasWhatsappTemplates;
+    },
     sendWithSignature() {
       const { send_with_signature: isEnabled } = this.uiSettings;
       return isEnabled;
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 9ecb8d15c..22c5ee33c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -101,7 +101,7 @@
       :toggle-audio-recorder="toggleAudioRecorder"
       :toggle-audio-recorder-play-pause="toggleAudioRecorderPlayPause"
       :show-emoji-picker="showEmojiPicker"
-      :on-send="sendMessage"
+      :on-send="onSendReply"
       :is-send-disabled="isReplyButtonDisabled"
       :recording-audio-duration-text="recordingAudioDurationText"
       :recording-audio-state="recordingAudioState"
@@ -112,7 +112,16 @@
       :enable-rich-editor="isRichEditorEnabled"
       :enter-to-send-enabled="enterToSendEnabled"
       :enable-multiple-file-upload="enableMultipleFileUpload"
+      :has-whatsapp-templates="hasWhatsappTemplates"
       @toggleEnterToSend="toggleEnterToSend"
+      @selectWhatsappTemplate="openWhatsappTemplateModal"
+    />
+    <whatsapp-templates
+      :inbox-id="inbox.id"
+      :show="showWhatsAppTemplatesModal"
+      @close="hideWhatsappTemplatesModal"
+      @on-send="onSendWhatsAppReply"
+      @cancel="hideWhatsappTemplatesModal"
     />
   </div>
 </template>
@@ -137,7 +146,7 @@ import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
 import { checkFileSizeLimit } from 'shared/helpers/FileHelper';
 import { MAXIMUM_FILE_UPLOAD_SIZE } from 'shared/constants/messages';
 import { BUS_EVENTS } from 'shared/constants/busEvents';
-
+import WhatsappTemplates from './WhatsappTemplates/Modal.vue';
 import {
   isEscape,
   isEnter,
@@ -162,6 +171,7 @@ export default {
     WootMessageEditor,
     WootAudioRecorder,
     Banner,
+    WhatsappTemplates,
   },
   mixins: [
     clickaway,
@@ -201,6 +211,7 @@ export default {
       hasSlashCommand: false,
       bccEmails: '',
       ccEmails: '',
+      showWhatsAppTemplatesModal: false,
     };
   },
   computed: {
@@ -212,7 +223,6 @@ export default {
       globalConfig: 'globalConfig/get',
       accountId: 'getCurrentAccountId',
     }),
-
     showRichContentEditor() {
       if (this.isOnPrivateNote) {
         return true;
@@ -256,7 +266,9 @@ export default {
 
       return false;
     },
-
+    hasWhatsappTemplates() {
+      return !!this.inbox.message_templates;
+    },
     enterToSendEnabled() {
       return !!this.uiSettings.enter_to_send_enabled;
     },
@@ -484,7 +496,7 @@ export default {
           hasSendOnEnterEnabled && !hasPressedShift(e) && this.isFocused;
         if (shouldSendMessage) {
           e.preventDefault();
-          this.sendMessage();
+          this.onSendReply();
         }
       } else if (hasPressedCommandPlusKKey(e)) {
         this.openCommandBar();
@@ -497,6 +509,12 @@ export default {
     toggleEnterToSend(enterToSendEnabled) {
       this.updateUISettings({ enter_to_send_enabled: enterToSendEnabled });
     },
+    openWhatsappTemplateModal() {
+      this.showWhatsAppTemplatesModal = true;
+    },
+    hideWhatsappTemplatesModal() {
+      this.showWhatsAppTemplatesModal = false;
+    },
     onClickSelfAssign() {
       const {
         account_id,
@@ -520,7 +538,7 @@ export default {
       };
       this.assignedAgent = selfAssign;
     },
-    async sendMessage() {
+    async onSendReply() {
       if (this.isReplyButtonDisabled) {
         return;
       }
@@ -531,22 +549,31 @@ export default {
         }
         const messagePayload = this.getMessagePayload(newMessage);
         this.clearMessage();
-        try {
-          await this.$store.dispatch(
-            'createPendingMessageAndSend',
-            messagePayload
-          );
-          bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
-        } catch (error) {
-          const errorMessage =
-            error?.response?.data?.error ||
-            this.$t('CONVERSATION.MESSAGE_ERROR');
-          this.showAlert(errorMessage);
-        }
+        this.sendMessage(messagePayload);
         this.hideEmojiPicker();
         this.$emit('update:popoutReplyBox', false);
       }
     },
+    async sendMessage(messagePayload) {
+      try {
+        await this.$store.dispatch(
+          'createPendingMessageAndSend',
+          messagePayload
+        );
+        bus.$emit(BUS_EVENTS.SCROLL_TO_MESSAGE);
+      } catch (error) {
+        const errorMessage =
+          error?.response?.data?.error || this.$t('CONVERSATION.MESSAGE_ERROR');
+        this.showAlert(errorMessage);
+      }
+    },
+    async onSendWhatsAppReply(messagePayload) {
+      this.sendMessage({
+        conversationId: this.currentChat.id,
+        ...messagePayload,
+      });
+      this.hideWhatsappTemplatesModal();
+    },
     replaceText(message) {
       setTimeout(() => {
         this.message = message;
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
new file mode 100644
index 000000000..1c888408b
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/Modal.vue
@@ -0,0 +1,76 @@
+<template>
+  <woot-modal :show.sync="show" :on-close="onClose" size="modal-big">
+    <woot-modal-header
+      :header-title="$t('WHATSAPP_TEMPLATES.MODAL.TITLE')"
+      :header-content="modalHeaderContent"
+    />
+    <div class="row modal-content">
+      <templates-picker
+        v-if="!selectedWaTemplate"
+        :inbox-id="inboxId"
+        @onSelect="pickTemplate"
+      />
+      <template-parser
+        v-else
+        :template="selectedWaTemplate"
+        @resetTemplate="onResetTemplate"
+        @sendMessage="onSendMessage"
+      />
+    </div>
+  </woot-modal>
+</template>
+
+<script>
+import TemplatesPicker from './TemplatesPicker.vue';
+import TemplateParser from './TemplateParser.vue';
+export default {
+  components: {
+    TemplatesPicker,
+    TemplateParser,
+  },
+  props: {
+    inboxId: {
+      type: Number,
+      default: undefined,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      selectedWaTemplate: null,
+    };
+  },
+  computed: {
+    modalHeaderContent() {
+      return this.selectedWaTemplate
+        ? this.$t('WHATSAPP_TEMPLATES.MODAL.TEMPLATE_SELECTED_SUBTITLE', {
+            templateName: this.selectedWaTemplate.name,
+          })
+        : this.$t('WHATSAPP_TEMPLATES.MODAL.SUBTITLE');
+    },
+  },
+  methods: {
+    pickTemplate(template) {
+      this.selectedWaTemplate = template;
+    },
+    onResetTemplate() {
+      this.selectedWaTemplate = null;
+    },
+    onSendMessage(message) {
+      this.$emit('on-send', message);
+    },
+    onClose() {
+      this.$emit('cancel');
+    },
+  },
+};
+</script>
+
+<style scoped>
+.modal-content {
+  padding: 2.5rem 3.2rem;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
new file mode 100644
index 000000000..7fc8ac431
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
@@ -0,0 +1,183 @@
+<template>
+  <div class="medium-12 columns">
+    <textarea
+      v-model="processedString"
+      rows="4"
+      readonly
+      class="template-input"
+    ></textarea>
+    <div>
+      <div class="template__variables-container">
+        <p class="variables-label">
+          {{ $t('WHATSAPP_TEMPLATES.PARSER.VARIABLES_LABEL') }}
+        </p>
+        <div
+          v-for="(variable, key) in processedParams"
+          :key="key"
+          class="template__variable-item"
+        >
+          <span class="variable-label">
+            {{ key }}
+          </span>
+          <woot-input
+            v-model="processedParams[key]"
+            type="text"
+            class="variable-input"
+            :styles="{ marginBottom: 0 }"
+          />
+        </div>
+        <p v-if="showRequiredMessage" class="error">
+          {{ $t('WHATSAPP_TEMPLATES.PARSER.FORM_ERROR_MESSAGE') }}
+        </p>
+      </div>
+    </div>
+    <footer>
+      <woot-button variant="smooth" @click="$emit('resetTemplate')">
+        {{ $t('WHATSAPP_TEMPLATES.PARSER.GO_BACK_LABEL') }}
+      </woot-button>
+      <woot-button @click="sendMessage">
+        {{ $t('WHATSAPP_TEMPLATES.PARSER.SEND_MESSAGE_LABEL') }}
+      </woot-button>
+    </footer>
+  </div>
+</template>
+
+<script>
+import { required } from 'vuelidate/lib/validators';
+
+const allKeysRequired = value => {
+  const keys = Object.keys(value);
+  return keys.every(key => value[key]);
+};
+export default {
+  props: {
+    template: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  validations: {
+    processedParams: {
+      required,
+      allKeysRequired,
+    },
+  },
+  data() {
+    return {
+      message: this.template.message,
+      processedParams: {},
+      showRequiredMessage: false,
+    };
+  },
+  computed: {
+    variables() {
+      const variables = this.templateString.match(/{{([^}]+)}}/g);
+      return variables;
+    },
+    templateString() {
+      return this.template.components.find(
+        component => component.type === 'BODY'
+      ).text;
+    },
+    processedString() {
+      return this.templateString.replace(/{{([^}]+)}}/g, (match, variable) => {
+        const variableKey = this.processVariable(variable);
+        return this.processedParams[variableKey] || `{{${variable}}}`;
+      });
+    },
+  },
+  mounted() {
+    this.generateVariables();
+  },
+  methods: {
+    sendMessage() {
+      this.$v.$touch();
+      if (this.$v.$invalid) {
+        this.showRequiredMessage = true;
+        return;
+      }
+      const message = {
+        message: this.processedString,
+        templateParams: {
+          name: this.template.name,
+          category: this.template.category,
+          language: this.template.language,
+          namespace: this.template.namespace,
+          processed_params: this.processedParams,
+        },
+      };
+      this.$emit('sendMessage', message);
+    },
+    processVariable(str) {
+      return str.replace(/{{|}}/g, '');
+    },
+    generateVariables() {
+      const templateString = this.template.components.find(
+        component => component.type === 'BODY'
+      ).text;
+      const variables = templateString.match(/{{([^}]+)}}/g).map(variable => {
+        return this.processVariable(variable);
+      });
+      this.processedParams = variables.reduce((acc, variable) => {
+        acc[variable] = '';
+        return acc;
+      }, {});
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.template__variables-container {
+  padding: var(--space-one);
+}
+
+.variables-label {
+  font-size: var(--font-size-small);
+  font-weight: var(--font-weight-bold);
+  margin-bottom: var(--space-one);
+}
+
+.template__variable-item {
+  align-items: center;
+  display: flex;
+  margin-bottom: var(--space-one);
+
+  .label {
+    font-size: var(--font-size-mini);
+  }
+
+  .variable-input {
+    flex: 1;
+    font-size: var(--font-size-small);
+    margin-left: var(--space-one);
+  }
+
+  .variable-label {
+    background-color: var(--s-75);
+    border-radius: var(--border-radius-normal);
+    display: inline-block;
+    font-size: var(--font-size-mini);
+    padding: var(--space-one) var(--space-medium);
+  }
+}
+
+footer {
+  display: flex;
+  justify-content: flex-end;
+
+  button {
+    margin-left: var(--space-one);
+  }
+}
+.error {
+  background-color: var(--r-100);
+  border-radius: var(--border-radius-normal);
+  color: var(--r-800);
+  padding: var(--space-one);
+  text-align: center;
+}
+.template-input {
+  background-color: var(--s-25);
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
new file mode 100644
index 000000000..b9e9ba71c
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue
@@ -0,0 +1,163 @@
+<template>
+  <div class="medium-12 columns">
+    <div class="templates__list-search">
+      <fluent-icon icon="search" class="search-icon" size="16" />
+      <input
+        ref="search"
+        v-model="query"
+        type="search"
+        :placeholder="$t('WHATSAPP_TEMPLATES.PICKER.SEARCH_PLACEHOLDER')"
+        class="templates__search-input"
+      />
+    </div>
+    <div class="template__list-container">
+      <div v-for="(template, i) in filteredTemplateMessages" :key="template.id">
+        <button
+          class="template__list-item"
+          @click="$emit('onSelect', template)"
+        >
+          <div>
+            <div class="flex-between">
+              <p class="label-title">
+                {{ template.name }}
+              </p>
+              <span class="label-lang label">
+                {{ $t('WHATSAPP_TEMPLATES.PICKER.LABELS.LANGUAGE') }} :
+                {{ template.language }}
+              </span>
+            </div>
+            <div>
+              <p class="strong">
+                {{ $t('WHATSAPP_TEMPLATES.PICKER.LABELS.TEMPLATE_BODY') }}
+              </p>
+              <p class="label-body">{{ getTemplatebody(template) }}</p>
+            </div>
+            <div class="label-category">
+              <p class="strong">
+                {{ $t('WHATSAPP_TEMPLATES.PICKER.LABELS.CATEGORY') }}
+              </p>
+              <p>{{ template.category }}</p>
+            </div>
+          </div>
+        </button>
+        <hr v-if="i != filteredTemplateMessages.length - 1" :key="`hr-${i}`" />
+      </div>
+      <div v-if="!filteredTemplateMessages.length">
+        <p>
+          {{ $t('WHATSAPP_TEMPLATES.PICKER.NO_TEMPLATES_FOUND') }}
+          <strong>{{ query }}</strong>
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    inboxId: {
+      type: Number,
+      default: undefined,
+    },
+  },
+  data() {
+    return {
+      query: '',
+    };
+  },
+  computed: {
+    whatsAppTemplateMessages() {
+      return this.$store.getters['inboxes/getWhatsAppTemplates'](this.inboxId);
+    },
+    filteredTemplateMessages() {
+      return this.whatsAppTemplateMessages.filter(template =>
+        template.name.toLowerCase().includes(this.query.toLowerCase())
+      );
+    },
+  },
+  methods: {
+    getTemplatebody(template) {
+      return template.components.find(component => component.type === 'BODY')
+        .text;
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.flex-between {
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: var(--space-one);
+}
+
+.templates__list-search {
+  align-items: center;
+  background-color: var(--s-25);
+  border-radius: var(--border-radius-medium);
+  border: 1px solid var(--s-100);
+  display: flex;
+  margin-bottom: var(--space-one);
+  padding: 0 var(--space-one);
+
+  .search-icon {
+    color: var(--s-400);
+  }
+
+  .templates__search-input {
+    background-color: transparent;
+    border: var(--space-large);
+    font-size: var(--font-size-mini);
+    height: unset;
+    margin: var(--space-zero);
+  }
+}
+.template__list-container {
+  background-color: var(--s-25);
+  border-radius: var(--border-radius-medium);
+  max-height: 30rem;
+  overflow-y: auto;
+  padding: var(--space-one);
+
+  .template__list-item {
+    border-radius: var(--border-radius-medium);
+    cursor: pointer;
+    display: block;
+    padding: var(--space-one);
+    text-align: left;
+    width: 100%;
+
+    &:hover {
+      background-color: var(--w-50);
+    }
+
+    .label-title {
+      font-size: var(--font-size-small);
+    }
+
+    .label-category {
+      margin-top: var(--space-two);
+
+      span {
+        font-size: var(--font-size-small);
+        font-weight: var(--font-weight-bold);
+      }
+    }
+
+    .label-body {
+      font-family: monospace;
+    }
+  }
+}
+
+.strong {
+  font-size: var(--font-size-mini);
+  font-weight: var(--font-weight-bold);
+}
+
+hr {
+  border-bottom: 1px solid var(--s-100);
+  margin: var(--space-one) auto;
+  max-width: 95%;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
index c1c3440bc..7f454fa20 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Actions.vue
@@ -7,7 +7,7 @@
       <fluent-icon
         v-tooltip.top-start="$t('CHAT_LIST.SENT')"
         icon="checkmark"
-        size="16"
+        size="14"
       />
     </span>
     <fluent-icon
@@ -165,7 +165,11 @@ export default {
       return `https://www.instagram.com/stories/${storySender}/${storyId}`;
     },
     showSentIndicator() {
-      return this.isOutgoing && this.sourceId && this.isAnEmailChannel;
+      return (
+        this.isOutgoing &&
+        this.sourceId &&
+        (this.isAnEmailChannel || this.isAWhatsappChannel)
+      );
     },
   },
   methods: {
diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index 09aba7f2f..f2c8044cd 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -6,6 +6,7 @@
       :type="type"
       :placeholder="placeholder"
       :readonly="readonly"
+      :style="styles"
       @input="onChange"
       @blur="onBlur"
     />
@@ -47,6 +48,10 @@ export default {
       type: Boolean,
       deafaut: false,
     },
+    styles: {
+      type: Object,
+      default: () => {},
+    },
   },
   methods: {
     onChange(e) {
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index b21009322..d49420335 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -21,6 +21,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 import { default as _bulkActions } from './bulkActions.json';
 
 export default {
@@ -47,5 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
   ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/en/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/en/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/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/routes/dashboard/conversation/contact/ConversationForm.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
index f2d262644..9dda5c02c 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/ConversationForm.vue
@@ -1,12 +1,12 @@
 <template>
-  <form class="conversation--form" @submit.prevent="handleSubmit">
+  <form class="conversation--form" @submit.prevent="onFormSubmit">
     <div v-if="showNoInboxAlert" class="callout warning">
       <p>
         {{ $t('NEW_CONVERSATION.NO_INBOX') }}
       </p>
     </div>
     <div v-else>
-      <div class="row">
+      <div class="row gutter-small">
         <div class="columns">
           <label :class="{ error: $v.targetInbox.$error }">
             {{ $t('NEW_CONVERSATION.FORM.INBOX.LABEL') }}
@@ -88,6 +88,12 @@
               </label>
             </label>
           </div>
+          <whatsapp-templates
+            v-else-if="hasWhatsappTemplates"
+            :inbox-id="selectedInbox.inbox.id"
+            @on-select-template="toggleWaTemplate"
+            @on-send="onSendWhatsAppReply"
+          />
           <label v-else :class="{ error: $v.message.$error }">
             {{ $t('NEW_CONVERSATION.FORM.MESSAGE.LABEL') }}
             <textarea
@@ -104,7 +110,7 @@
         </div>
       </div>
     </div>
-    <div class="modal-footer">
+    <div v-if="!hasWhatsappTemplates" class="modal-footer">
       <button class="button clear" @click.prevent="onCancel">
         {{ $t('NEW_CONVERSATION.FORM.CANCEL') }}
       </button>
@@ -121,7 +127,7 @@ import Thumbnail from 'dashboard/components/widgets/Thumbnail';
 import WootMessageEditor from 'dashboard/components/widgets/WootWriter/Editor';
 import ReplyEmailHead from 'dashboard/components/widgets/conversation/ReplyEmailHead';
 import CannedResponse from 'dashboard/components/widgets/conversation/CannedResponse.vue';
-
+import WhatsappTemplates from './WhatsappTemplates.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 import { INBOX_TYPES } from 'shared/mixins/inboxMixin';
 import { ExceptionWithMessage } from 'shared/helpers/CustomErrors';
@@ -133,6 +139,7 @@ export default {
     WootMessageEditor,
     ReplyEmailHead,
     CannedResponse,
+    WhatsappTemplates,
   },
   mixins: [alertMixin],
   props: {
@@ -155,6 +162,7 @@ export default {
       selectedInbox: '',
       bccEmails: '',
       ccEmails: '',
+      whatsappTemplateSelected: false,
     };
   },
   validations: {
@@ -174,7 +182,7 @@ export default {
       conversationsUiFlags: 'contactConversations/getUIFlags',
       currentUser: 'getCurrentUser',
     }),
-    getNewConversation() {
+    emailMessagePayload() {
       const payload = {
         inboxId: this.targetInbox.inbox.id,
         sourceId: this.targetInbox.source_id,
@@ -194,7 +202,7 @@ export default {
     },
     targetInbox: {
       get() {
-        return this.selectedInbox || '';
+        return this.selectedInbox || {};
       },
       set(value) {
         this.selectedInbox = value;
@@ -221,6 +229,9 @@ export default {
         this.selectedInbox.inbox.channel_type === INBOX_TYPES.WEB
       );
     },
+    hasWhatsappTemplates() {
+      return !!this.selectedInbox.inbox?.message_templates;
+    },
   },
   watch: {
     message(value) {
@@ -243,13 +254,30 @@ export default {
     onSuccess() {
       this.$emit('success');
     },
-    async handleSubmit() {
+    replaceTextWithCannedResponse(message) {
+      setTimeout(() => {
+        this.message = message;
+      }, 50);
+    },
+    prepareWhatsAppMessagePayload({ message: content, templateParams }) {
+      const payload = {
+        inboxId: this.targetInbox.inbox.id,
+        sourceId: this.targetInbox.source_id,
+        contactId: this.contact.id,
+        message: { content, templateParams },
+        assigneeId: this.currentUser.id,
+      };
+      return payload;
+    },
+    onFormSubmit() {
       this.$v.$touch();
       if (this.$v.$invalid) {
         return;
       }
+      this.createConversation(this.emailMessagePayload);
+    },
+    async createConversation(payload) {
       try {
-        const payload = this.getNewConversation;
         const data = await this.onSubmit(payload);
         const action = {
           type: 'link',
@@ -269,10 +297,13 @@ export default {
         }
       }
     },
-    replaceTextWithCannedResponse(message) {
-      setTimeout(() => {
-        this.message = message;
-      }, 50);
+
+    toggleWaTemplate(val) {
+      this.whatsappTemplateSelected = val;
+    },
+    async onSendWhatsAppReply(messagePayload) {
+      const payload = this.prepareWhatsAppMessagePayload(messagePayload);
+      await this.createConversation(payload);
     },
   },
 };
@@ -321,4 +352,7 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.row.gutter-small {
+  gap: var(--space-small);
+}
 </style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/contact/WhatsappTemplates.vue b/app/javascript/dashboard/routes/dashboard/conversation/contact/WhatsappTemplates.vue
new file mode 100644
index 000000000..f5f4c9817
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/contact/WhatsappTemplates.vue
@@ -0,0 +1,59 @@
+<template>
+  <div class="row">
+    <templates-picker
+      v-if="!selectedWaTemplate"
+      :inbox-id="inboxId"
+      @onSelect="pickTemplate"
+    />
+    <template-parser
+      v-else
+      :template="selectedWaTemplate"
+      @resetTemplate="onResetTemplate"
+      @sendMessage="onSendMessage"
+    />
+  </div>
+</template>
+
+<script>
+import TemplatesPicker from 'dashboard/components/widgets/conversation/WhatsappTemplates/TemplatesPicker.vue';
+import TemplateParser from 'dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue';
+export default {
+  components: {
+    TemplatesPicker,
+    TemplateParser,
+  },
+  props: {
+    inboxId: {
+      type: Number,
+      default: undefined,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      selectedWaTemplate: null,
+    };
+  },
+  methods: {
+    pickTemplate(template) {
+      this.$emit('pickTemplate', true);
+      this.selectedWaTemplate = template;
+    },
+    onResetTemplate() {
+      this.$emit('pickTemplate', false);
+      this.selectedWaTemplate = null;
+    },
+    onSendMessage(message) {
+      this.$emit('on-send', message);
+    },
+    onClose() {
+      this.$emit('cancel');
+    },
+  },
+};
+</script>
+
+<style></style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 344ea218c..97cd3c294 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -426,7 +426,7 @@ export default {
       return this.$store.getters['inboxes/getInbox'](this.currentInboxId);
     },
     inboxName() {
-      if (this.isATwilioSMSChannel || this.isATwilioWhatsappChannel) {
+      if (this.isATwilioSMSChannel || this.isAWhatsappChannel) {
         return `${this.inbox.name} (${this.inbox.phone_number})`;
       }
       if (this.isAnEmailChannel) {
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index a180a5b80..0795d17af 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -47,6 +47,20 @@ export const getters = {
   getInboxes($state) {
     return $state.records;
   },
+  getWhatsAppTemplates: $state => inboxId => {
+    const [inbox] = $state.records.filter(
+      record => record.id === Number(inboxId)
+    );
+    // filtering out the whatsapp templates with media
+    if (inbox.message_templates) {
+      return inbox.message_templates.filter(template => {
+        return !template.components.some(
+          i => i.format === 'IMAGE' || i.format === 'VIDEO'
+        );
+      });
+    }
+    return [];
+  },
   getNewConversationInboxes($state) {
     return $state.records.filter(inbox => {
       const {
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index d235ffdec..1f4a35b2f 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -121,6 +121,7 @@
   "video-outline": "M13.75 4.5A3.25 3.25 0 0 1 17 7.75v.173l3.864-2.318A.75.75 0 0 1 22 6.248V17.75a.75.75 0 0 1-1.136.643L17 16.075v.175a3.25 3.25 0 0 1-3.25 3.25h-8.5A3.25 3.25 0 0 1 2 16.25v-8.5A3.25 3.25 0 0 1 5.25 4.5h8.5Zm0 1.5h-8.5A1.75 1.75 0 0 0 3.5 7.75v8.5c0 .966.784 1.75 1.75 1.75h8.5a1.75 1.75 0 0 0 1.75-1.75v-8.5A1.75 1.75 0 0 0 13.75 6Zm6.75 1.573L17 9.674v4.651l3.5 2.1V7.573Z",
   "warning-outline": "M10.91 2.782a2.25 2.25 0 0 1 2.975.74l.083.138 7.759 14.009a2.25 2.25 0 0 1-1.814 3.334l-.154.006H4.243a2.25 2.25 0 0 1-2.041-3.197l.072-.143L10.031 3.66a2.25 2.25 0 0 1 .878-.878Zm9.505 15.613-7.76-14.008a.75.75 0 0 0-1.254-.088l-.057.088-7.757 14.008a.75.75 0 0 0 .561 1.108l.095.006h15.516a.75.75 0 0 0 .696-1.028l-.04-.086-7.76-14.008 7.76 14.008ZM12 16.002a.999.999 0 1 1 0 1.997.999.999 0 0 1 0-1.997ZM11.995 8.5a.75.75 0 0 1 .744.647l.007.102.004 4.502a.75.75 0 0 1-1.494.103l-.006-.102-.004-4.502a.75.75 0 0 1 .75-.75Z",
   "wifi-off-outline": "m12.858 14.273 7.434 7.434a1 1 0 0 0 1.414-1.414l-17.999-18a1 1 0 1 0-1.414 1.414L5.39 6.804c-.643.429-1.254.927-1.821 1.495a12.382 12.382 0 0 0-1.39 1.683 1 1 0 0 0 1.644 1.14c.363-.524.761-1.01 1.16-1.41a9.94 9.94 0 0 1 1.855-1.46L7.99 9.405a8.14 8.14 0 0 0-3.203 3.377 1 1 0 0 0 1.784.903 6.08 6.08 0 0 1 1.133-1.563 6.116 6.116 0 0 1 1.77-1.234l1.407 1.407A5.208 5.208 0 0 0 8.336 13.7a5.25 5.25 0 0 0-1.09 1.612 1 1 0 0 0 1.832.802c.167-.381.394-.722.672-1a3.23 3.23 0 0 1 3.108-.841Zm-1.332-5.93 2.228 2.229a6.1 6.1 0 0 1 2.616 1.55c.444.444.837.995 1.137 1.582a1 1 0 1 0 1.78-.911 8.353 8.353 0 0 0-1.503-2.085 8.108 8.108 0 0 0-6.258-2.365ZM8.51 5.327l1.651 1.651a9.904 9.904 0 0 1 10.016 4.148 1 1 0 1 0 1.646-1.136A11.912 11.912 0 0 0 8.51 5.327Zm4.552 11.114a1.501 1.501 0 1 1-2.123 2.123 1.501 1.501 0 0 1 2.123-2.123Z",
+  "whatsapp-outline": "M19.05 4.91A9.816 9.816 0 0 0 12.04 2c-5.46 0-9.91 4.45-9.91 9.91c0 1.75.46 3.45 1.32 4.95L2.05 22l5.25-1.38c1.45.79 3.08 1.21 4.74 1.21c5.46 0 9.91-4.45 9.91-9.91c0-2.65-1.03-5.14-2.9-7.01zm-7.01 15.24c-1.48 0-2.93-.4-4.2-1.15l-.3-.18l-3.12.82l.83-3.04l-.2-.31a8.264 8.264 0 0 1-1.26-4.38c0-4.54 3.7-8.24 8.24-8.24c2.2 0 4.27.86 5.82 2.42a8.183 8.183 0 0 1 2.41 5.83c.02 4.54-3.68 8.23-8.22 8.23zm4.52-6.16c-.25-.12-1.47-.72-1.69-.81c-.23-.08-.39-.12-.56.12c-.17.25-.64.81-.78.97c-.14.17-.29.19-.54.06c-.25-.12-1.05-.39-1.99-1.23c-.74-.66-1.23-1.47-1.38-1.72c-.14-.25-.02-.38.11-.51c.11-.11.25-.29.37-.43s.17-.25.25-.41c.08-.17.04-.31-.02-.43s-.56-1.34-.76-1.84c-.2-.48-.41-.42-.56-.43h-.48c-.17 0-.43.06-.66.31c-.22.25-.86.85-.86 2.07c0 1.22.89 2.4 1.01 2.56c.12.17 1.75 2.67 4.23 3.74c.59.26 1.05.41 1.41.52c.59.19 1.13.16 1.56.1c.48-.07 1.47-.6 1.67-1.18c.21-.58.21-1.07.14-1.18s-.22-.16-.47-.28z",
   "brand-facebook-outline": "M24 12.073c0-6.627-5.373-12-12-12s-12 5.373-12 12c0 5.99 4.388 10.954 10.125 11.854v-8.385H7.078v-3.47h3.047V9.43c0-3.007 1.792-4.669 4.533-4.669 1.312 0 2.686.235 2.686.235v2.953H15.83c-1.491 0-1.956.925-1.956 1.874v2.25h3.328l-.532 3.47h-2.796v8.385C19.612 23.027 24 18.062 24 12.073z",
   "brand-line-outline": "M19.365 9.863c.349 0 .63.285.63.631 0 .345-.281.63-.63.63H17.61v1.125h1.755c.349 0 .63.283.63.63 0 .344-.281.629-.63.629h-2.386c-.345 0-.627-.285-.627-.629V8.108c0-.345.282-.63.63-.63h2.386c.346 0 .627.285.627.63 0 .349-.281.63-.63.63H17.61v1.125h1.755zm-3.855 3.016c0 .27-.174.51-.432.596-.064.021-.133.031-.199.031-.211 0-.391-.09-.51-.25l-2.443-3.317v2.94c0 .344-.279.629-.631.629-.346 0-.626-.285-.626-.629V8.108c0-.27.173-.51.43-.595.06-.023.136-.033.194-.033.195 0 .375.104.495.254l2.462 3.33V8.108c0-.345.282-.63.63-.63.345 0 .63.285.63.63v4.771zm-5.741 0c0 .344-.282.629-.631.629-.345 0-.627-.285-.627-.629V8.108c0-.345.282-.63.63-.63.346 0 .628.285.628.63v4.771zm-2.466.629H4.917c-.345 0-.63-.285-.63-.629V8.108c0-.345.285-.63.63-.63.348 0 .63.285.63.63v4.141h1.756c.348 0 .629.283.629.63 0 .344-.282.629-.629.629M24 10.314C24 4.943 18.615.572 12 .572S0 4.943 0 10.314c0 4.811 4.27 8.842 10.035 9.608.391.082.923.258 1.058.59.12.301.079.766.038 1.08l-.164 1.02c-.045.301-.24 1.186 1.049.645 1.291-.539 6.916-4.078 9.436-6.975C23.176 14.393 24 12.458 24 10.314",
   "brand-linkedin-outline": "M20.447 20.452h-3.554v-5.569c0-1.328-.027-3.037-1.852-3.037-1.853 0-2.136 1.445-2.136 2.939v5.667H9.351V9h3.414v1.561h.046c.477-.9 1.637-1.85 3.37-1.85 3.601 0 4.267 2.37 4.267 5.455v6.286zM5.337 7.433c-1.144 0-2.063-.926-2.063-2.065 0-1.138.92-2.063 2.063-2.063 1.14 0 2.064.925 2.064 2.063 0 1.139-.925 2.065-2.064 2.065zm1.782 13.019H3.555V9h3.564v11.452zM22.225 0H1.771C.792 0 0 .774 0 1.729v20.542C0 23.227.792 24 1.771 24h20.451C23.2 24 24 23.227 24 22.271V1.729C24 .774 23.2 0 22.222 0h.003z",
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 59ede2a8d..149fd7144 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -61,9 +61,13 @@ class Channel::Whatsapp < ApplicationRecord
     true
   end
 
-  def message_templates
-    sync_templates
-    super
+  def sync_templates
+    # to prevent too many api calls
+    last_updated = message_templates_last_updated || 1.day.ago
+    return if Time.current < (last_updated + 12.hours)
+
+    response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
+    update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
   end
 
   private
@@ -79,7 +83,7 @@ class Channel::Whatsapp < ApplicationRecord
       }.to_json
     )
 
-    response.success? ? response['messages'].first['id'] : nil
+    process_response(response)
   end
 
   def send_attachment_message(phone_number, message)
@@ -99,7 +103,7 @@ class Channel::Whatsapp < ApplicationRecord
       }.to_json
     )
 
-    response.success? ? response['messages'].first['id'] : nil
+    process_response(response)
   end
 
   def send_template_message(phone_number, template_info)
@@ -113,7 +117,16 @@ class Channel::Whatsapp < ApplicationRecord
       }.to_json
     )
 
-    response.success? ? response['messages'].first['id'] : nil
+    process_response(response)
+  end
+
+  def process_response(response)
+    if response.success?
+      response['messages'].first['id']
+    else
+      Rails.logger.error response.body
+      nil
+    end
   end
 
   def template_body_parameters(template_info)
@@ -131,15 +144,6 @@ class Channel::Whatsapp < ApplicationRecord
     }
   end
 
-  def sync_templates
-    # to prevent too many api calls
-    last_updated = message_templates_last_updated || 1.day.ago
-    return if Time.current < (last_updated + 12.hours)
-
-    response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
-    update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
-  end
-
   # Extract later into provider Service
   def validate_provider_config
     response = HTTParty.post(
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 2d7077fa9..2801fa834 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -92,6 +92,10 @@ class Inbox < ApplicationRecord
     channel_type == 'Channel::TwitterProfile'
   end
 
+  def whatsapp?
+    channel_type == 'Channel::Whatsapp'
+  end
+
   def inbox_type
     channel.name
   end
diff --git a/app/services/whatsapp/send_on_whatsapp_service.rb b/app/services/whatsapp/send_on_whatsapp_service.rb
index 2cc96f041..be81c332b 100644
--- a/app/services/whatsapp/send_on_whatsapp_service.rb
+++ b/app/services/whatsapp/send_on_whatsapp_service.rb
@@ -6,16 +6,18 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   end
 
   def perform_reply
-    # can reply checks if 24 hour limit has passed.
-    if message.conversation.can_reply?
-      send_on_whatsapp
-    else
+    should_send_template_message = template_params.present? || !message.conversation.can_reply?
+    if should_send_template_message
       send_template_message
+    else
+      send_session_message
     end
   end
 
   def send_template_message
+    channel.sync_templates
     name, namespace, lang_code, processed_parameters = processable_channel_message_template
+
     return if name.blank?
 
     message_id = channel.send_template(message.conversation.contact_inbox.source_id, {
@@ -28,6 +30,16 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   end
 
   def processable_channel_message_template
+    if template_params.present?
+      return [
+        template_params['name'],
+        template_params['namespace'],
+        template_params['language'],
+        template_params['processed_params'].map { |_, value| { type: 'text', text: value } }
+      ]
+    end
+
+    # Delete the following logic once the update for template_params is stable
     # see if we can match the message content to a template
     # An example template may look like "Your package has been shipped. It will be delivered in {{1}} business days.
     # We want to iterate over these templates with our message body and see if we can fit it to any of the templates
@@ -78,8 +90,12 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
     template['components'].find { |obj| obj['type'] == 'BODY' && obj.key?('text') }
   end
 
-  def send_on_whatsapp
+  def send_session_message
     message_id = channel.send_message(message.conversation.contact_inbox.source_id, message)
     message.update!(source_id: message_id) if message_id.present?
   end
+
+  def template_params
+    message.additional_attributes && message.additional_attributes['template_params']
+  end
 end
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 17bde23e0..7b0839ccc 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -78,3 +78,6 @@ if resource.api?
   json.webhook_url resource.channel.try(:webhook_url)
   json.inbox_identifier resource.channel.try(:identifier)
 end
+
+### WhatsApp Channel
+json.message_templates resource.channel.try(:message_templates) if resource.whatsapp?
diff --git a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
index 29c583031..b08f25931 100644
--- a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+++ b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
@@ -1,6 +1,13 @@
 require 'rails_helper'
 
 describe Whatsapp::SendOnWhatsappService do
+  template_params = {
+    name: 'sample_shipping_confirmation',
+    namespace: '23423423_2342423_324234234_2343224',
+    language: 'en_US',
+    processed_params: { '1' => '3' }
+  }
+
   describe '#perform' do
     before do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
@@ -54,6 +61,30 @@ describe Whatsapp::SendOnWhatsappService do
         expect(message.reload.source_id).to eq('123456789')
       end
 
+      it 'calls channel.send_template if template_params are present' do
+        message = create(:message, additional_attributes: { template_params: template_params },
+                                   content: 'Your package will be delivered in 3 business days.', conversation: conversation, message_type: :outgoing)
+        allow(HTTParty).to receive(:post).and_return(whatsapp_request)
+        allow(whatsapp_request).to receive(:success?).and_return(true)
+        allow(whatsapp_request).to receive(:[]).with('messages').and_return([{ 'id' => '123456789' }])
+        expect(HTTParty).to receive(:post).with(
+          'https://waba.360dialog.io/v1/messages',
+          headers: { 'D360-API-KEY' => 'test_key', 'Content-Type' => 'application/json' },
+          body: {
+            to: '123456789',
+            template: {
+              name: 'sample_shipping_confirmation',
+              namespace: '23423423_2342423_324234234_2343224',
+              language: { 'policy': 'deterministic', 'code': 'en_US' },
+              components: [{ 'type': 'body', 'parameters': [{ 'type': 'text', 'text': '3' }] }]
+            },
+            type: 'template'
+          }.to_json
+        )
+        described_class.new(message: message).perform
+        expect(message.reload.source_id).to eq('123456789')
+      end
+
       it 'calls channel.send_template when template has regexp characters' do
         message = create(
           :message,

From 772d92a4d3706235578e2cbe88058bb389c05c2d Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 7 Jun 2022 17:50:51 +0530
Subject: [PATCH 148/177] fix: Facebook reauthorization mailer (#4695)

---
 app/builders/messages/facebook/message_builder.rb |  2 +-
 .../layout/sidebarComponents/Secondary.vue        |  1 +
 .../sidebarComponents/SecondaryChildNavItem.vue   | 12 ++++++++++++
 .../layout/sidebarComponents/SecondaryNavItem.vue | 15 ++++++++++++++-
 app/javascript/dashboard/helper/inbox.js          |  7 +++++++
 .../dashboard/helper/specs/inbox.spec.js          | 10 +++++++++-
 .../dashboard/i18n/locale/en/settings.json        |  3 ++-
 .../messages/facebook/message_builder_spec.rb     |  2 +-
 spec/models/channel/facebook_page_spec.rb         |  2 ++
 9 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index 3b3248ed1..f19d3c8b7 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -27,7 +27,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
     end
     ensure_contact_avatar
   rescue Koala::Facebook::AuthenticationError
-    Rails.logger.error "Facebook Authorization expired for Inbox #{@inbox.id}"
+    @inbox.channel.authorization_error!
   rescue StandardError => e
     ChatwootExceptionTracker.new(e, account: @inbox.account).capture_exception
     true
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
index 724576347..4b19a3ec3 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
@@ -95,6 +95,7 @@ export default {
             ),
             type: inbox.channel_type,
             phoneNumber: inbox.phone_number,
+            reauthorizationRequired: inbox.reauthorization_required,
           }))
           .sort((a, b) =>
             a.label.toLowerCase() > b.label.toLowerCase() ? 1 : -1
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
index 7bf57df1a..4d2601774 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryChildNavItem.vue
@@ -30,6 +30,14 @@
         <span v-if="count" class="badge" :class="{ secondary: !isActive }">
           {{ count }}
         </span>
+        <span v-if="warningIcon" class="badge--icon">
+          <fluent-icon
+            v-tooltip.top-end="$t('SIDEBAR.FACEBOOK_REAUTHORIZE')"
+            class="inbox-icon"
+            :icon="warningIcon"
+            size="12"
+          />
+        </span>
       </a>
     </li>
   </router-link>
@@ -57,6 +65,10 @@ export default {
       type: String,
       default: '',
     },
+    warningIcon: {
+      type: String,
+      default: '',
+    },
     count: {
       type: String,
       default: '',
diff --git a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
index ffd8018d5..1fcde8948 100644
--- a/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
+++ b/app/javascript/dashboard/components/layout/sidebarComponents/SecondaryNavItem.vue
@@ -34,6 +34,7 @@
         :label-color="child.color"
         :should-truncate="child.truncateLabel"
         :icon="computedInboxClass(child)"
+        :warning-icon="computedInboxErrorClass(child)"
       />
       <router-link
         v-if="showItem(menuItem)"
@@ -63,7 +64,10 @@
 import { mapGetters } from 'vuex';
 
 import adminMixin from '../../../mixins/isAdmin';
-import { getInboxClassByType } from 'dashboard/helper/inbox';
+import {
+  getInboxClassByType,
+  getInboxWarningIconClass,
+} from 'dashboard/helper/inbox';
 
 import SecondaryChildNavItem from './SecondaryChildNavItem';
 
@@ -136,6 +140,15 @@ export default {
       const classByType = getInboxClassByType(type, phoneNumber);
       return classByType;
     },
+    computedInboxErrorClass(child) {
+      const { type, reauthorizationRequired } = child;
+      if (!type) return '';
+      const warningClass = getInboxWarningIconClass(
+        type,
+        reauthorizationRequired
+      );
+      return warningClass;
+    },
     newLinkClick(e, navigate) {
       if (this.menuItem.newLinkRouteName) {
         navigate(e);
diff --git a/app/javascript/dashboard/helper/inbox.js b/app/javascript/dashboard/helper/inbox.js
index 179550086..3f0eedbda 100644
--- a/app/javascript/dashboard/helper/inbox.js
+++ b/app/javascript/dashboard/helper/inbox.js
@@ -35,3 +35,10 @@ export const getInboxClassByType = (type, phoneNumber) => {
       return 'chat';
   }
 };
+
+export const getInboxWarningIconClass = (type, reauthorizationRequired) => {
+  if (type === INBOX_TYPES.FB && reauthorizationRequired) {
+    return 'warning';
+  }
+  return '';
+};
diff --git a/app/javascript/dashboard/helper/specs/inbox.spec.js b/app/javascript/dashboard/helper/specs/inbox.spec.js
index f6d6aa9f0..2db937be1 100644
--- a/app/javascript/dashboard/helper/specs/inbox.spec.js
+++ b/app/javascript/dashboard/helper/specs/inbox.spec.js
@@ -1,4 +1,4 @@
-import { getInboxClassByType } from '../inbox';
+import { getInboxClassByType, getInboxWarningIconClass } from '../inbox';
 
 describe('#Inbox Helpers', () => {
   describe('getInboxClassByType', () => {
@@ -34,4 +34,12 @@ describe('#Inbox Helpers', () => {
       expect(getInboxClassByType('Channel::Email')).toEqual('mail');
     });
   });
+
+  describe('getInboxWarningIconClass', () => {
+    it('should return correct class for warning', () => {
+      expect(getInboxWarningIconClass('Channel::FacebookPage', true)).toEqual(
+        'warning'
+      );
+    });
+  })
 });
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index e8709c62f..9299be2b5 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -185,7 +185,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/spec/builders/messages/facebook/message_builder_spec.rb b/spec/builders/messages/facebook/message_builder_spec.rb
index d928f99ee..bb08bd9b6 100644
--- a/spec/builders/messages/facebook/message_builder_spec.rb
+++ b/spec/builders/messages/facebook/message_builder_spec.rb
@@ -37,7 +37,7 @@ describe  ::Messages::Facebook::MessageBuilder do
       allow(fb_object).to receive(:get_object).and_raise(Koala::Facebook::AuthenticationError.new(500, 'Error validating access token'))
       message_builder
 
-      expect(facebook_channel.authorization_error_count).to eq(1)
+      expect(facebook_channel.authorization_error_count).to eq(2)
     end
   end
 end
diff --git a/spec/models/channel/facebook_page_spec.rb b/spec/models/channel/facebook_page_spec.rb
index 02baac4a1..f0f0e036e 100644
--- a/spec/models/channel/facebook_page_spec.rb
+++ b/spec/models/channel/facebook_page_spec.rb
@@ -22,9 +22,11 @@ RSpec.describe Channel::FacebookPage do
       it 'calls channel notifier mail for facebook' do
         admin_mailer = double
         mailer_double = double
+
         expect(AdministratorNotifications::ChannelNotificationsMailer).to receive(:with).and_return(admin_mailer)
         expect(admin_mailer).to receive(:facebook_disconnect).with(channel.inbox).and_return(mailer_double)
         expect(mailer_double).to receive(:deliver_later)
+
         channel.prompt_reauthorization!
       end
     end

From 635e544124a91f01c86244ea7ecb6350c706a52d Mon Sep 17 00:00:00 2001
From: Jordan Brough <jordan-brough@users.noreply.github.com>
Date: Tue, 7 Jun 2022 08:19:32 -0600
Subject: [PATCH 149/177] chore: Make "apk" commands consistent in Dockerfile
 (#4790)

* Make "apk" commands consistent in Dockerfile

1. Add "--no-cache" to some "apk" command that are missing it

* Remove "--update-cache" in Dockerfile

> As of Alpine Linux 3.3 there exists a new --no-cache option for apk. It allows
> users to install packages with an index that is updated and used on-the-fly and
> not cached locally
>
> This avoids the need to use --update-cache and remove /var/cache/apk/* when
> done installing packages.

https://github.com/gliderlabs/docker-alpine/blob/master/docs/usage.md
---
 docker/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 71a6dc72f..ca689a38b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,8 +15,7 @@ ENV RAILS_ENV ${RAILS_ENV}
 
 ENV BUNDLE_PATH="/gems"
 
-RUN apk update \
-  && apk add \
+RUN apk add --no-cache \
     openssl \
     tar \
     build-base \
@@ -85,7 +84,7 @@ ARG RAILS_ENV=production
 ENV RAILS_ENV ${RAILS_ENV}
 ENV BUNDLE_PATH="/gems"
 
-RUN apk add --update --no-cache \
+RUN apk add --no-cache \
     openssl \
     tzdata \
     postgresql-client \
@@ -94,7 +93,7 @@ RUN apk add --update --no-cache \
   && gem install bundler
 
 RUN if [ "$RAILS_ENV" != "production" ]; then \
-  apk add nodejs yarn; \
+  apk add --no-cache nodejs yarn; \
   fi
 
 COPY --from=pre-builder /gems/ /gems/

From 5d1729c7dd0b142f9a8ac6c047642647e5ee1cb6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 10:08:27 +0530
Subject: [PATCH 150/177] chore(deps): bump jmespath from 1.6.0 to 1.6.1
 (#4808)

Bumps [jmespath](https://github.com/trevorrowe/jmespath.rb) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/trevorrowe/jmespath.rb/releases)
- [Changelog](https://github.com/jmespath/jmespath.rb/blob/main/CHANGELOG.md)
- [Commits](https://github.com/trevorrowe/jmespath.rb/compare/v1.6.0...v1.6.1)

---
updated-dependencies:
- dependency-name: jmespath
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 92639c0d5..de9443f29 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -303,7 +303,7 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jmespath (1.6.0)
+    jmespath (1.6.1)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)

From a9e84ec182ef589439f1f77910ddc9801ae88109 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Jun 2022 18:07:45 +0530
Subject: [PATCH 151/177] chore: Update translations from Crowdin (#4772)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/helper/specs/inbox.spec.js      |  2 +-
 .../dashboard/i18n/locale/ar/bulkActions.json | 17 +++++
 .../i18n/locale/ar/conversation.json          |  2 +
 .../dashboard/i18n/locale/ar/index.js         |  4 ++
 .../dashboard/i18n/locale/ar/settings.json    |  5 +-
 .../i18n/locale/ar/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/bg/bulkActions.json | 17 +++++
 .../i18n/locale/bg/conversation.json          |  2 +
 .../dashboard/i18n/locale/bg/index.js         |  4 ++
 .../dashboard/i18n/locale/bg/settings.json    |  5 +-
 .../i18n/locale/bg/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ca/bulkActions.json | 17 +++++
 .../i18n/locale/ca/conversation.json          |  2 +
 .../dashboard/i18n/locale/ca/index.js         |  4 ++
 .../dashboard/i18n/locale/ca/settings.json    |  5 +-
 .../i18n/locale/ca/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/cs/bulkActions.json | 17 +++++
 .../i18n/locale/cs/conversation.json          |  2 +
 .../dashboard/i18n/locale/cs/index.js         |  4 ++
 .../dashboard/i18n/locale/cs/settings.json    |  5 +-
 .../i18n/locale/cs/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/da/bulkActions.json | 17 +++++
 .../i18n/locale/da/conversation.json          |  2 +
 .../dashboard/i18n/locale/da/index.js         |  4 ++
 .../dashboard/i18n/locale/da/settings.json    |  5 +-
 .../i18n/locale/da/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/de/bulkActions.json | 17 +++++
 .../i18n/locale/de/conversation.json          |  2 +
 .../dashboard/i18n/locale/de/index.js         |  4 ++
 .../dashboard/i18n/locale/de/settings.json    |  5 +-
 .../i18n/locale/de/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/el/bulkActions.json | 17 +++++
 .../i18n/locale/el/conversation.json          |  2 +
 .../dashboard/i18n/locale/el/index.js         |  4 ++
 .../dashboard/i18n/locale/el/settings.json    |  5 +-
 .../i18n/locale/el/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/en/index.js         |  2 +-
 .../dashboard/i18n/locale/es/bulkActions.json | 17 +++++
 .../i18n/locale/es/conversation.json          |  2 +
 .../dashboard/i18n/locale/es/index.js         |  4 ++
 .../dashboard/i18n/locale/es/settings.json    |  5 +-
 .../i18n/locale/es/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/fa/bulkActions.json | 17 +++++
 .../i18n/locale/fa/conversation.json          |  2 +
 .../dashboard/i18n/locale/fa/index.js         |  4 ++
 .../dashboard/i18n/locale/fa/settings.json    |  5 +-
 .../i18n/locale/fa/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/fi/bulkActions.json | 17 +++++
 .../i18n/locale/fi/conversation.json          |  2 +
 .../dashboard/i18n/locale/fi/index.js         |  4 ++
 .../dashboard/i18n/locale/fi/settings.json    |  5 +-
 .../i18n/locale/fi/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/fr/bulkActions.json | 17 +++++
 .../i18n/locale/fr/conversation.json          |  2 +
 .../dashboard/i18n/locale/fr/index.js         |  4 ++
 .../dashboard/i18n/locale/fr/settings.json    |  5 +-
 .../i18n/locale/fr/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/he/bulkActions.json | 17 +++++
 .../i18n/locale/he/conversation.json          |  2 +
 .../dashboard/i18n/locale/he/index.js         |  4 ++
 .../dashboard/i18n/locale/he/settings.json    |  5 +-
 .../i18n/locale/he/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/hi/bulkActions.json | 17 +++++
 .../i18n/locale/hi/conversation.json          |  2 +
 .../dashboard/i18n/locale/hi/index.js         |  4 ++
 .../dashboard/i18n/locale/hi/settings.json    |  5 +-
 .../i18n/locale/hi/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/hu/bulkActions.json | 17 +++++
 .../i18n/locale/hu/conversation.json          |  2 +
 .../dashboard/i18n/locale/hu/index.js         |  4 ++
 .../dashboard/i18n/locale/hu/settings.json    |  5 +-
 .../i18n/locale/hu/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/id/bulkActions.json | 17 +++++
 .../i18n/locale/id/conversation.json          |  2 +
 .../i18n/locale/id/generalSettings.json       |  4 +-
 .../dashboard/i18n/locale/id/index.js         |  4 ++
 .../dashboard/i18n/locale/id/settings.json    |  5 +-
 .../i18n/locale/id/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/it/bulkActions.json | 17 +++++
 .../i18n/locale/it/conversation.json          |  2 +
 .../dashboard/i18n/locale/it/index.js         |  4 ++
 .../dashboard/i18n/locale/it/settings.json    |  5 +-
 .../i18n/locale/it/whatsappTemplates.json     | 25 +++++++
 .../i18n/locale/ja/advancedFilters.json       |  2 +-
 .../i18n/locale/ja/attributesMgmt.json        |  8 +--
 .../dashboard/i18n/locale/ja/automation.json  |  2 +-
 .../dashboard/i18n/locale/ja/bulkActions.json | 17 +++++
 .../i18n/locale/ja/conversation.json          |  2 +
 .../dashboard/i18n/locale/ja/index.js         |  4 ++
 .../dashboard/i18n/locale/ja/settings.json    |  5 +-
 .../i18n/locale/ja/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ko/bulkActions.json | 17 +++++
 .../i18n/locale/ko/conversation.json          |  2 +
 .../dashboard/i18n/locale/ko/index.js         |  4 ++
 .../dashboard/i18n/locale/ko/settings.json    |  5 +-
 .../i18n/locale/ko/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/lv/bulkActions.json | 17 +++++
 .../i18n/locale/lv/conversation.json          |  2 +
 .../dashboard/i18n/locale/lv/index.js         |  4 ++
 .../dashboard/i18n/locale/lv/settings.json    |  5 +-
 .../i18n/locale/lv/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ml/bulkActions.json | 17 +++++
 .../i18n/locale/ml/conversation.json          |  2 +
 .../dashboard/i18n/locale/ml/index.js         |  4 ++
 .../dashboard/i18n/locale/ml/settings.json    |  5 +-
 .../i18n/locale/ml/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ne/bulkActions.json | 17 +++++
 .../i18n/locale/ne/conversation.json          |  2 +
 .../dashboard/i18n/locale/ne/index.js         |  4 ++
 .../dashboard/i18n/locale/ne/settings.json    |  5 +-
 .../i18n/locale/ne/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/nl/bulkActions.json | 17 +++++
 .../i18n/locale/nl/conversation.json          |  2 +
 .../dashboard/i18n/locale/nl/index.js         |  4 ++
 .../dashboard/i18n/locale/nl/settings.json    |  5 +-
 .../i18n/locale/nl/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/no/bulkActions.json | 17 +++++
 .../i18n/locale/no/conversation.json          |  2 +
 .../dashboard/i18n/locale/no/index.js         |  4 ++
 .../dashboard/i18n/locale/no/settings.json    |  5 +-
 .../i18n/locale/no/whatsappTemplates.json     | 25 +++++++
 .../i18n/locale/pl/advancedFilters.json       | 68 +++++++++----------
 .../dashboard/i18n/locale/pl/agentMgmt.json   |  2 +-
 .../dashboard/i18n/locale/pl/automation.json  | 62 ++++++++---------
 .../dashboard/i18n/locale/pl/bulkActions.json | 17 +++++
 .../dashboard/i18n/locale/pl/chatlist.json    |  6 +-
 .../dashboard/i18n/locale/pl/contact.json     |  4 +-
 .../i18n/locale/pl/contactFilters.json        | 32 ++++-----
 .../i18n/locale/pl/conversation.json          |  2 +
 .../i18n/locale/pl/generalSettings.json       | 50 +++++++-------
 .../dashboard/i18n/locale/pl/index.js         |  4 ++
 .../dashboard/i18n/locale/pl/settings.json    |  5 +-
 .../i18n/locale/pl/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/pt/bulkActions.json | 17 +++++
 .../i18n/locale/pt/conversation.json          |  2 +
 .../dashboard/i18n/locale/pt/index.js         |  4 ++
 .../dashboard/i18n/locale/pt/settings.json    |  5 +-
 .../i18n/locale/pt/whatsappTemplates.json     | 25 +++++++
 .../i18n/locale/pt_BR/bulkActions.json        | 17 +++++
 .../i18n/locale/pt_BR/conversation.json       |  2 +
 .../dashboard/i18n/locale/pt_BR/index.js      |  4 ++
 .../dashboard/i18n/locale/pt_BR/settings.json |  5 +-
 .../i18n/locale/pt_BR/whatsappTemplates.json  | 25 +++++++
 .../dashboard/i18n/locale/ro/bulkActions.json | 17 +++++
 .../i18n/locale/ro/conversation.json          |  2 +
 .../dashboard/i18n/locale/ro/index.js         |  4 ++
 .../dashboard/i18n/locale/ro/settings.json    |  5 +-
 .../i18n/locale/ro/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ru/bulkActions.json | 17 +++++
 .../i18n/locale/ru/conversation.json          |  2 +
 .../dashboard/i18n/locale/ru/index.js         |  4 ++
 .../dashboard/i18n/locale/ru/settings.json    |  7 +-
 .../i18n/locale/ru/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/sk/bulkActions.json | 17 +++++
 .../i18n/locale/sk/conversation.json          |  2 +
 .../dashboard/i18n/locale/sk/index.js         |  4 ++
 .../dashboard/i18n/locale/sk/settings.json    |  5 +-
 .../i18n/locale/sk/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/sr/bulkActions.json | 17 +++++
 .../i18n/locale/sr/conversation.json          |  2 +
 .../dashboard/i18n/locale/sr/index.js         | 53 +++++++++++++++
 .../dashboard/i18n/locale/sr/settings.json    |  5 +-
 .../i18n/locale/sr/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/sv/bulkActions.json | 17 +++++
 .../i18n/locale/sv/conversation.json          |  2 +
 .../dashboard/i18n/locale/sv/index.js         |  4 ++
 .../dashboard/i18n/locale/sv/settings.json    |  5 +-
 .../i18n/locale/sv/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ta/bulkActions.json | 17 +++++
 .../i18n/locale/ta/conversation.json          |  2 +
 .../dashboard/i18n/locale/ta/index.js         |  4 ++
 .../dashboard/i18n/locale/ta/settings.json    |  5 +-
 .../i18n/locale/ta/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/th/bulkActions.json | 17 +++++
 .../i18n/locale/th/conversation.json          |  2 +
 .../dashboard/i18n/locale/th/index.js         |  4 ++
 .../dashboard/i18n/locale/th/settings.json    |  5 +-
 .../i18n/locale/th/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/tr/bulkActions.json | 17 +++++
 .../i18n/locale/tr/conversation.json          |  2 +
 .../dashboard/i18n/locale/tr/index.js         |  4 ++
 .../dashboard/i18n/locale/tr/settings.json    |  5 +-
 .../i18n/locale/tr/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/uk/bulkActions.json | 17 +++++
 .../i18n/locale/uk/conversation.json          |  2 +
 .../dashboard/i18n/locale/uk/index.js         |  4 ++
 .../dashboard/i18n/locale/uk/settings.json    |  5 +-
 .../i18n/locale/uk/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/ur/bulkActions.json | 17 +++++
 .../i18n/locale/ur/conversation.json          |  2 +
 .../dashboard/i18n/locale/ur/index.js         | 53 +++++++++++++++
 .../dashboard/i18n/locale/ur/settings.json    |  5 +-
 .../i18n/locale/ur/whatsappTemplates.json     | 25 +++++++
 .../i18n/locale/ur_IN/bulkActions.json        | 17 +++++
 .../i18n/locale/ur_IN/conversation.json       |  2 +
 .../dashboard/i18n/locale/ur_IN/index.js      | 53 +++++++++++++++
 .../dashboard/i18n/locale/ur_IN/settings.json |  5 +-
 .../i18n/locale/ur_IN/whatsappTemplates.json  | 25 +++++++
 .../dashboard/i18n/locale/vi/bulkActions.json | 17 +++++
 .../i18n/locale/vi/conversation.json          |  2 +
 .../dashboard/i18n/locale/vi/index.js         |  4 ++
 .../dashboard/i18n/locale/vi/settings.json    |  5 +-
 .../i18n/locale/vi/whatsappTemplates.json     | 25 +++++++
 .../dashboard/i18n/locale/zh/index.js         |  4 ++
 .../i18n/locale/zh_CN/bulkActions.json        | 17 +++++
 .../i18n/locale/zh_CN/conversation.json       |  2 +
 .../dashboard/i18n/locale/zh_CN/index.js      |  4 ++
 .../dashboard/i18n/locale/zh_CN/settings.json |  5 +-
 .../i18n/locale/zh_CN/whatsappTemplates.json  | 25 +++++++
 .../i18n/locale/zh_TW/bulkActions.json        | 17 +++++
 .../dashboard/i18n/locale/zh_TW/chatlist.json |  2 +-
 .../dashboard/i18n/locale/zh_TW/contact.json  |  6 +-
 .../i18n/locale/zh_TW/conversation.json       |  2 +
 .../dashboard/i18n/locale/zh_TW/index.js      |  4 ++
 .../dashboard/i18n/locale/zh_TW/settings.json | 15 ++--
 .../dashboard/i18n/locale/zh_TW/signup.json   |  2 +-
 .../i18n/locale/zh_TW/whatsappTemplates.json  | 25 +++++++
 app/javascript/survey/i18n/locale/pl.json     | 10 +--
 app/javascript/widget/i18n/locale/pl.json     | 14 ++--
 config/locales/pl.yml                         | 26 +++----
 220 files changed, 2349 insertions(+), 238 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/bg/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/he/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/id/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/lv/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ne/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/no/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/th/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ur/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ur_IN/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh_TW/whatsappTemplates.json

diff --git a/app/javascript/dashboard/helper/specs/inbox.spec.js b/app/javascript/dashboard/helper/specs/inbox.spec.js
index 2db937be1..7a9d71e79 100644
--- a/app/javascript/dashboard/helper/specs/inbox.spec.js
+++ b/app/javascript/dashboard/helper/specs/inbox.spec.js
@@ -41,5 +41,5 @@ describe('#Inbox Helpers', () => {
         'warning'
       );
     });
-  })
+  });
 });
diff --git a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
new file mode 100644
index 000000000..dd41c75c2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "اختر وكيل",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "تكليف",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "إغلاق المحادثة",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index f798abd93..a574e9325 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "الرجاء اختيار محادثة من قائمة المحادثات",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "لم يتم التحقق من هوية هذا المستخدم",
     "NO_MESSAGE_1": "لا توجد رسائل بعد من العملاء في صندوق الوارد الخاص بك.",
     "NO_MESSAGE_2": " لإرسال رسالة إلى الصفحة الخاصة بك!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "أنت ترد على:",
     "REMOVE_SELECTION": "إزالة التحديد",
     "DOWNLOAD": "تنزيل",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "جاري تحميل المرفقات...",
     "SUCCESS_DELETE_MESSAGE": "تم حذف الرسالة بنجاح",
     "FAIL_DELETE_MESSSAGE": "تعذر حذف الرسالة! حاول مرة أخرى",
diff --git a/app/javascript/dashboard/i18n/locale/ar/index.js b/app/javascript/dashboard/i18n/locale/ar/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ar/index.js
+++ b/app/javascript/dashboard/i18n/locale/ar/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index 9b779f25c..b7b0addc4 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "توقيع الرسالة الشخصية",
-        "NOTE": "إنشاء توقيع رسالة شخصية يتم إضافتها إلى جميع الرسائل التي ترسلها من المنصة. استخدم محرر المحتوى الغني لإنشاء توقيع شديد التخصيص.",
+        "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": "حفظ توقيع الرسالة",
         "API_ERROR": "تعذر إرسال الرسالة! حاول مرة أخرى",
         "API_SUCCESS": "تم حفظ التوقيع بنجاح"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "الفريق",
     "SET_AVAILABILITY_TITLE": "تعيين نفسك كـ",
     "BETA": "تجريبي",
-    "REPORTS_OVERVIEW": "نظرة عامة"
+    "REPORTS_OVERVIEW": "نظرة عامة",
+    "FACEBOOK_REAUTHORIZE": "انتهت صلاحية اتصال الفيسبوك الخاص بك، يرجى إعادة الاتصال بصفحة الفيسبوك الخاصة بك لمواصلة الخدمات"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "أوه! لم نتمكن من العثور على الحساب. الرجاء إنشاء حساب جديد للمتابعة.",
diff --git a/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/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/bg/bulkActions.json b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/bg/conversation.json b/app/javascript/dashboard/i18n/locale/bg/conversation.json
index 13b36c714..593f40df0 100644
--- a/app/javascript/dashboard/i18n/locale/bg/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/bg/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/bg/index.js b/app/javascript/dashboard/i18n/locale/bg/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/bg/index.js
+++ b/app/javascript/dashboard/i18n/locale/bg/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/bg/settings.json b/app/javascript/dashboard/i18n/locale/bg/settings.json
index 2c5909d8b..2e1c1fc69 100644
--- a/app/javascript/dashboard/i18n/locale/bg/settings.json
+++ b/app/javascript/dashboard/i18n/locale/bg/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/bg/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/bg/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/bg/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/ca/bulkActions.json b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
new file mode 100644
index 000000000..ad225300e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Seleccionar Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assignar",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resoldre",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/conversation.json b/app/javascript/dashboard/i18n/locale/ca/conversation.json
index 303a0e8cb..243645494 100644
--- a/app/javascript/dashboard/i18n/locale/ca/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ca/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Si us plau, selecciona una conversa al panell de l’esquerra",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Uh oh! Sembla que no hi ha missatges de clients a la safata d'entrada.",
     "NO_MESSAGE_2": " per enviar un missatge a la vostra pàgina!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Estas responent a:",
     "REMOVE_SELECTION": "Elimina la selecció",
     "DOWNLOAD": "Descarrega",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Pujant fitxers adjunts...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ca/index.js b/app/javascript/dashboard/i18n/locale/ca/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ca/index.js
+++ b/app/javascript/dashboard/i18n/locale/ca/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index 4eef74bb8..72cdf2c7b 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "La teva connexió a Facebook ha caducat, torna a connectar la vostra pàgina de Facebook per continuar els serveis"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ca/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ca/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/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/cs/bulkActions.json b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
new file mode 100644
index 000000000..b7b0c4212
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Vybrat agenta",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Přiřadit",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Vyřešit",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/conversation.json b/app/javascript/dashboard/i18n/locale/cs/conversation.json
index ac17cd1c7..7242aa5f9 100644
--- a/app/javascript/dashboard/i18n/locale/cs/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/cs/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vyberte prosím konverzaci z levého panelu",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Identita tohoto uživatele není ověřena",
     "NO_MESSAGE_1": "Ale ne! Vypadá to, že ve vaší schránce nejsou žádné zprávy od zákazníků.",
     "NO_MESSAGE_2": " pro odeslání zprávy na vaši stránku!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Odpovídáte uživateli:",
     "REMOVE_SELECTION": "Odstranit výběr",
     "DOWNLOAD": "Stáhnout",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Nahrávání příloh...",
     "SUCCESS_DELETE_MESSAGE": "Zpráva byla úspěšně smazána",
     "FAIL_DELETE_MESSSAGE": "Zpráva se nepodařilo odstranit! Zkuste to znovu",
diff --git a/app/javascript/dashboard/i18n/locale/cs/index.js b/app/javascript/dashboard/i18n/locale/cs/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/cs/index.js
+++ b/app/javascript/dashboard/i18n/locale/cs/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
index a08059631..fc65e6386 100644
--- a/app/javascript/dashboard/i18n/locale/cs/settings.json
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/cs/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/cs/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/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/da/bulkActions.json b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
new file mode 100644
index 000000000..fd595818f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Løs",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
index 73c1f2586..2b7df2ce6 100644
--- a/app/javascript/dashboard/i18n/locale/da/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vælg venligst en samtale fra venstre rude",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Åh oh! Det ser ud til, at der ikke er nogen beskeder fra kunder i din indbakke.",
     "NO_MESSAGE_2": " for at sende en besked til din side!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Du svarer til:",
     "REMOVE_SELECTION": "Fjern Markering",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/da/index.js b/app/javascript/dashboard/i18n/locale/da/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/da/index.js
+++ b/app/javascript/dashboard/i18n/locale/da/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
index c356d7011..b15bb48aa 100644
--- a/app/javascript/dashboard/i18n/locale/da/settings.json
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Din Facebook-forbindelse er udløbet, tilslut venligst din Facebook-side igen for at fortsætte tjenesterne"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/da/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/da/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/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/de/bulkActions.json b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
new file mode 100644
index 000000000..ba8d8ea56
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} Konversationen ausgewählt",
+        "AGENT_SELECT_LABEL": "Agent auswählen",
+        "ASSIGN_CONFIRMATION_LABEL": "Sind Sie sicher, dass Sie %{conversationCount} %{conversationLabel} zuweisen möchten",
+        "GO_BACK_LABEL": "Zurück",
+        "ASSIGN_LABEL": "Zuordnen",
+        "ASSIGN_AGENT_TOOLTIP": "Agent zuweisen",
+        "RESOLVE_TOOLTIP": "Fall schließen",
+        "ASSIGN_SUCCESFUL": "Konversationen erfolgreich zugewiesen",
+        "ASSIGN_FAILED": "Konversationen konnten nicht zugewiesen werden. Bitte versuchen Sie es erneut",
+        "RESOLVE_SUCCESFUL": "Konversationen erfolgreich gelöst",
+        "RESOLVE_FAILED": "Konversationen konnten nicht gelöst werden. Bitte versuchen Sie es erneut",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Nur auf dieser Seite sichtbaren Konversationen sind ausgewählt.",
+        "AGENT_LIST_LOADING": "Agenten werden geladen"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/conversation.json b/app/javascript/dashboard/i18n/locale/de/conversation.json
index a8b2b5770..80c3e8aba 100644
--- a/app/javascript/dashboard/i18n/locale/de/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/de/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Bitte wählen Sie eine Konversation aus dem linken Bereich",
+    "DASHBOARD_APP_TAB_MESSAGES": "Nachrichten",
     "UNVERIFIED_SESSION": "Die Identität dieses Benutzers ist nicht verifiziert",
     "NO_MESSAGE_1": "Oh oh! Anscheinend befinden sich keine Nachrichten von Kunden in Ihrem Posteingang.",
     "NO_MESSAGE_2": "um eine Nachricht an Ihre Seite zu senden!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Sie antworten auf:",
     "REMOVE_SELECTION": "Auswahl entfernen",
     "DOWNLOAD": "Herunterladen",
+    "UNKNOWN_FILE_TYPE": "Unbekannte Datei",
     "UPLOADING_ATTACHMENTS": "Anhänge werden hochgeladen...",
     "SUCCESS_DELETE_MESSAGE": "Nachricht erfolgreich gelöscht",
     "FAIL_DELETE_MESSSAGE": "Nachricht konnte nicht gelöscht werden! Versuchen Sie es erneut",
diff --git a/app/javascript/dashboard/i18n/locale/de/index.js b/app/javascript/dashboard/i18n/locale/de/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/de/index.js
+++ b/app/javascript/dashboard/i18n/locale/de/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index dd8e21231..dc5f9355e 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Persönliche Nachrichtensignatur",
-        "NOTE": "Erstelle eine persönliche Nachrichtensignatur, die allen Nachrichten hinzugefügt wird, die Du von der Plattform sendest. Verwende den Rich-Content-Editor, um eine stark personalisierte Signatur zu erstellen.",
+        "NOTE": "Erstellen Sie eine persönliche Nachrichtensignatur, die allen Nachrichten hinzugefügt wird, die Sie aus Ihrem E-Mail-Posteingang senden. Verwenden Sie den Rich-Content-Editor, um eine stark personalisierte Signatur zu erstellen.",
         "BTN_TEXT": "Nachrichten-Signatur speichern",
         "API_ERROR": "Signatur konnte nicht gespeichert werden! Versuch es noch einmal",
         "API_SUCCESS": "Signatur erfolgreich gespeichert"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Setzen Sie sich als",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Übersicht"
+    "REPORTS_OVERVIEW": "Übersicht",
+    "FACEBOOK_REAUTHORIZE": "Ihre Facebook-Verbindung ist abgelaufen, bitte verbinden Sie sich neu, um die Dienste fortzuführen"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh! Wir konnten keine Chatwoot-Konten finden. Bitte erstellen Sie ein neues Konto um fortzufahren.",
diff --git a/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/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/el/bulkActions.json b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
new file mode 100644
index 000000000..ff508a70b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} σινομιλίες επιλέχθηκαν",
+        "AGENT_SELECT_LABEL": "Επιλογή πράκτορα",
+        "ASSIGN_CONFIRMATION_LABEL": "Είσαστε σίγουροι ότι θέλετε να αντιστοιχίσετε %{conversationCount} %{conversationLabel} στον",
+        "GO_BACK_LABEL": "Πίσω",
+        "ASSIGN_LABEL": "Αντιστοίχιση",
+        "ASSIGN_AGENT_TOOLTIP": "Ανάθεση σε πράκτορα",
+        "RESOLVE_TOOLTIP": "Επίλυση",
+        "ASSIGN_SUCCESFUL": "Οι σινομιλίες αντιστοιχήθηκαν επιτυχώς",
+        "ASSIGN_FAILED": "Αποτυχία στην αντιστοίχιση σινομιλιών, παρακαλώ δοκιμάστε αργότερα",
+        "RESOLVE_SUCCESFUL": "Οι σινομιλίες επιλύθηκαν επιτυχώς",
+        "RESOLVE_FAILED": "Αποτυχία στην αντιστοίχιση σινομιλιών, παρακαλώ δοκιμάστε αργότερα",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Επιλέχθηκαν μόνο οι σινομιλίες που φαίνονται στην σελίδα.",
+        "AGENT_LIST_LOADING": "Φόρτωση πρακτόρων"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/conversation.json b/app/javascript/dashboard/i18n/locale/el/conversation.json
index c368cb39b..dc8e2a7f7 100644
--- a/app/javascript/dashboard/i18n/locale/el/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/el/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Παρακαλώ επιλέξτε συζήτηση από το αριστερό τμήμα",
+    "DASHBOARD_APP_TAB_MESSAGES": "Μηνύματα",
     "UNVERIFIED_SESSION": "Η ταυτότητα αυτού του χρήστη δεν επαληθεύεται",
     "NO_MESSAGE_1": "Ωχ ωχ! Φαίνεται ότι δεν υπάρχουν μηνύματα από τους πελάτες στα εισερχόμενά σας.",
     "NO_MESSAGE_2": " για να στείλετε ένα μήνυμα στην σελίδα σας!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Απαντάτε στο:",
     "REMOVE_SELECTION": "Διαγραφή Επιλογής",
     "DOWNLOAD": "Κατέβασμα",
+    "UNKNOWN_FILE_TYPE": "Άγνωστο Αρχείο",
     "UPLOADING_ATTACHMENTS": "Ανέβασμα επισυναπτόμενων...",
     "SUCCESS_DELETE_MESSAGE": "Το μήνυμα διαγράφηκε επιτυχώς",
     "FAIL_DELETE_MESSSAGE": "Δεν ήταν δυνατή η διαγραφή μηνύματος! Προσπαθήστε ξανά",
diff --git a/app/javascript/dashboard/i18n/locale/el/index.js b/app/javascript/dashboard/i18n/locale/el/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/el/index.js
+++ b/app/javascript/dashboard/i18n/locale/el/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index d14573b2b..f59aa5ba4 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Προσωπική υπογραφή μηνύματος",
-        "NOTE": "Δημιουργήστε μια προσωπική υπογραφή μηνύματος που θα προστίθεται σε όλα τα μηνύματα που στέλνετε από την πλατφόρμα. Χρησιμοποιήστε τον επεξεργαστή πλούσιου περιεχομένου για να δημιουργήσετε μια εξατομικευμένη υπογραφή.",
+        "NOTE": "Δημιουργήστε μια προσωπική υπογραφή, η οποία θα προστεθεί σε όλα τα μηνύματα που στέλνετε από τα εισερχόμενα email σας. Χρησιμοποιήστε τον επεξεργαστή πλούσιου περιεχομένου για να δημιουργήσετε μια εξατομικευμένη υπογραφή.",
         "BTN_TEXT": "Αποθήκευση υπογραφής μηνύματος",
         "API_ERROR": "Δεν ήταν δυνατή η αποθήκευση της υπογραφής! Δοκιμάστε ξανά",
         "API_SUCCESS": "Η υπογραφή αποθηκεύτηκε με επιτυχία"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Ομάδα",
     "SET_AVAILABILITY_TITLE": "Ορίστε τον εαυτό σας ως",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Επισκόπηση"
+    "REPORTS_OVERVIEW": "Επισκόπηση",
+    "FACEBOOK_REAUTHORIZE": "Η σύνδεση Facebook έχει λήξει, παρακαλώ ξανασυνδεθείτε στο Facebook για να συνεχίσετε"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ωχ! Δεν μπορέσαμε να βρούμε κανένα λογαριασμό Chatwoot. Παρακαλούμε δημιουργήστε ένα νέο λογαριασμό για να συνεχίσετε.",
diff --git a/app/javascript/dashboard/i18n/locale/el/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/el/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/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/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index d49420335..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -22,7 +23,6 @@ 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 _bulkActions } from './bulkActions.json';
 
 export default {
   ..._advancedFilters,
diff --git a/app/javascript/dashboard/i18n/locale/es/bulkActions.json b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
new file mode 100644
index 000000000..b887e6126
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Seleccionar agente",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Asignar",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolver",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index ed5d094b9..07ce4cc5b 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Por favor, selecciona una conversación del panel izquierdo",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "La identidad de este usuario no está verificada",
     "NO_MESSAGE_1": "¡Oh oh! Parece que no hay mensajes de los clientes en tu bandeja de entrada.",
     "NO_MESSAGE_2": " para enviar un mensaje a tu página!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Esta respondiendo a:",
     "REMOVE_SELECTION": "Eliminar selección",
     "DOWNLOAD": "Descargar",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Subiendo archivos adjuntos...",
     "SUCCESS_DELETE_MESSAGE": "Mensaje eliminado correctamente",
     "FAIL_DELETE_MESSSAGE": "¡No se pudo eliminar el mensaje! Inténtalo de nuevo",
diff --git a/app/javascript/dashboard/i18n/locale/es/index.js b/app/javascript/dashboard/i18n/locale/es/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/es/index.js
+++ b/app/javascript/dashboard/i18n/locale/es/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index fbbd2732b..7b16e5385 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma de mensaje personal",
-        "NOTE": "Cree una firma de mensaje personal que se añadiría a todos los mensajes que envíe desde la plataforma. Utilice el rico editor de contenidos para crear una firma altamente personalizada.",
+        "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": "Guardar firma de mensaje",
         "API_ERROR": "¡No se pudo guardar la firma! Inténtalo de nuevo",
         "API_SUCCESS": "Firma guardada correctamente"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Equipo",
     "SET_AVAILABILITY_TITLE": "Ponte como",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Resumen"
+    "REPORTS_OVERVIEW": "Resumen",
+    "FACEBOOK_REAUTHORIZE": "Su conexión de Facebook expiró, por favor reconecte si página de Facebook para continuar con el servicio"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "¡Oh oh! No hemos podido encontrar ninguna cuenta de \"Chatwoot\". Por favor, crea una nueva cuenta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/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/fa/bulkActions.json b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
new file mode 100644
index 000000000..68bfd5e47
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} گفتگو انتخاب شده است",
+        "AGENT_SELECT_LABEL": "انتخاب ایجنت",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "بازگشت",
+        "ASSIGN_LABEL": "اختصاص دادن",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "حل شد",
+        "ASSIGN_SUCCESFUL": "گفتگو با موفقیت اختصاص داده شده",
+        "ASSIGN_FAILED": "گفتگو اختصاص داده نشد، لطفا دوباره امتحان کنید",
+        "RESOLVE_SUCCESFUL": "گفتگو با موفقیت حل شد",
+        "RESOLVE_FAILED": "گفتگو حل نشد، لطفا دوباره امتحان کنید",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "گفتگوهای قابل مشاهده در این صفحه فقط انتخاب می‌شوند.",
+        "AGENT_LIST_LOADING": "Loading Agents"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fa/conversation.json b/app/javascript/dashboard/i18n/locale/fa/conversation.json
index 6ae25f944..2512ef65e 100644
--- a/app/javascript/dashboard/i18n/locale/fa/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fa/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "لطفا یک گفتگو را از پنجره گفتگوها انتخاب کنید",
+    "DASHBOARD_APP_TAB_MESSAGES": "پیام‌ها",
     "UNVERIFIED_SESSION": "هویت این کاربر تایید نشده است",
     "NO_MESSAGE_1": "اوه اوه! به نظر می‌رسد هیچ پیامی از طرف مشتری در صندوق ورودی شما وجود ندارد.",
     "NO_MESSAGE_2": " برای ارسال پیام به صفحه خود بروید!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "شما در حال پاسخ دادن به:",
     "REMOVE_SELECTION": "حذف انتخاب‌شده‌ها",
     "DOWNLOAD": "دانلود",
+    "UNKNOWN_FILE_TYPE": "پرونده ناشناخته",
     "UPLOADING_ATTACHMENTS": "در حال بارگذاری پیوست‌ها...",
     "SUCCESS_DELETE_MESSAGE": "پیام با موفقیت حذف شد",
     "FAIL_DELETE_MESSSAGE": "پیام حذف نشد! دوباره امتحان کنید",
diff --git a/app/javascript/dashboard/i18n/locale/fa/index.js b/app/javascript/dashboard/i18n/locale/fa/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/fa/index.js
+++ b/app/javascript/dashboard/i18n/locale/fa/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fa/settings.json b/app/javascript/dashboard/i18n/locale/fa/settings.json
index c1f119d01..26019a3a5 100644
--- a/app/javascript/dashboard/i18n/locale/fa/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fa/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "امضای پیام شخصی",
-        "NOTE": "یک امضای پیام شخصی ایجاد کنید که به همه پیام‌هایی که از پلتفرم ارسال می‌کنید اضافه شود. از ویرایشگر محتوای غنی برای ایجاد یک امضای بسیار شخصی استفاده کنید.",
+        "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": "ذخیره امضای پیام",
         "API_ERROR": "امضا ذخیره نشد! دوباره امتحان کنید",
         "API_SUCCESS": "امضا با موفقیت ذخیره شد"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "تیم‌",
     "SET_AVAILABILITY_TITLE": "خود را به عنوان",
     "BETA": "آزمایشی",
-    "REPORTS_OVERVIEW": "بررسی اجمالی"
+    "REPORTS_OVERVIEW": "بررسی اجمالی",
+    "FACEBOOK_REAUTHORIZE": "اتصال فیس بوک شما منقضی شده است ، لطفاً برای ادامه خدمات دوباره صفحه فیس بوک خود را متصل کنید"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "اوه اوه! ما هیچ حسابی روی Chatwoot پاز شما پیدا نکردیم. لطفاً برای ادامه یک حساب جدید ایجاد کنید.",
diff --git a/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/fa/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fa/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/fi/bulkActions.json b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
new file mode 100644
index 000000000..19d129eb5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Valitse edustaja",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Delegoi",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Ratkaise",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
index d67d057be..681fca0c5 100644
--- a/app/javascript/dashboard/i18n/locale/fi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Ole hyvä ja valitse keskustelu vasemmasta paneelista",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Voi voi! Näyttää siltä, että postilaatikossasi ei ole viestejä.",
     "NO_MESSAGE_2": " jotta voit lähettää viestin sivullesi!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Olet vastaamassa:",
     "REMOVE_SELECTION": "Poista valinnat",
     "DOWNLOAD": "Lataa",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Ladataan liitteitä...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/fi/index.js b/app/javascript/dashboard/i18n/locale/fi/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/fi/index.js
+++ b/app/javascript/dashboard/i18n/locale/fi/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
index 26b61650e..9a745e5f3 100644
--- a/app/javascript/dashboard/i18n/locale/fi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Facebook-yhteytesi on vanhentunut, ole hyvä ja yhdistä uudelleen Facebook-sivusi jatkaaksesi palveluita"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/fi/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/fi/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/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/fr/bulkActions.json b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
new file mode 100644
index 000000000..1833909e2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Sélectionner un agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assigner",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Résoudre",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/conversation.json b/app/javascript/dashboard/i18n/locale/fr/conversation.json
index 34c47dcad..ad5dd4692 100644
--- a/app/javascript/dashboard/i18n/locale/fr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/fr/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Veuillez sélectionner une conversation à partir du panneau de gauche",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "L'identité de cet utilisateur n'est pas vérifiée",
     "NO_MESSAGE_1": "Oh oh ! Il semble qu'il n'y ait aucun message de clients dans votre boîte de réception.",
     "NO_MESSAGE_2": " pour envoyer un message à votre page !",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Vous répondez à :",
     "REMOVE_SELECTION": "Supprimer la sélection",
     "DOWNLOAD": "Télécharger",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Envoi des pièces jointes...",
     "SUCCESS_DELETE_MESSAGE": "Le message a bien été supprimé",
     "FAIL_DELETE_MESSSAGE": "Impossible de supprimer le message ! Veuillez réessayez",
diff --git a/app/javascript/dashboard/i18n/locale/fr/index.js b/app/javascript/dashboard/i18n/locale/fr/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/fr/index.js
+++ b/app/javascript/dashboard/i18n/locale/fr/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index f7404668d..7735f829f 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Signature du message personnel",
-        "NOTE": "Créez une signature de message personnel qui serait ajoutée à tous les messages que vous envoyez depuis la plateforme. Utilisez l'éditeur de contenu riche pour créer une signature hautement personnalisée.",
+        "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": "Enregistrer la signature du message",
         "API_ERROR": "Impossible d'enregistrer la signature ! Réessayez",
         "API_SUCCESS": "Signature enregistrée avec succès"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Équipes",
     "SET_AVAILABILITY_TITLE": "Se définir comme",
     "BETA": "Bêta",
-    "REPORTS_OVERVIEW": "Vue d'ensemble"
+    "REPORTS_OVERVIEW": "Vue d'ensemble",
+    "FACEBOOK_REAUTHORIZE": "Votre connexion Facebook a expiré, veuillez reconnecter votre page Facebook pour continuer les services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Oh oh ! Nous n'avons pas trouvé de compte Chatwoot. Veuillez créer un nouveau compte pour continuer.",
diff --git a/app/javascript/dashboard/i18n/locale/fr/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/fr/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/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/he/bulkActions.json b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
new file mode 100644
index 000000000..434dff926
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "בחר סוכן",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "שייך",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "פתרון",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/he/conversation.json b/app/javascript/dashboard/i18n/locale/he/conversation.json
index 763a13ae1..ead95d92d 100644
--- a/app/javascript/dashboard/i18n/locale/he/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/he/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "אנא בחר שיחה מהחלונית השמאלית",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "זהות המשתמש לא מְאוּמָתת",
     "NO_MESSAGE_1": "או - או! נראה שאין הודעות מלקוחות בתיבת הדואר הנכנס שלך.",
     "NO_MESSAGE_2": " לשלוח הודעה לעמוד שלך!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "אתה משיב ל:",
     "REMOVE_SELECTION": "הסר בחירה",
     "DOWNLOAD": "הורד",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "מעלה קובץ מצורף...",
     "SUCCESS_DELETE_MESSAGE": "ההודעה נמחקה בהצלחה",
     "FAIL_DELETE_MESSSAGE": "לא ניתן למחוק את ההודעה! נסה שוב",
diff --git a/app/javascript/dashboard/i18n/locale/he/index.js b/app/javascript/dashboard/i18n/locale/he/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/he/index.js
+++ b/app/javascript/dashboard/i18n/locale/he/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/he/settings.json b/app/javascript/dashboard/i18n/locale/he/settings.json
index 6e3f72d45..6afbc9a95 100644
--- a/app/javascript/dashboard/i18n/locale/he/settings.json
+++ b/app/javascript/dashboard/i18n/locale/he/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "פג תוקף החיבור שלך לפייסבוק, אנא חבר מחדש את דף הפייסבוק שלך כדי להמשיך בשירותים"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/he/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/he/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/he/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/hi/bulkActions.json b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
index ac25a5aed..c38fb16a4 100644
--- a/app/javascript/dashboard/i18n/locale/hi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/hi/index.js b/app/javascript/dashboard/i18n/locale/hi/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/hi/index.js
+++ b/app/javascript/dashboard/i18n/locale/hi/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
index 00a18d8ed..977f9e50d 100644
--- a/app/javascript/dashboard/i18n/locale/hi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hi/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/hi/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/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/hu/bulkActions.json b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
new file mode 100644
index 000000000..9d8010b0a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Ügynök kiválasztása",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Hozzárendelés",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Megoldva",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
index 904ae9c45..a06acd989 100644
--- a/app/javascript/dashboard/i18n/locale/hu/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Kérjük válassz egy beszélgetést a bal sávból",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Jajj ne! Úgy tűnik, hogy nincs több ügyfélbeszélgetés az inboxodban.",
     "NO_MESSAGE_2": "egy üzenet küldéséhez az oldaladra!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Neki válaszolsz:",
     "REMOVE_SELECTION": "Kijelölés törlése",
     "DOWNLOAD": "Letöltés",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Csatolt fileok feltöltése...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/hu/index.js b/app/javascript/dashboard/i18n/locale/hu/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/hu/index.js
+++ b/app/javascript/dashboard/i18n/locale/hu/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
index 7b5679c26..28d05fa11 100644
--- a/app/javascript/dashboard/i18n/locale/hu/settings.json
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "A Facebook kapcsolatod lejárt, kérjük kapcsold össze oldalad újra a szolgáltatás folytatásához"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/hu/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/hu/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/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/bulkActions.json b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
new file mode 100644
index 000000000..b01c4daa4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Pilih Agen",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Tugaskan",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Menyelesaikan",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/id/conversation.json b/app/javascript/dashboard/i18n/locale/id/conversation.json
index b7d7b8c6e..80f95b781 100644
--- a/app/javascript/dashboard/i18n/locale/id/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/id/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Pilih percakapan dari panel kiri",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Aduh! Sepertinya tidak ada pesan dari pelanggan di kotak masuk Anda.",
     "NO_MESSAGE_2": " untuk mengirim pesan ke halaman Anda!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Anda membalas:",
     "REMOVE_SELECTION": "Hapus Pilihan",
     "DOWNLOAD": "Unduh",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Unggah lampiran...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/id/generalSettings.json b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
index 52d7d80b7..cf75b7a5f 100644
--- a/app/javascript/dashboard/i18n/locale/id/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/id/generalSettings.json
@@ -48,7 +48,7 @@
       }
     },
     "UPDATE_CHATWOOT": "Pembaharuan Chatwoot %{latestChatwootVersion} telah tersedia. Silahkan lakukan pembaharuan instance Anda.",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "Pelajari lebih lanjut"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -60,7 +60,7 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Notifikasi",
     "MARK_ALL_DONE": "Tandai Semua Selesai",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "terhapus",
     "UNREAD_NOTIFICATION": {
       "TITLE": "Unread Notifications",
       "ALL_NOTIFICATIONS": "View all notifications",
diff --git a/app/javascript/dashboard/i18n/locale/id/index.js b/app/javascript/dashboard/i18n/locale/id/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/id/index.js
+++ b/app/javascript/dashboard/i18n/locale/id/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/id/settings.json b/app/javascript/dashboard/i18n/locale/id/settings.json
index 949995c49..a2eb0955c 100644
--- a/app/javascript/dashboard/i18n/locale/id/settings.json
+++ b/app/javascript/dashboard/i18n/locale/id/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Tim",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Gambaran"
+    "REPORTS_OVERVIEW": "Gambaran",
+    "FACEBOOK_REAUTHORIZE": "Koneksi Facebook Anda telah kedaluwarsa, hubungkan kembali halaman Facebook Anda untuk melanjutkan layanan"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/id/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/id/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/id/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/it/bulkActions.json b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
new file mode 100644
index 000000000..da7ac4957
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Seleziona agente",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assegna",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Risolvi",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/conversation.json b/app/javascript/dashboard/i18n/locale/it/conversation.json
index c46fa701f..4782fb564 100644
--- a/app/javascript/dashboard/i18n/locale/it/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/it/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Si prega di selezionare una conversazione dal pannello sinistro",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messaggi",
     "UNVERIFIED_SESSION": "L'identità di questo utente non è verificata",
     "NO_MESSAGE_1": "Oh oh! Sembra che non ci siano messaggi da parte dei clienti nella tua casella.",
     "NO_MESSAGE_2": " per inviare un messaggio alla tua pagina!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Stai rispondendo a:",
     "REMOVE_SELECTION": "Rimuovi selezione",
     "DOWNLOAD": "Scarica",
+    "UNKNOWN_FILE_TYPE": "File sconosciuto",
     "UPLOADING_ATTACHMENTS": "Caricamento allegati...",
     "SUCCESS_DELETE_MESSAGE": "Messaggio eliminato con successo",
     "FAIL_DELETE_MESSSAGE": "Impossibile eliminare il messaggio! Riprova",
diff --git a/app/javascript/dashboard/i18n/locale/it/index.js b/app/javascript/dashboard/i18n/locale/it/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/it/index.js
+++ b/app/javascript/dashboard/i18n/locale/it/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 6b4712625..74a5841be 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma del messaggio personale",
-        "NOTE": "Crea una firma personale del messaggio che sarà aggiunta a tutti i messaggi inviati dalla piattaforma. Usa l'editor di contenuti per creare una firma altamente personalizzata.",
+        "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": "Salva firma del messaggio",
         "API_ERROR": "Impossibile salvare la firma! Riprova",
         "API_SUCCESS": "Firma salvata con successo"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Imposta te stesso come",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Panoramica"
+    "REPORTS_OVERVIEW": "Panoramica",
+    "FACEBOOK_REAUTHORIZE": "La tua connessione a Facebook è scaduta, ricollegati alla tua pagina Facebook per continuare i servizi"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Non abbiamo trovato alcun account Chatwoot. Si prega di creare un nuovo account per continuare.",
diff --git a/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/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/ja/advancedFilters.json b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
index 47f3b7e87..519c4219b 100644
--- a/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/ja/advancedFilters.json
@@ -57,7 +57,7 @@
         "TITLE": "Do you want to save this filter?",
         "LABEL": "Name this filter",
         "PLACEHOLDER": "Enter a name for this filter",
-        "ERROR_MESSAGE": "Name is required",
+        "ERROR_MESSAGE": "名前が必須です",
         "SAVE_BUTTON": "フィルターの保存",
         "CANCEL_BUTTON": "キャンセル",
         "API_FOLDERS": {
diff --git a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
index a43d3e196..94f5ae25c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ja/attributesMgmt.json
@@ -1,18 +1,18 @@
 {
   "ATTRIBUTES_MGMT": {
     "HEADER": "カスタム属性",
-    "HEADER_BTN_TXT": "Add Custom Attribute",
-    "LOADING": "Fetching custom attributes",
+    "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>",
     "ADD": {
-      "TITLE": "Add Custom Attribute",
+      "TITLE": "カスタム属性を追加",
       "SUBMIT": "作成",
       "CANCEL_BUTTON_TEXT": "キャンセル",
       "FORM": {
         "NAME": {
           "LABEL": "Display Name",
           "PLACEHOLDER": "Enter custom attribute display name",
-          "ERROR": "Name is required"
+          "ERROR": "名前が必須です"
         },
         "DESC": {
           "LABEL": "説明",
diff --git a/app/javascript/dashboard/i18n/locale/ja/automation.json b/app/javascript/dashboard/i18n/locale/ja/automation.json
index 77f4bcecc..d80ed8592 100644
--- a/app/javascript/dashboard/i18n/locale/ja/automation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/automation.json
@@ -12,7 +12,7 @@
         "NAME": {
           "LABEL": "Rule Name",
           "PLACEHOLDER": "Enter rule name",
-          "ERROR": "Name is required"
+          "ERROR": "名前が必須です"
         },
         "DESC": {
           "LABEL": "説明",
diff --git a/app/javascript/dashboard/i18n/locale/ja/bulkActions.json b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
new file mode 100644
index 000000000..86f088286
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "解決する",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
index ca1280a5e..b84110d1c 100644
--- a/app/javascript/dashboard/i18n/locale/ja/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "左のリストから会話を選択してください",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "おっと！受信トレイに顧客からのメッセージがないようです。",
     "NO_MESSAGE_2": " to send a message to your page!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "以下に返信：",
     "REMOVE_SELECTION": "選択項目を削除",
     "DOWNLOAD": "ダウンロード",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ja/index.js b/app/javascript/dashboard/i18n/locale/ja/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ja/index.js
+++ b/app/javascript/dashboard/i18n/locale/ja/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
index f0832d167..f5c513039 100644
--- a/app/javascript/dashboard/i18n/locale/ja/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Facebookの接続が期限切れになりました。サービスを継続するには、Facebookページを再接続してください。"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ja/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ja/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/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/ko/bulkActions.json b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
new file mode 100644
index 000000000..2ec3b87be
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "에이전트 선택",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "할당하다",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "해결함",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
index bac6dd6cf..170cab627 100644
--- a/app/javascript/dashboard/i18n/locale/ko/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "왼쪽 창에서 대화를 선택하십시오.",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "어라! 받은 메시지함에 고객의 메시지가 없는 것 같아요.",
     "NO_MESSAGE_2": " 페이지에 메시지를 보내기 위해서!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "회신할 대상:",
     "REMOVE_SELECTION": "선택 항목 제거",
     "DOWNLOAD": "다운로드",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "첨부 업로드 중...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ko/index.js b/app/javascript/dashboard/i18n/locale/ko/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ko/index.js
+++ b/app/javascript/dashboard/i18n/locale/ko/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
index aa9bd2487..3afa563dd 100644
--- a/app/javascript/dashboard/i18n/locale/ko/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "페이스북 연결이 만료되었습니다. 서비스를 계속하려면 페이스북 페이지를 다시 연결하십시오."
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ko/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ko/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/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/lv/bulkActions.json b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/lv/conversation.json b/app/javascript/dashboard/i18n/locale/lv/conversation.json
index ac25a5aed..c38fb16a4 100644
--- a/app/javascript/dashboard/i18n/locale/lv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/lv/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/lv/index.js b/app/javascript/dashboard/i18n/locale/lv/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/lv/index.js
+++ b/app/javascript/dashboard/i18n/locale/lv/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/lv/settings.json b/app/javascript/dashboard/i18n/locale/lv/settings.json
index 00a18d8ed..977f9e50d 100644
--- a/app/javascript/dashboard/i18n/locale/lv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/lv/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/lv/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/lv/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/lv/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/ml/bulkActions.json b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
new file mode 100644
index 000000000..4ed56109e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "ഏജന്റ് തിരഞ്ഞെടുക്കുക",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "നിയോഗിക്കുക",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "പരിഹരിക്കുക",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/conversation.json b/app/javascript/dashboard/i18n/locale/ml/conversation.json
index f74160ff7..0f95236b7 100644
--- a/app/javascript/dashboard/i18n/locale/ml/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ml/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "ഇടത് പാളിയിൽ നിന്ന് ഒരു സംഭാഷണം തിരഞ്ഞെടുക്കുക",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "നിങ്ങളുടെ ഇൻ‌ബോക്സിൽ ഉപഭോക്താക്കളിൽ നിന്ന് സന്ദേശങ്ങളൊന്നും ഇല്ലെന്ന് തോന്നുന്നു.",
     "NO_MESSAGE_2": " നിങ്ങളുടെ പേജിലേക്ക് ഒരു സന്ദേശം അയയ്‌ക്കാൻ!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "നിങ്ങൾ ഇതിന് മറുപടി നൽകുന്നു:",
     "REMOVE_SELECTION": "തിരഞ്ഞെടുക്കൽ നീക്കംചെയ്യുക",
     "DOWNLOAD": "ഡൗൺലോഡ്",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ml/index.js b/app/javascript/dashboard/i18n/locale/ml/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ml/index.js
+++ b/app/javascript/dashboard/i18n/locale/ml/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index 5db51f2d1..99c95a71e 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "അവലോകനം"
+    "REPORTS_OVERVIEW": "അവലോകനം",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ml/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ml/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/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/ne/bulkActions.json b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ne/conversation.json b/app/javascript/dashboard/i18n/locale/ne/conversation.json
index 36ac293ff..1fb484706 100644
--- a/app/javascript/dashboard/i18n/locale/ne/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ne/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "डाउनलोड",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ne/index.js b/app/javascript/dashboard/i18n/locale/ne/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ne/index.js
+++ b/app/javascript/dashboard/i18n/locale/ne/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ne/settings.json b/app/javascript/dashboard/i18n/locale/ne/settings.json
index c73f1c172..cd27d2119 100644
--- a/app/javascript/dashboard/i18n/locale/ne/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ne/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ne/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ne/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ne/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/nl/bulkActions.json b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
new file mode 100644
index 000000000..8f2df27fd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Oplossen",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/conversation.json b/app/javascript/dashboard/i18n/locale/nl/conversation.json
index 8a68fb963..06f6142b7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/nl/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Selecteer een gesprek in het linker paneel",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Oh oh! Het lijkt erop dat er geen berichten van klanten in uw inbox staan.",
     "NO_MESSAGE_2": " om een bericht naar uw pagina te sturen!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index 1bd17d257..e5f585bc3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/nl/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/nl/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/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/no/bulkActions.json b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
new file mode 100644
index 000000000..3b13324cd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Velg agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Tildel",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Løs",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/no/conversation.json b/app/javascript/dashboard/i18n/locale/no/conversation.json
index 3a63c2d66..43ae32b9c 100644
--- a/app/javascript/dashboard/i18n/locale/no/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/no/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Velg en samtale fra venstre panel",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Å nei! Ser ut til at det ikke er noen meldinger fra kunder i innboksen din.",
     "NO_MESSAGE_2": " for å sende en melding til siden din!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Du svarer til:",
     "REMOVE_SELECTION": "Fjern utvalget",
     "DOWNLOAD": "Last ned",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Laster opp vedlegg...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/no/index.js b/app/javascript/dashboard/i18n/locale/no/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/no/index.js
+++ b/app/javascript/dashboard/i18n/locale/no/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/no/settings.json b/app/javascript/dashboard/i18n/locale/no/settings.json
index 0d005663c..813187130 100644
--- a/app/javascript/dashboard/i18n/locale/no/settings.json
+++ b/app/javascript/dashboard/i18n/locale/no/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Facebook-tilkoblingen din er utløpt, koble til Facebook-siden din for å fortsette tjenester"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/no/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/no/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/no/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/pl/advancedFilters.json b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
index 73f3a5cd4..3b65d65b0 100644
--- a/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/advancedFilters.json
@@ -2,54 +2,54 @@
   "FILTER": {
     "TITLE": "Filtruj rozmowy",
     "SUBTITLE": "Dodaj poniższe filtry i kliknij 'Zastosuj filtry', aby przefiltrować rozmowy.",
-    "ADD_NEW_FILTER": "Add Filter",
+    "ADD_NEW_FILTER": "Dodaj filtr",
     "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
-    "SUBMIT_BUTTON_LABEL": "Apply filters",
+    "SUBMIT_BUTTON_LABEL": "Zastosuj filtry",
     "CANCEL_BUTTON_LABEL": "Anuluj",
-    "CLEAR_BUTTON_LABEL": "Clear Filters",
-    "EMPTY_VALUE_ERROR": "Value is required",
+    "CLEAR_BUTTON_LABEL": "Wyczyść filtry",
+    "EMPTY_VALUE_ERROR": "Wartość jest wymagana",
     "TOOLTIP_LABEL": "Filtruj konwersacje",
     "QUERY_DROPDOWN_LABELS": {
       "AND": "i",
       "OR": "albo"
     },
     "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"
+      "equal_to": "Równa się",
+      "not_equal_to": "Nie równa się",
+      "contains": "Zawiera",
+      "does_not_contain": "Nie zawiera",
+      "is_present": "Istnieje",
+      "is_not_present": "Nie istnieje",
+      "is_greater_than": "Jest większe niż",
+      "is_less_than": "Jest mniejsze niż",
+      "days_before": "Jest x dni przed"
     },
     "ATTRIBUTE_LABELS": {
-      "TRUE": "True",
-      "FALSE": "False"
+      "TRUE": "Prawda",
+      "FALSE": "Fałsz"
     },
     "ATTRIBUTES": {
       "STATUS": "Status",
       "ASSIGNEE_NAME": "Nazwa osoby przypisanej",
       "INBOX_NAME": "Nazwa skrzynki odbiorczej",
-      "TEAM_NAME": "Team Name",
-      "CONVERSATION_IDENTIFIER": "Conversation Identifier",
-      "CAMPAIGN_NAME": "Campaign Name",
+      "TEAM_NAME": "Nazwa zespołu",
+      "CONVERSATION_IDENTIFIER": "Identyfikator rozmowy",
+      "CAMPAIGN_NAME": "Nazwa kampanii",
       "LABELS": "Etykiety",
-      "BROWSER_LANGUAGE": "Browser Language",
-      "COUNTRY_NAME": "Country Name",
-      "REFERER_LINK": "Referer link",
-      "CUSTOM_ATTRIBUTE_LIST": "List",
-      "CUSTOM_ATTRIBUTE_TEXT": "Text",
-      "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-      "CUSTOM_ATTRIBUTE_LINK": "Link",
+      "BROWSER_LANGUAGE": "Język przeglądarki",
+      "COUNTRY_NAME": "Nazwa kraju",
+      "REFERER_LINK": "Strona odsyłająca",
+      "CUSTOM_ATTRIBUTE_LIST": "Lista",
+      "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
+      "CUSTOM_ATTRIBUTE_NUMBER": "Numer",
+      "CUSTOM_ATTRIBUTE_LINK": "Łącze",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-      "CREATED_AT": "Created At",
+      "CREATED_AT": "Utworzono",
       "LAST_ACTIVITY": "Ostatnia aktywność"
     },
     "GROUPS": {
-      "STANDARD_FILTERS": "Standard Filters",
-      "ADDITIONAL_FILTERS": "Additional Filters",
+      "STANDARD_FILTERS": "Filtry standardowe",
+      "ADDITIONAL_FILTERS": "Dodatkowe filtry",
       "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty"
     },
     "CUSTOM_VIEWS": {
@@ -65,8 +65,8 @@
           "ERROR_MESSAGE": "Błąd podczas tworzenia folderu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment created successfully",
-          "ERROR_MESSAGE": "Error while creating segment"
+          "SUCCESS_MESSAGE": "Segment utworzony pomyślnie",
+          "ERROR_MESSAGE": "Błąd podczas tworzenia segmentu"
         }
       },
       "DELETE": {
@@ -80,12 +80,12 @@
           }
         },
         "API_FOLDERS": {
-          "SUCCESS_MESSAGE": "Folder deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting folder"
+          "SUCCESS_MESSAGE": "Folder usunięty pomyślnie",
+          "ERROR_MESSAGE": "Błąd podczas usuwania folderu"
         },
         "API_SEGMENTS": {
-          "SUCCESS_MESSAGE": "Segment deleted successfully",
-          "ERROR_MESSAGE": "Error while deleting segment"
+          "SUCCESS_MESSAGE": "Zespół został usunięty pomyślnie",
+          "ERROR_MESSAGE": "Błąd podczas usuwania segmentu"
         }
       }
     }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index 1145aacef..2d9c8ff84 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -95,7 +95,7 @@
     "MULTI_SELECTOR": {
       "PLACEHOLDER": "Brak",
       "TITLE": {
-        "AGENT": "Wybierz agenta",
+        "AGENT": "Wybierz konsultanta",
         "TEAM": "Wybierz zespół"
       },
       "SEARCH": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/automation.json b/app/javascript/dashboard/i18n/locale/pl/automation.json
index d6adcbe72..ba28d5c79 100644
--- a/app/javascript/dashboard/i18n/locale/pl/automation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/automation.json
@@ -1,9 +1,9 @@
 {
   "AUTOMATION": {
-    "HEADER": "Automations",
+    "HEADER": "Automatyzacja",
     "HEADER_BTN_TXT": "Dodaj regułę automatyzacji",
-    "LOADING": "Fetching automation rules",
-    "SIDEBAR_TXT": "<p><b>Automation Rules</b> <p>Automation can replace and automate existing processes that require manual effort. You can do many things with automation, including adding labels and assigning conversation to the best agent. So the team focuses on what they do best and spends more little time on manual tasks.</p>",
+    "LOADING": "Pobieranie reguł automatyzacji",
+    "SIDEBAR_TXT": "<p><b>Reguły automatyzacji</b> <p>Automatyzacja może zastąpić i zautomatyzować istniejące procesy, które wymagają ręcznego wysiłku. Możesz zrobić wiele rzeczy za pomocą automatyzacji, w tym dodać etykiety i przypisać konwersację do najlepszego agenta. W efekcie zespół skupia się na tym, co robią najlepiej i może poświęcić więcej czasu na zadania wymagające ręcznej obsługi.</p>",
     "ADD": {
       "TITLE": "Dodaj regułę automatyzacji",
       "SUBMIT": "Stwórz",
@@ -12,29 +12,29 @@
         "NAME": {
           "LABEL": "Nazwa reguły",
           "PLACEHOLDER": "Wprowadź nazwę reguły",
-          "ERROR": "Name is required"
+          "ERROR": "Nazwa jest wymagana"
         },
         "DESC": {
           "LABEL": "Opis",
-          "PLACEHOLDER": "Enter rule description",
-          "ERROR": "Description is required"
+          "PLACEHOLDER": "Wprowadź opis reguły",
+          "ERROR": "Opis jest wymagany"
         },
         "EVENT": {
-          "LABEL": "Event",
+          "LABEL": "Zdarzenie",
           "PLACEHOLDER": "Please select one",
           "ERROR": "Event is required"
         },
         "CONDITIONS": {
-          "LABEL": "Conditions"
+          "LABEL": "Warunki"
         },
         "ACTIONS": {
           "LABEL": "Akcje"
         }
       },
-      "CONDITION_BUTTON_LABEL": "Add Condition",
-      "ACTION_BUTTON_LABEL": "Add Action",
+      "CONDITION_BUTTON_LABEL": "Dodaj warunek",
+      "ACTION_BUTTON_LABEL": "Dodaj akcję",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule added successfully",
+        "SUCCESS_MESSAGE": "Reguła automatyzacji została dodana",
         "ERROR_MESSAGE": "Could not able to create a automation rule, Please try again later"
       }
     },
@@ -42,13 +42,13 @@
       "TABLE_HEADER": [
         "Nazwa",
         "Opis",
-        "Active",
-        "Created on"
+        "Aktywna",
+        "Utworzona dnia"
       ],
-      "404": "No automation rules found"
+      "404": "Nie znaleziono reguł automatyzacji"
     },
     "DELETE": {
-      "TITLE": "Delete Automation Rule",
+      "TITLE": "Usuń regułę automatyzacji",
       "SUBMIT": "Usuń",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "CONFIRM": {
@@ -58,23 +58,23 @@
         "NO": "Nie, zachowaj "
       },
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule deleted successfully",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Reguła automatyzacji została usunięta",
+        "ERROR_MESSAGE": "Nie udało się usunąć reguły automatyzacji, spróbuj ponownie później"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "Edytuj regułę automatyzacji",
       "SUBMIT": "Aktualizuj",
       "CANCEL_BUTTON_TEXT": "Anuluj",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Reguła automatyzacji została zaktualizowana",
+        "ERROR_MESSAGE": "Nie udało się zaktualizować reguły automatyzacji, spróbuj ponownie później"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Klonuj",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
+        "SUCCESS_MESSAGE": "Reguła automatyzacji sklonowana pomyślnie",
         "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
       }
     },
@@ -91,26 +91,26 @@
     "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"
+      "TEAM_DROPDOWN_PLACEHOLDER": "Wybierz zespoły"
     },
     "TOGGLE": {
-      "ACTIVATION_TITLE": "Activate Automation Rule",
-      "DEACTIVATION_TITLE": "Deactivate Automation Rule",
+      "ACTIVATION_TITLE": "Aktywuj regułę automatyzacji",
+      "DEACTIVATION_TITLE": "Wyłącz regułę automatyzacji",
       "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_ERROR": "Nie można włączyć reguły automatyzacji, spróbuj ponownie później",
+      "DEACTIVATION_ERROR": "Nie można wyłączyć reguły automatyzacji, spróbuj ponownie później",
       "CONFIRMATION_LABEL": "Tak",
       "CANCEL_LABEL": "Nie"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "Nie udało się przesłać załącznika, spróbuj ponownie",
+      "LABEL_IDLE": "Prześlij załącznik",
       "LABEL_UPLOADING": "Przesyłanie...",
-      "LABEL_UPLOADED": "Succesfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Upload Failed"
+      "LABEL_UPLOADED": "Pomyślnie przesłano załącznik",
+      "LABEL_UPLOAD_FAILED": "Nie powiodło się przesyłanie załącznika"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/bulkActions.json b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
new file mode 100644
index 000000000..f99d9e323
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Wybierz Agenta",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Przypisz",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Rozwiąż",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/chatlist.json b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
index 84e1f198b..088d56b89 100644
--- a/app/javascript/dashboard/i18n/locale/pl/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/pl/chatlist.json
@@ -13,7 +13,7 @@
     },
     "FILTER_ALL": "Wszystkie",
     "ASSIGNEE_TYPE_TABS": {
-      "me": "Mine",
+      "me": "Moje",
       "unassigned": "Nieprzypisane",
       "all": "Wszystkie"
     },
@@ -54,12 +54,12 @@
     "RECEIVED_VIA_EMAIL": "Otrzymano przez e-mail",
     "VIEW_TWEET_IN_TWITTER": "Zobacz tweet na Twitterze",
     "REPLY_TO_TWEET": "Odpowiedz na ten tweet",
-    "LINK_TO_STORY": "Go to instagram story",
+    "LINK_TO_STORY": "Przejdź do opowieści na Instagramie",
     "SENT": "Wysłano pomyślnie",
     "NO_MESSAGES": "Brak wiadomości",
     "NO_CONTENT": "Brak treści",
     "HIDE_QUOTED_TEXT": "Ukryj cytat",
     "SHOW_QUOTED_TEXT": "Pokaż cytat",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Przeczytaj"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 4eefd1e28..c215aae28 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -73,8 +73,8 @@
   "DELETE_NOTE": {
     "CONFIRM": {
       "TITLE": "Potwierdź usunięcie",
-      "MESSAGE": "Are you want sure to delete this note?",
-      "YES": "Yes, Delete it",
+      "MESSAGE": "Czy na pewno chcesz usunąć tę notatkę?",
+      "YES": "Tak, usuń ją",
       "NO": "Nie, zachowaj"
     }
   },
diff --git a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
index 85c9319f8..f645fa425 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contactFilters.json
@@ -7,23 +7,23 @@
         "FILTER_DELETE_ERROR": "You should have atleast one filter to save",
         "SUBMIT_BUTTON_LABEL": "Prześlij",
         "CANCEL_BUTTON_LABEL": "Anuluj",
-        "CLEAR_BUTTON_LABEL": "Clear Filters",
-        "EMPTY_VALUE_ERROR": "Value is required",
+        "CLEAR_BUTTON_LABEL": "Wyczyść filtry",
+        "EMPTY_VALUE_ERROR": "Wartość jest wymagana",
         "TOOLTIP_LABEL": "Filter contacts",
         "QUERY_DROPDOWN_LABELS": {
             "AND": "i",
             "OR": "albo"
         },
         "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",
+            "equal_to": "Równa się",
+            "not_equal_to": "Nie równa się",
+            "contains": "Zawiera",
+            "does_not_contain": "Nie zawiera",
+            "is_present": "Istnieje",
+            "is_not_present": "Nie istnieje",
+            "is_greater_than": "Jest większe niż",
             "is_lesser_than": "Is lesser than",
-            "days_before": "Is x days before"
+            "days_before": "Jest x dni przed"
         },
         "ATTRIBUTES": {
             "NAME": "Nazwa",
@@ -32,16 +32,16 @@
             "IDENTIFIER": "Identifier",
             "CITY": "Miasto",
             "COUNTRY": "Kraj",
-            "CUSTOM_ATTRIBUTE_LIST": "List",
-            "CUSTOM_ATTRIBUTE_TEXT": "Text",
-            "CUSTOM_ATTRIBUTE_NUMBER": "Number",
-            "CUSTOM_ATTRIBUTE_LINK": "Link",
+            "CUSTOM_ATTRIBUTE_LIST": "Lista",
+            "CUSTOM_ATTRIBUTE_TEXT": "Tekst",
+            "CUSTOM_ATTRIBUTE_NUMBER": "Numer",
+            "CUSTOM_ATTRIBUTE_LINK": "Łącze",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Checkbox",
-            "CREATED_AT": "Created At",
+            "CREATED_AT": "Utworzono",
             "LAST_ACTIVITY": "Ostatnia aktywność"
         },
         "GROUPS": {
-            "STANDARD_FILTERS": "Standard Filters",
+            "STANDARD_FILTERS": "Filtry standardowe",
             "ADDITIONAL_FILTERS": "Dodatkowe filtry",
             "CUSTOM_ATTRIBUTES": "Niestandardowe atrybuty"
         }
diff --git a/app/javascript/dashboard/i18n/locale/pl/conversation.json b/app/javascript/dashboard/i18n/locale/pl/conversation.json
index ca23cfc17..17af3c110 100644
--- a/app/javascript/dashboard/i18n/locale/pl/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pl/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Wybierz rozmowę z lewej strony",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Tożsamość tego użytkownika nie jest zweryfikowana",
     "NO_MESSAGE_1": "Ups! Wygląda na to, że nie ma wiadomości od klientów w Twojej skrzynce odbiorczej.",
     "NO_MESSAGE_2": " aby wysłać wiadomość na swoją stronę!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Osoba, której odpowiadasz to:",
     "REMOVE_SELECTION": "Usuń zaznaczenie",
     "DOWNLOAD": "Pobierz",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Przesyłanie załączników...",
     "SUCCESS_DELETE_MESSAGE": "Wiadomość usunięta pomyślnie",
     "FAIL_DELETE_MESSSAGE": "Nie można usunąć wiadomości! Spróbuj ponownie",
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
index 630d5a977..fe4731195 100644
--- a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -14,7 +14,7 @@
         "NOTE": ""
       },
       "ACCOUNT_ID": {
-        "TITLE": "Account ID",
+        "TITLE": "ID konta",
         "NOTE": "This ID is required if you are building an API based integration"
       },
       "NAME": {
@@ -48,7 +48,7 @@
       }
     },
     "UPDATE_CHATWOOT": "Aktualizacja %{latestChatwootVersion} dla Chatwoot jest dostępna. Proszę zaktualizować swoją instancję.",
-    "LEARN_MORE": "Learn more"
+    "LEARN_MORE": "Dowiedz się więcej"
   },
   "FORMS": {
     "MULTISELECT": {
@@ -60,11 +60,11 @@
   "NOTIFICATIONS_PAGE": {
     "HEADER": "Powiadomienia",
     "MARK_ALL_DONE": "Zaznacz wszystko jako zakończone",
-    "DELETE_TITLE": "deleted",
+    "DELETE_TITLE": "usunięte",
     "UNREAD_NOTIFICATION": {
       "TITLE": "Unread Notifications",
-      "ALL_NOTIFICATIONS": "View all notifications",
-      "LOADING_UNREAD_MESSAGE": "Loading unread notifications...",
+      "ALL_NOTIFICATIONS": "Zobacz wszystkie powiadomienia",
+      "LOADING_UNREAD_MESSAGE": "Ładowanie nieprzeczytanych powiadomień...",
       "EMPTY_MESSAGE": "You have no unread notifications"
     },
     "LIST": {
@@ -89,24 +89,24 @@
       "TEXT": "Disconnected from Chatwoot"
     },
     "BUTTON": {
-      "REFRESH": "Refresh"
+      "REFRESH": "Odśwież"
     }
   },
   "COMMAND_BAR": {
-    "SEARCH_PLACEHOLDER": "Search or jump to",
+    "SEARCH_PLACEHOLDER": "Szukaj lub przejdź do",
     "SECTIONS": {
-      "GENERAL": "General",
+      "GENERAL": "Ogólne",
       "REPORTS": "Raporty",
       "CONVERSATION": "Rozmowa",
-      "CHANGE_ASSIGNEE": "Change Assignee",
-      "CHANGE_TEAM": "Change Team",
-      "ADD_LABEL": "Add label to the conversation",
-      "REMOVE_LABEL": "Remove label from the conversation",
+      "CHANGE_ASSIGNEE": "Zmień przypisaną osobę",
+      "CHANGE_TEAM": "Zmień zespół",
+      "ADD_LABEL": "Dodaj etykietę do rozmowy",
+      "REMOVE_LABEL": "Usuń etykietę z rozmowy",
       "SETTINGS": "Ustawienia"
     },
     "COMMANDS": {
-      "GO_TO_CONVERSATION_DASHBOARD": "Go to Conversation Dashboard",
-      "GO_TO_CONTACTS_DASHBOARD": "Go to Contacts Dashboard",
+      "GO_TO_CONVERSATION_DASHBOARD": "Przejdź do Panelu Rozmów",
+      "GO_TO_CONTACTS_DASHBOARD": "Przejdź do Panelu Kontaktów",
       "GO_TO_REPORTS_OVERVIEW": "Go to Reports Overview",
       "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
       "GO_TO_AGENT_REPORTS": "Go to Agent Reports",
@@ -118,17 +118,17 @@
       "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",
+      "GO_TO_SETTINGS_APPLICATIONS": "Przejdź do Ustawień Aplikacji",
+      "GO_TO_SETTINGS_ACCOUNT": "Przejdź do ustawień konta",
+      "GO_TO_SETTINGS_PROFILE": "Przejdź do ustawień profilu",
+      "GO_TO_NOTIFICATIONS": "Przejdź do Powiadomień",
+      "ADD_LABELS_TO_CONVERSATION": "Dodaj etykietę do rozmowy",
+      "ASSIGN_AN_AGENT": "Przypisz przedstawiciela",
+      "ASSIGN_A_TEAM": "Przypisz zespół",
+      "MUTE_CONVERSATION": "Wycisz rozmowę",
+      "UNMUTE_CONVERSATION": "Wyłącz wyciszenie rozmowy",
+      "REMOVE_LABEL_FROM_CONVERSATION": "Usuń etykietę z rozmowy",
+      "REOPEN_CONVERSATION": "Otwórz ponownie rozmowę",
       "RESOLVE_CONVERSATION": "Rozwiąż rozmowę",
       "SEND_TRANSCRIPT": "Wyślij transkrypt rozmowy",
       "SNOOZE_CONVERSATION": "Wycisz rozmowę",
diff --git a/app/javascript/dashboard/i18n/locale/pl/index.js b/app/javascript/dashboard/i18n/locale/pl/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/pl/index.js
+++ b/app/javascript/dashboard/i18n/locale/pl/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
index 4921d3546..a2a857c81 100644
--- a/app/javascript/dashboard/i18n/locale/pl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/pl/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/pl/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/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/pt/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
new file mode 100644
index 000000000..f2b4ed562
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Escolher Agente",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Atribuir",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolver",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/conversation.json b/app/javascript/dashboard/i18n/locale/pt/conversation.json
index 2eec36467..a5ae9d6ee 100644
--- a/app/javascript/dashboard/i18n/locale/pt/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Por favor, selecione uma conversa no painel da esquerda",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Está a responder a:",
     "REMOVE_SELECTION": "Remover seleção",
     "DOWNLOAD": "BAIXAR",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Carregando anexos...",
     "SUCCESS_DELETE_MESSAGE": "Mensagem apagada com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível apagar a mensagem! Tente novamente",
diff --git a/app/javascript/dashboard/i18n/locale/pt/index.js b/app/javascript/dashboard/i18n/locale/pt/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/pt/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 005c6c4f5..52095c0aa 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Assinatura de mensagem pessoal",
-        "NOTE": "Crie uma assinatura de mensagem pessoal que será adicionada a todas as mensagens que você envia a partir da plataforma. Use o editor de conteúdo para criar uma assinatura altamente personalizada.",
+        "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": "Salvar assinatura da mensagem",
         "API_ERROR": "Couldn't save signature! Try again",
         "API_SUCCESS": "Signature saved successfully"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Equipa",
     "SET_AVAILABILITY_TITLE": "Defina-se como",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Visão geral"
+    "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"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Não conseguimos encontrar nenhuma conta do Chatwoot. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/pt/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/pt/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/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/pt_BR/bulkActions.json b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
new file mode 100644
index 000000000..868fd40b3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversas selecionadas",
+        "AGENT_SELECT_LABEL": "Selecione Agente",
+        "ASSIGN_CONFIRMATION_LABEL": "Você tem certeza que deseja atribuir %{conversationCount} %{conversationLabel} para",
+        "GO_BACK_LABEL": "Voltar atrás",
+        "ASSIGN_LABEL": "Atribua",
+        "ASSIGN_AGENT_TOOLTIP": "Atribuir Agente",
+        "RESOLVE_TOOLTIP": "Resolver",
+        "ASSIGN_SUCCESFUL": "Conversas atribuídas com sucesso",
+        "ASSIGN_FAILED": "Falha ao atribuir conversas, por favor, tente novamente",
+        "RESOLVE_SUCCESFUL": "Conversas resolvidas com sucesso",
+        "RESOLVE_FAILED": "Falha ao resolver conversas, por favor, tente novamente",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Conversas visíveis nesta página só estão selecionadas.",
+        "AGENT_LIST_LOADING": "Carregando agentes"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
index abc748eeb..98d3e771f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Por favor, selecione uma conversa no painel da esquerda",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Você está respondendo a:",
     "REMOVE_SELECTION": "Remover Seleção",
     "DOWNLOAD": "Baixar",
+    "UNKNOWN_FILE_TYPE": "Arquivo Desconhecido",
     "UPLOADING_ATTACHMENTS": "Enviando anexos...",
     "SUCCESS_DELETE_MESSAGE": "Mensagem excluída com sucesso",
     "FAIL_DELETE_MESSSAGE": "Não foi possível excluir a mensagem! Tente novamente",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index aa3eab28a..710afb5d1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Assinatura de mensagens pessoais",
-        "NOTE": "Crie uma assinatura de mensagem pessoal que será adicionada a todas as mensagens que você envia a partir da plataforma. Use o editor de conteúdo rico para criar uma assinatura altamente personalizada.",
+        "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": "Salvar assinatura da mensagem",
         "API_ERROR": "Não foi possível salvar a assinatura! Tente novamente",
         "API_SUCCESS": "Assinatura salva com sucesso"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Times",
     "SET_AVAILABILITY_TITLE": "Defina como",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Visão geral"
+    "REPORTS_OVERVIEW": "Visão geral",
+    "FACEBOOK_REAUTHORIZE": "Sua conexão com o Facebook expirou! Por favor, reconecte sua página do Facebook para continuar os serviços"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ah oh! Não conseguimos encontrar nenhuma conta. Por favor, crie uma nova conta para continuar.",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
new file mode 100644
index 000000000..feeb37502
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/whatsappTemplates.json
@@ -0,0 +1,25 @@
+{
+    "WHATSAPP_TEMPLATES": {
+        "MODAL": {
+            "TITLE": "Templates do Whatsapp",
+            "SUBTITLE": "Selecione o template do whatsapp que você deseja enviar",
+            "TEMPLATE_SELECTED_SUBTITLE": "Processar %{templateName}"
+        },
+        "PICKER": {
+            "SEARCH_PLACEHOLDER": "Pesquisar Templates",
+            "NO_TEMPLATES_FOUND": "Não há templates encontrados para",
+            "LABELS": {
+                "LANGUAGE": "Idioma",
+                "TEMPLATE_BODY": "Corpo do Template",
+                "CATEGORY": "Categoria"
+            }
+        },
+        "PARSER": {
+            "VARIABLES_LABEL": "Variáveis",
+            "VARIABLE_PLACEHOLDER": "Insira o valor para %{variable}",
+            "GO_BACK_LABEL": "Voltar",
+            "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/bulkActions.json b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
new file mode 100644
index 000000000..ba613d258
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Selectează agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Atribuiți",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Rezolvă",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/conversation.json b/app/javascript/dashboard/i18n/locale/ro/conversation.json
index aacc7f172..f154dc30e 100644
--- a/app/javascript/dashboard/i18n/locale/ro/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ro/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vă rugăm să selectați o conversație din panoul din stânga",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Identitatea acestui utilizator nu este verificată",
     "NO_MESSAGE_1": "Uh oh! Se pare că nu există niciun mesaj de la clienți în căsuța poștală.",
     "NO_MESSAGE_2": " pentru a trimite un mesaj către pagina ta!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Răspundeți la:",
     "REMOVE_SELECTION": "Elimină selecția",
     "DOWNLOAD": "Descărcare",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Se încarcă atașamentele...",
     "SUCCESS_DELETE_MESSAGE": "Mesaj şters cu succes",
     "FAIL_DELETE_MESSSAGE": "Mesajul nu a putut fi șters! Încercați din nou",
diff --git a/app/javascript/dashboard/i18n/locale/ro/index.js b/app/javascript/dashboard/i18n/locale/ro/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ro/index.js
+++ b/app/javascript/dashboard/i18n/locale/ro/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index f23e35c9d..ead10ad2d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Semnătura mesajului personal",
-        "NOTE": "Creați o semnătură de mesaj personal care ar fi adăugată la toate mesajele pe care le trimiteți de pe platformă. Utilizați editorul de conținut îmbogățit pentru a crea o semnătură extrem de personalizată.",
+        "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": "Salvarea semnăturii mesajului",
         "API_ERROR": "Nu s-a putut trimite! Încearcă din nou",
         "API_SUCCESS": "Semnătura salvată cu succes"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Echipa",
     "SET_AVAILABILITY_TITLE": "Setați-vă ca",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Prezentare generală"
+    "REPORTS_OVERVIEW": "Prezentare generală",
+    "FACEBOOK_REAUTHORIZE": "Conexiunea ta de Facebook a expirat, te rugăm să-ți reconectezi pagina de Facebook pentru a continua serviciile"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! Nu am putut găsi niciun cont Chatwoot. Vă rugăm să creați un cont nou pentru a continua.",
diff --git a/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ro/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/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/ru/bulkActions.json b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
new file mode 100644
index 000000000..86d29b5cc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Выбрать Агента",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Назначить",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Завершить",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index ec4bfc1cf..83167558e 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Пожалуйста, выберите диалог из левой панели",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Подлинность этого пользователя не подтверждена",
     "NO_MESSAGE_1": "Ой! Похоже, сообщений от клиентов нет.",
     "NO_MESSAGE_2": " чтобы отправить сообщение на вашу страницу!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Вы отвечаете на:",
     "REMOVE_SELECTION": "Удалить выделенное",
     "DOWNLOAD": "Скачать",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Загрузка вложений...",
     "SUCCESS_DELETE_MESSAGE": "Сообщение успешно удалено",
     "FAIL_DELETE_MESSSAGE": "Не удалось удалить сообщение! Попробуйте еще раз",
diff --git a/app/javascript/dashboard/i18n/locale/ru/index.js b/app/javascript/dashboard/i18n/locale/ru/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ru/index.js
+++ b/app/javascript/dashboard/i18n/locale/ru/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index b55938b42..8c28e454b 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Подпись личных сообщений",
-        "NOTE": "Создайте подпись для личных сообщений, которая будет добавлена ко всем сообщениям, которые вы отправляете из платформы. Используйте редактор контента для создания персональной подписи.",
+        "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": "Сохранить подпись",
         "API_ERROR": "Не удалось сохранить подпись! Повторите попытку",
         "API_SUCCESS": "Подпись успешно сохранена"
@@ -151,7 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Сейчас просматривается:",
-    "SWITCH": "Switch",
+    "SWITCH": "Переключить",
     "CONVERSATIONS": "Диалоги",
     "ALL_CONVERSATIONS": "Диалоги",
     "MENTIONED_CONVERSATIONS": "Упоминания",
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Команда",
     "SET_AVAILABILITY_TITLE": "Установить себя",
     "BETA": "Бета",
-    "REPORTS_OVERVIEW": "Обзор"
+    "REPORTS_OVERVIEW": "Обзор",
+    "FACEBOOK_REAUTHORIZE": "Ваше подключение к Facebook истекло. Пожалуйста, переподключитесь к Facebook для продолжения работы"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Мы не смогли найти ни одного аккаунта в Chatwoot. Пожалуйста, создайте новый аккаунт, чтобы продолжить.",
diff --git a/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/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/sk/bulkActions.json b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
new file mode 100644
index 000000000..df41f8819
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Vybrat agenta",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Vyriešiť",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
index 9d41cc486..64d748f97 100644
--- a/app/javascript/dashboard/i18n/locale/sk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vyberte si konverzáciu z ľavého panela",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Totožnosť tohto používateľa nie je overená",
     "NO_MESSAGE_1": "Zdá sa, že v doručenej pošte nemáte žiadne správy od zákazníkov.",
     "NO_MESSAGE_2": " poslať správu na svoju stránku!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Odpovedáte na:",
     "REMOVE_SELECTION": "Odstrániť výber",
     "DOWNLOAD": "Stiahnuť",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Prílohy sa nahrávajú...",
     "SUCCESS_DELETE_MESSAGE": "Správa bola úspešne odstránená",
     "FAIL_DELETE_MESSSAGE": "Správu sa nepodarilo vymazať! Skúste to znova",
diff --git a/app/javascript/dashboard/i18n/locale/sk/index.js b/app/javascript/dashboard/i18n/locale/sk/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/sk/index.js
+++ b/app/javascript/dashboard/i18n/locale/sk/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
index ee2176c1c..f8fc86516 100644
--- a/app/javascript/dashboard/i18n/locale/sk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Prehľad"
+    "REPORTS_OVERVIEW": "Prehľad",
+    "FACEBOOK_REAUTHORIZE": "Vaše pripojenie k Facebooku vypršalo, pre pokračovanie v službách prosím znovu pripojte svoju stránku na Facebooku"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sk/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/sk/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/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/sr/bulkActions.json b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sr/conversation.json b/app/javascript/dashboard/i18n/locale/sr/conversation.json
index 43ede0f0c..982f41439 100644
--- a/app/javascript/dashboard/i18n/locale/sr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sr/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Izaberite razgovor sa leve strane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/sr/index.js b/app/javascript/dashboard/i18n/locale/sr/index.js
new file mode 100644
index 000000000..9b8773a64
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/index.js
@@ -0,0 +1,53 @@
+import { default as _advancedFilters } from './advancedFilters.json';
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
+import { default as _campaign } from './campaign.json';
+import { default as _cannedMgmt } from './cannedMgmt.json';
+import { default as _chatlist } from './chatlist.json';
+import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
+import { default as _conversation } from './conversation.json';
+import { default as _csatMgmtMgmt } from './csatMgmt.json';
+import { default as _generalSettings } from './generalSettings.json';
+import { default as _inboxMgmt } from './inboxMgmt.json';
+import { default as _integrationApps } from './integrationApps.json';
+import { default as _integrations } from './integrations.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
+import { default as _login } from './login.json';
+import { default as _report } from './report.json';
+import { default as _resetPassword } from './resetPassword.json';
+import { default as _setNewPassword } from './setNewPassword.json';
+import { default as _settings } from './settings.json';
+import { default as _signup } from './signup.json';
+import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
+
+export default {
+  ..._advancedFilters,
+  ..._agentMgmt,
+  ..._attributesMgmt,
+  ..._automation,
+  ..._campaign,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._contactFilters,
+  ..._conversation,
+  ..._csatMgmtMgmt,
+  ..._generalSettings,
+  ..._inboxMgmt,
+  ..._integrationApps,
+  ..._integrations,
+  ..._labelsMgmt,
+  ..._login,
+  ..._report,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
+};
diff --git a/app/javascript/dashboard/i18n/locale/sr/settings.json b/app/javascript/dashboard/i18n/locale/sr/settings.json
index e248e028f..7f79ebfa1 100644
--- a/app/javascript/dashboard/i18n/locale/sr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sr/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/sr/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sr/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/sv/bulkActions.json b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
new file mode 100644
index 000000000..41266b53b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Välj agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Tilldela",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Lös",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/conversation.json b/app/javascript/dashboard/i18n/locale/sv/conversation.json
index 9b7b0878e..d207dce74 100644
--- a/app/javascript/dashboard/i18n/locale/sv/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/sv/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Välj en konversation från vänster panel",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Oj då! Det ser ut som att det inte finns några meddelanden från kunder i din inkorg.",
     "NO_MESSAGE_2": " för att skicka ett meddelande till din sida!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Du svarar:",
     "REMOVE_SELECTION": "Ta bort urval",
     "DOWNLOAD": "Hämta",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Laddar upp bilagor...",
     "SUCCESS_DELETE_MESSAGE": "Meddelandet har tagits bort",
     "FAIL_DELETE_MESSSAGE": "Det gick inte att ta bort meddelande! Försök igen",
diff --git a/app/javascript/dashboard/i18n/locale/sv/index.js b/app/javascript/dashboard/i18n/locale/sv/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/sv/index.js
+++ b/app/javascript/dashboard/i18n/locale/sv/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
index 46489d342..0c2496bda 100644
--- a/app/javascript/dashboard/i18n/locale/sv/settings.json
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Din Facebook-anslutning har löpt ut, vänligen återanslut din Facebook-sida för att fortsätta med tjänsterna"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/sv/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/sv/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/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/ta/bulkActions.json b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
new file mode 100644
index 000000000..b67a47d02
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "தீர்",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
index 3145f753b..ad4e0a091 100644
--- a/app/javascript/dashboard/i18n/locale/ta/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "இடது பலகத்தில் இருந்து உரையாடலைத் தேர்ந்தெடுக்கவும்",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "அடடா! உங்கள் இன்பாக்ஸில் வாடிக்கையாளர்களிடமிருந்து செய்திகள் எதுவும் இல்லை.",
     "NO_MESSAGE_2": " உங்கள் பக்கத்திற்கு ஒரு செய்தியை அனுப்ப!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "பதிவிறக்கம்",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ta/index.js b/app/javascript/dashboard/i18n/locale/ta/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/ta/index.js
+++ b/app/javascript/dashboard/i18n/locale/ta/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
index 896ae0d6d..b2e3bd6ca 100644
--- a/app/javascript/dashboard/i18n/locale/ta/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ta/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ta/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/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/th/bulkActions.json b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
new file mode 100644
index 000000000..6c8d8c579
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "เลือกพนักงาน",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "มอบหมาย",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "เสร็จสิ้น",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/th/conversation.json b/app/javascript/dashboard/i18n/locale/th/conversation.json
index e55374670..e880af71f 100644
--- a/app/javascript/dashboard/i18n/locale/th/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/th/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "กรุณาเลือกการสนทนาจากด้านซ้าย",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "ข้อมูลระบุตัวตนของผู้ใช้รายนี้ยังไม่ได้รับการยืนยัน",
     "NO_MESSAGE_1": "โอ้ว ไม่นะเหมือนจะไม่มีข้อความจากลูกค้าของคุณในกล่องข้อความ",
     "NO_MESSAGE_2": " เพื่อส่งข้อความไปยังเพจของคุณ!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "คุณกำลังตอบกลับ:",
     "REMOVE_SELECTION": "ลบตัวเลือก",
     "DOWNLOAD": "ดาวโหลด",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "กำลังอัปโหลดไฟล์แนบ",
     "SUCCESS_DELETE_MESSAGE": "ลบข้อความสำเร็จเเล้ว",
     "FAIL_DELETE_MESSSAGE": "ไม่สามารถลบข้อความได้ โปรดลองใหม่อีกครั้ง",
diff --git a/app/javascript/dashboard/i18n/locale/th/index.js b/app/javascript/dashboard/i18n/locale/th/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/th/index.js
+++ b/app/javascript/dashboard/i18n/locale/th/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/th/settings.json b/app/javascript/dashboard/i18n/locale/th/settings.json
index 67e6b5e42..b0919e5d3 100644
--- a/app/javascript/dashboard/i18n/locale/th/settings.json
+++ b/app/javascript/dashboard/i18n/locale/th/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "ลายเซ็นส่วนตัว",
-        "NOTE": "สร้างลายเซ็นส่วนตัวที่จะเพิ่มในส่วนท้ายของข้อความที่คุณส่ง คุณสามารถใช้เครื่องมือแก้ไขริชคอนเทนท์เพื่อปรับแต่งลายเซ็นของคุณให้มีเอกลักษณ์ยิ่งขึ้น",
+        "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": "บันทึกลายเซ็น",
         "API_ERROR": "ไม่สามารถบันทึกลายเซ็นได้ โปรดลองใหม่อีกครั้ง",
         "API_SUCCESS": "บันทึกลายเซ็นสำเร็จแล้ว"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "ทีม",
     "SET_AVAILABILITY_TITLE": "ตั้งสถานะเป็น...",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "ภาพรวม"
+    "REPORTS_OVERVIEW": "ภาพรวม",
+    "FACEBOOK_REAUTHORIZE": "การเชื่อมต่อกับ Facebook หมดอายุแล้ว โปรดเชื่อมต่อใหม่อีกครั้ง"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "ไม่นะ! ดูเหมือนว่าเราจะไม่เจอบัญชี Chatwoot ของคุณ โปรดสร้างบัญชีใหม่เพื่อดำเนินการต่อ",
diff --git a/app/javascript/dashboard/i18n/locale/th/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/th/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/th/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/tr/bulkActions.json b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
new file mode 100644
index 000000000..e639e2220
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} görüşme seçildi",
+        "AGENT_SELECT_LABEL": "Temsilci Seçin",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Geri git",
+        "ASSIGN_LABEL": "Atama yap",
+        "ASSIGN_AGENT_TOOLTIP": "Temsilci Atama",
+        "RESOLVE_TOOLTIP": "Çözüldü",
+        "ASSIGN_SUCCESFUL": "Görüşmeler başarıyla atandı",
+        "ASSIGN_FAILED": "Görüşmeler atanamadı, lütfen tekrar deneyin",
+        "RESOLVE_SUCCESFUL": "Görüşmeler başarıyla çözüldü",
+        "RESOLVE_FAILED": "Görüşmeler çözülemedi, lütfen tekrar deneyin",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Bu sayfada yalnızca seçili konuşmalar gözükür.",
+        "AGENT_LIST_LOADING": "Temsilciler Yükleniyor"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
index 7d9120f8d..1478bd738 100644
--- a/app/javascript/dashboard/i18n/locale/tr/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Lütfen sol bölmeden bir konuşma seçin",
+    "DASHBOARD_APP_TAB_MESSAGES": "Mesajlar",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "Görünüşe göre gelen kutunuzda müşterilerden hiç mesaj yok.",
     "NO_MESSAGE_2": "sayfanıza bir mesaj göndermek için!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Cevap veriyorsun:",
     "REMOVE_SELECTION": "Seçimi Kaldır",
     "DOWNLOAD": "İndir",
+    "UNKNOWN_FILE_TYPE": "Bilinmeyen Dosya",
     "UPLOADING_ATTACHMENTS": "Dosyalar gönderiliyor...",
     "SUCCESS_DELETE_MESSAGE": "Mesaj başarıyla silindi",
     "FAIL_DELETE_MESSSAGE": "Mesaj silinemiyor. Tekrar deneyin",
diff --git a/app/javascript/dashboard/i18n/locale/tr/index.js b/app/javascript/dashboard/i18n/locale/tr/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/tr/index.js
+++ b/app/javascript/dashboard/i18n/locale/tr/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
index bddab7492..6347dcc16 100644
--- a/app/javascript/dashboard/i18n/locale/tr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "İmzanız",
-        "NOTE": "Oluşturacağınız imzanız bu platformdan yapacağınız tüm yazışmalara eklenecektir. Daha fazla özelleştirmek için zengin metin editörünü kullanın.",
+        "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": "İmzanızı kaydedin",
         "API_ERROR": "İmza kaydedilemedi! Tekrar deneyin",
         "API_SUCCESS": "İmza başarıyla kaydedildi"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Ekip",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Önizleme"
+    "REPORTS_OVERVIEW": "Önizleme",
+    "FACEBOOK_REAUTHORIZE": "Facebook bağlantınızın süresi doldu, hizmetlere devam etmek için lütfen Facebook sayfanızı yeniden bağlayın"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/tr/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/tr/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/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/uk/bulkActions.json b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
new file mode 100644
index 000000000..9c84885d9
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Виберіть агента",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Призначити",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Вирішити",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/conversation.json b/app/javascript/dashboard/i18n/locale/uk/conversation.json
index 6713ad050..7401c0e14 100644
--- a/app/javascript/dashboard/i18n/locale/uk/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/uk/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Будь ласка, виберіть бесіду з лівої панелі",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Користувач не верифікований",
     "NO_MESSAGE_1": "Ой! Схоже, у вашій поштовій скринці немає ніяких повідомлень.",
     "NO_MESSAGE_2": " щоб надіслати повідомлення на вашу сторінку!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Ви відповідаєте:",
     "REMOVE_SELECTION": "Видалити вибране",
     "DOWNLOAD": "Звантажити",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Завантаження вкладень...",
     "SUCCESS_DELETE_MESSAGE": "Повідомлення успішно видалено",
     "FAIL_DELETE_MESSSAGE": "Не вдалося видалити повідомлення! Спробуйте ще раз",
diff --git a/app/javascript/dashboard/i18n/locale/uk/index.js b/app/javascript/dashboard/i18n/locale/uk/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/uk/index.js
+++ b/app/javascript/dashboard/i18n/locale/uk/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index ddcd2fad8..d5dbd201f 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Підпис особистого повідомлення",
-        "NOTE": "Створити особистий підпис повідомлення, який буде додано до всіх надісланих вами повідомлень на платформі. Використовуйте редактор контенту для створення персоналізованого підпису.",
+        "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": "Зберегти підпис повідомлення",
         "API_ERROR": "Не вдалося зберегти підпис! Повторіть спробу",
         "API_SUCCESS": "Підпис успішно збережено"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Команда",
     "SET_AVAILABILITY_TITLE": "Позначити себе як",
     "BETA": "Бета-версія",
-    "REPORTS_OVERVIEW": "Огляд"
+    "REPORTS_OVERVIEW": "Огляд",
+    "FACEBOOK_REAUTHORIZE": "Підключення до Facebook закінчилося, будь ласка, поновіть сторінку Facebook, щоб продовжити роботу служб"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ой! Ми не змогли знайти жодного облікового запису Chatwoot. Будь ласка, створіть новий обліковий запис, щоб продовжити.",
diff --git a/app/javascript/dashboard/i18n/locale/uk/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/uk/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/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/ur/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
new file mode 100644
index 000000000..e540720a3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "حل کریں۔",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur/conversation.json b/app/javascript/dashboard/i18n/locale/ur/conversation.json
index f3aa63d28..6ebf0a0a9 100644
--- a/app/javascript/dashboard/i18n/locale/ur/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "براہ کرم بائیں پین سے گفتگو کا انتخاب کریں۔",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "اس صارف کی شناخت کی تصدیق نہیں ہوئی ہے۔",
     "NO_MESSAGE_1": "اوہ! ایسا لگتا ہے کہ آپ کے ان باکس میں صارفین کی جانب سے کوئی پیغامات نہیں ہیں۔.",
     "NO_MESSAGE_2": " اپنے صفحہ پر پیغام بھیجنے کے لیے!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "آپ جواب دے رہے ہیں:",
     "REMOVE_SELECTION": "انتخاب کو ہٹا دیں۔",
     "DOWNLOAD": "ڈاؤن لوڈ کریں",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "منسلکات اپ لوڈ ہو رہی ہیں...",
     "SUCCESS_DELETE_MESSAGE": "پیغام کامیابی سے حذف ہو گیا۔",
     "FAIL_DELETE_MESSSAGE": "پیغام کو حذف نہیں کیا جا سکا! دوبارہ کوشش کریں",
diff --git a/app/javascript/dashboard/i18n/locale/ur/index.js b/app/javascript/dashboard/i18n/locale/ur/index.js
new file mode 100644
index 000000000..9b8773a64
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/index.js
@@ -0,0 +1,53 @@
+import { default as _advancedFilters } from './advancedFilters.json';
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
+import { default as _campaign } from './campaign.json';
+import { default as _cannedMgmt } from './cannedMgmt.json';
+import { default as _chatlist } from './chatlist.json';
+import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
+import { default as _conversation } from './conversation.json';
+import { default as _csatMgmtMgmt } from './csatMgmt.json';
+import { default as _generalSettings } from './generalSettings.json';
+import { default as _inboxMgmt } from './inboxMgmt.json';
+import { default as _integrationApps } from './integrationApps.json';
+import { default as _integrations } from './integrations.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
+import { default as _login } from './login.json';
+import { default as _report } from './report.json';
+import { default as _resetPassword } from './resetPassword.json';
+import { default as _setNewPassword } from './setNewPassword.json';
+import { default as _settings } from './settings.json';
+import { default as _signup } from './signup.json';
+import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
+
+export default {
+  ..._advancedFilters,
+  ..._agentMgmt,
+  ..._attributesMgmt,
+  ..._automation,
+  ..._campaign,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._contactFilters,
+  ..._conversation,
+  ..._csatMgmtMgmt,
+  ..._generalSettings,
+  ..._inboxMgmt,
+  ..._integrationApps,
+  ..._integrations,
+  ..._labelsMgmt,
+  ..._login,
+  ..._report,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ur/settings.json b/app/javascript/dashboard/i18n/locale/ur/settings.json
index fad2a9db1..941472e0a 100644
--- a/app/javascript/dashboard/i18n/locale/ur/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ur/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ur/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur/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/ur_IN/bulkActions.json b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
new file mode 100644
index 000000000..bfd688bef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Select Agent",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Resolve",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
index ac25a5aed..c38fb16a4 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Please select a conversation from left pane",
+    "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!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "Download",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/index.js b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
new file mode 100644
index 000000000..9b8773a64
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/index.js
@@ -0,0 +1,53 @@
+import { default as _advancedFilters } from './advancedFilters.json';
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _attributesMgmt } from './attributesMgmt.json';
+import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
+import { default as _campaign } from './campaign.json';
+import { default as _cannedMgmt } from './cannedMgmt.json';
+import { default as _chatlist } from './chatlist.json';
+import { default as _contact } from './contact.json';
+import { default as _contactFilters } from './contactFilters.json';
+import { default as _conversation } from './conversation.json';
+import { default as _csatMgmtMgmt } from './csatMgmt.json';
+import { default as _generalSettings } from './generalSettings.json';
+import { default as _inboxMgmt } from './inboxMgmt.json';
+import { default as _integrationApps } from './integrationApps.json';
+import { default as _integrations } from './integrations.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
+import { default as _login } from './login.json';
+import { default as _report } from './report.json';
+import { default as _resetPassword } from './resetPassword.json';
+import { default as _setNewPassword } from './setNewPassword.json';
+import { default as _settings } from './settings.json';
+import { default as _signup } from './signup.json';
+import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
+
+export default {
+  ..._advancedFilters,
+  ..._agentMgmt,
+  ..._attributesMgmt,
+  ..._automation,
+  ..._campaign,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._contactFilters,
+  ..._conversation,
+  ..._csatMgmtMgmt,
+  ..._generalSettings,
+  ..._inboxMgmt,
+  ..._integrationApps,
+  ..._integrations,
+  ..._labelsMgmt,
+  ..._login,
+  ..._report,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
index 00a18d8ed..977f9e50d 100644
--- a/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/ur_IN/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ur_IN/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ur_IN/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/vi/bulkActions.json b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
new file mode 100644
index 000000000..486a1b7cd
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "Chọn đại lý",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Phân công",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "Giải quyết",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
index bc049c9a7..7109a0016 100644
--- a/app/javascript/dashboard/i18n/locale/vi/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Vui lòng chọn một cuộc trò chuyện từ ngăn bên trái",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "Danh tính của người dùng này không được xác thực",
     "NO_MESSAGE_1": "Uh oh! Có vẻ như không có tin nhắn nào từ khách hàng trong hộp thư đến của bạn.",
     "NO_MESSAGE_2": " gửi tin nhắn đến trang của bạn!",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "Bạn đang trả lời:",
     "REMOVE_SELECTION": "Xóa lựa chọn",
     "DOWNLOAD": "Tải xuống",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Đang tải file đính kèm...",
     "SUCCESS_DELETE_MESSAGE": "Tin nhắn được xoá thành công",
     "FAIL_DELETE_MESSSAGE": "Không thể xoá tin nhắn! Thử lại",
diff --git a/app/javascript/dashboard/i18n/locale/vi/index.js b/app/javascript/dashboard/i18n/locale/vi/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/vi/index.js
+++ b/app/javascript/dashboard/i18n/locale/vi/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
index cdc85623d..a7ab2c7d4 100644
--- a/app/javascript/dashboard/i18n/locale/vi/settings.json
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Chữ ký tin nhắn cá nhân",
-        "NOTE": "Tạo chữ ký tin nhắn cá nhân sẽ được thêm vào tất cả các tin nhắn bạn gửi từ một nền tảng. Sử dụng trình soạn thảo nội dung đa dạng thức để tạo chữ ký được cá nhân hóa cao.",
+        "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": "Lưu chữ ký tin nhắn",
         "API_ERROR": "Không thể lưu chữ ký! Thử lại",
         "API_SUCCESS": "Chữ ký được lưu thành công"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Nhóm",
     "SET_AVAILABILITY_TITLE": "Đặt chính mình như",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Tổng quan"
+    "REPORTS_OVERVIEW": "Tổng quan",
+    "FACEBOOK_REAUTHORIZE": "Kết nối Facebook của bạn đã hết hạn, vui lòng kết nối lại trang Facebook của bạn để tiếp tục dịch vụ"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Ồ ồ! Chúng tôi không thể tìm thấy bất kỳ tài khoản Chatwoot nào. Vui lòng tạo một tài khoản mới để tiếp tục.",
diff --git a/app/javascript/dashboard/i18n/locale/vi/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/vi/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/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/zh/index.js b/app/javascript/dashboard/i18n/locale/zh/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/zh/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
new file mode 100644
index 000000000..3d8727130
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "选择代理",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "Assign",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "已解决",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
index 8ea99aa9d..94a0adab6 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "请从左侧窗格选择一个对话",
+    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "您的收件箱中似乎没有客户的消息。",
     "NO_MESSAGE_2": " 向您的页面发送一条消息！",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "You are replying to:",
     "REMOVE_SELECTION": "Remove Selection",
     "DOWNLOAD": "下载",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "Uploading attachments...",
     "SUCCESS_DELETE_MESSAGE": "Message deleted successfully",
     "FAIL_DELETE_MESSSAGE": "Couldn't delete message! Try again",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/index.js b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
index 76890f01b..a95027b94 100644
--- a/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "Overview"
+    "REPORTS_OVERVIEW": "Overview",
+    "FACEBOOK_REAUTHORIZE": "您的 Facebook 连接已过期，请重新连接您的 Facebook 页面以继续服务"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/zh_CN/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_CN/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/zh_TW/bulkActions.json b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
new file mode 100644
index 000000000..c13692274
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/bulkActions.json
@@ -0,0 +1,17 @@
+{
+    "BULK_ACTION": {
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "AGENT_SELECT_LABEL": "選擇客服",
+        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_LABEL": "指派",
+        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "RESOLVE_TOOLTIP": "已解決",
+        "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"
+    }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
index c526710c2..47f9c24fc 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/chatlist.json
@@ -55,7 +55,7 @@
     "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",
+    "SENT": "傳送成功",
     "NO_MESSAGES": "沒有訊息",
     "NO_CONTENT": "沒有可用內容",
     "HIDE_QUOTED_TEXT": "隱藏引用文字",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
index 9eb56300e..ec4143330 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/contact.json
@@ -7,7 +7,7 @@
     "COMPANY": "公司",
     "LOCATION": "位置",
     "CONVERSATION_TITLE": "對話詳細資訊",
-    "VIEW_PROFILE": "View Profile",
+    "VIEW_PROFILE": "查看個人檔案",
     "BROWSER": "瀏覽器",
     "OS": "作業系统",
     "INITIATED_FROM": "發起自：",
@@ -199,7 +199,7 @@
         "LAST_ACTIVITY": "最後活動",
         "COUNTRY": "國家",
         "CITY": "城市",
-        "SOCIAL_PROFILES": "Social Profiles",
+        "SOCIAL_PROFILES": "社群檔案",
         "COMPANY": "公司",
         "EMAIL_ADDRESS": "電子信箱地址"
       },
@@ -208,7 +208,7 @@
   },
   "CONTACT_PROFILE": {
     "BACK_BUTTON": "聯絡人",
-    "LOADING": "Loading contact profile..."
+    "LOADING": "正在讀取聯絡人檔案..."
   },
   "REMINDER": {
     "ADD_BUTTON": {
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
index ab274ef97..6e841b216 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/conversation.json
@@ -1,6 +1,7 @@
 {
   "CONVERSATION": {
     "404": "請從左側窗格選擇一個對話",
+    "DASHBOARD_APP_TAB_MESSAGES": "訊息",
     "UNVERIFIED_SESSION": "The identity of this user is not verified",
     "NO_MESSAGE_1": "您的收件匣中似乎没有客户的消息。",
     "NO_MESSAGE_2": " 向您的頁面發送一條消息！",
@@ -30,6 +31,7 @@
     "REPLYING_TO": "你正在回覆到：",
     "REMOVE_SELECTION": "移除選擇項目",
     "DOWNLOAD": "下載",
+    "UNKNOWN_FILE_TYPE": "Unknown File",
     "UPLOADING_ATTACHMENTS": "正在上傳附件...",
     "SUCCESS_DELETE_MESSAGE": "已成功刪除訊息",
     "FAIL_DELETE_MESSSAGE": "無法刪除訊息！請再試一次",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/index.js b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
index 5c1449fab..9b8773a64 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/index.js
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/index.js
@@ -2,6 +2,7 @@ import { default as _advancedFilters } from './advancedFilters.json';
 import { default as _agentMgmt } from './agentMgmt.json';
 import { default as _attributesMgmt } from './attributesMgmt.json';
 import { default as _automation } from './automation.json';
+import { default as _bulkActions } from './bulkActions.json';
 import { default as _campaign } from './campaign.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
@@ -21,6 +22,7 @@ import { default as _setNewPassword } from './setNewPassword.json';
 import { default as _settings } from './settings.json';
 import { default as _signup } from './signup.json';
 import { default as _teamsSettings } from './teamsSettings.json';
+import { default as _whatsappTemplates } from './whatsappTemplates.json';
 
 export default {
   ..._advancedFilters,
@@ -46,4 +48,6 @@ export default {
   ..._settings,
   ..._signup,
   ..._teamsSettings,
+  ..._whatsappTemplates,
+  ..._bulkActions,
 };
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
index 5969a1da2..2e4b6c9d2 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Personal message signature",
-        "NOTE": "Create a personal message signature that would be added to all the messages you send from the platform. Use the rich content editor to create a highly personalised signature.",
+        "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"
@@ -74,12 +74,12 @@
       },
       "NAME": {
         "LABEL": "你的姓名",
-        "ERROR": "Please enter a valid full name",
+        "ERROR": "請輸入一個有效的完整姓名",
         "PLACEHOLDER": "請輸入您的完整姓名"
       },
       "DISPLAY_NAME": {
         "LABEL": "顯示名稱",
-        "ERROR": "Please enter a valid display name",
+        "ERROR": "請輸入一個有效的顯示名稱",
         "PLACEHOLDER": "Please enter a display name, this would be displayed in conversations"
       },
       "AVAILABILITY": {
@@ -101,14 +101,14 @@
         "PLACEHOLDER": "請輸入目前的密碼"
       },
       "PASSWORD": {
-        "LABEL": "New password",
+        "LABEL": "新密碼",
         "ERROR": "請輸入長度6或更長的密碼",
         "PLACEHOLDER": "請輸入新密碼"
       },
       "PASSWORD_CONFIRMATION": {
         "LABEL": "重新輸入一次密碼",
         "ERROR": "兩次密碼不一致",
-        "PLACEHOLDER": "Please re-enter your new password"
+        "PLACEHOLDER": "請重複您的新密碼"
       }
     }
   },
@@ -164,7 +164,7 @@
     "NOTIFICATIONS": "通知",
     "CANNED_RESPONSES": "預設回覆",
     "INTEGRATIONS": "整合方式",
-    "PROFILE_SETTINGS": "個人資料設定",
+    "PROFILE_SETTINGS": "個人檔案設定",
     "ACCOUNT_SETTINGS": "帳戶設定",
     "APPLICATIONS": "Applications",
     "LABELS": "標籤",
@@ -189,7 +189,8 @@
     "REPORTS_TEAM": "Team",
     "SET_AVAILABILITY_TITLE": "Set yourself as",
     "BETA": "Beta",
-    "REPORTS_OVERVIEW": "總覽"
+    "REPORTS_OVERVIEW": "總覽",
+    "FACEBOOK_REAUTHORIZE": "Your Facebook connection has expired, please reconnect your Facebook page to continue services"
   },
   "CREATE_ACCOUNT": {
     "NO_ACCOUNT_WARNING": "Uh oh! We could not find any Chatwoot accounts. Please create a new account to continue.",
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
index 57bc07ecd..70b9f7e40 100644
--- a/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/signup.json
@@ -14,7 +14,7 @@
       "ERROR": "姓名太短了"
     },
     "EMAIL": {
-      "LABEL": "Work email",
+      "LABEL": "工作電子郵件",
       "PLACEHOLDER": "輸入你的工作 Email。例如： bruce@wayne.enterprises",
       "ERROR": "Email 無效"
     },
diff --git a/app/javascript/dashboard/i18n/locale/zh_TW/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/zh_TW/whatsappTemplates.json
new file mode 100644
index 000000000..bbcf28156
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh_TW/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/survey/i18n/locale/pl.json b/app/javascript/survey/i18n/locale/pl.json
index 9859c2b77..e5d58b254 100644
--- a/app/javascript/survey/i18n/locale/pl.json
+++ b/app/javascript/survey/i18n/locale/pl.json
@@ -1,17 +1,17 @@
 {
   "SURVEY": {
-    "DESCRIPTION": "Dear customer 👋, please take a few moments to share feedback about the conversation you had with %{inboxName}.",
+    "DESCRIPTION": "Droga Klientko, Drogi Kliencie 👋, poświęć proszę kilka chwil, aby podzielić się opinią na temat rozmowy, którą odbyłeś(aś) z %{inboxName}.",
     "RATING": {
       "LABEL": "Oceń udzielone Ci wsparcie",
       "SUCCESS_MESSAGE": "Dziękujemy za przesłanie oceny"
     },
     "FEEDBACK": {
-      "LABEL": "Do you have any thoughts you'd like to share?",
-      "PLACEHOLDER": "Your feedback (optional)",
-      "BUTTON_TEXT": "Submit feedback"
+      "LABEL": "Czy masz jakieś przemyślenia, którymi chciałbyć się podzielić?",
+      "PLACEHOLDER": "Twoja opinia (opcjonalna)",
+      "BUTTON_TEXT": "Prześlij opinię"
     },
     "API": {
-      "SUCCESS_MESSAGE": "Survey updated successfully",
+      "SUCCESS_MESSAGE": "Ankieta została zaktualizowana",
       "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
     }
   },
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
index 5249881af..878d184af 100644
--- a/app/javascript/widget/i18n/locale/pl.json
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -22,9 +22,9 @@
     "IN_A_DAY": "Zwykle odpowiadamy w przeciągu jednego dnia"
   },
   "START_CONVERSATION": "Rozpocznij rozmowę",
-  "END_CONVERSATION": "End Conversation",
+  "END_CONVERSATION": "Zakończ rozmowę",
   "CONTINUE_CONVERSATION": "Kontynuuj rozmowę",
-  "START_NEW_CONVERSATION": "Rozpocznij rozmowę",
+  "START_NEW_CONVERSATION": "Rozpocznij nową rozmowę",
   "UNREAD_VIEW": {
     "VIEW_MESSAGES_BUTTON": "Pokaż nowe wiadomości",
     "CLOSE_MESSAGES_BUTTON": "Zamknij",
@@ -49,14 +49,14 @@
       "EMAIL_ADDRESS": {
         "LABEL": "Adres e-mail",
         "PLACEHOLDER": "Wprowadź swój adres e-mail",
-        "REQUIRED_ERROR": "Email Address is required",
+        "REQUIRED_ERROR": "Adres email jest wymagany",
         "VALID_ERROR": "Wprowadź poprawny adres e-mail"
       },
       "PHONE_NUMBER": {
         "LABEL": "Numer telefonu",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "PLACEHOLDER": "Wprowadź numer telefonu",
+        "REQUIRED_ERROR": "Numer telefonu jest wymagany",
+        "VALID_ERROR": "Numer telefonu powinien być w formacie E.164 tj. +48123456789"
       },
       "MESSAGE": {
         "LABEL": "Wiadomość",
@@ -65,7 +65,7 @@
       }
     },
     "CAMPAIGN_HEADER": "Proszę podać swoje imię i nazwisko oraz adres e-mail przed rozpoczęciem rozmowy",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "jest wymagany"
   },
   "FILE_SIZE_LIMIT": "Plik przekracza limit {MAXIMUM_FILE_UPLOAD_SIZE} dla załącznika",
   "CHAT_FORM": {
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index ec1773e9a..d2f715e74 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -40,14 +40,14 @@ pl:
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
+      inbox_name: Nazwa skrzynki odbiorczej
+      inbox_type: Typ skrzynki odbiorczej
+      conversations_count: Ilość rozmów
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     label_csv:
-      label_title: Label
-      conversations_count: No. of conversations
+      label_title: Etykieta
+      conversations_count: Ilość rozmów
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
     team_csv:
@@ -55,17 +55,17 @@ pl:
       conversations_count: Liczba rozmów
       avg_first_response_time: Średni czas pierwszej odpowiedzi (minuty)
       avg_resolution_time: Średni czas do rozwiązania problemu (minuty)
-    default_group_by: day
+    default_group_by: dnia
     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
+        contact_name: Nazwa kontaktu
+        contact_email_address: Adres email kontaktu
+        contact_phone_number: Numer telefonu kontaktu
+        link_to_the_conversation: Link do rozmowy
         agent_name: Nazwa agenta
         rating: Ocena
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        feedback: Komentarz zwrotny
+        recorded_at: Data nagrania
   notifications:
     notification_title:
       conversation_creation: "[Nowa rozmowa] - #%{display_id} został utworzony w %{inbox_name}"
@@ -74,7 +74,7 @@ pl:
       conversation_mention: "Zostałeś wspomniany w konwersacji [ID - %{display_id}] przez %{name}"
   conversations:
     messages:
-      instagram_story_content: "%{story_sender} mentioned you in the story: "
+      instagram_story_content: "%{story_sender} wspomniał o Tobie w historii: "
       deleted: Ta wiadomość została usunięta
     activity:
       status:

From 74fa907010f4339b8b3846f4d39bb5f8923c8b93 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Jun 2022 21:36:47 +0530
Subject: [PATCH 152/177] chore: Update translations from Crowdin (#4822)

---
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  4 +--
 .../i18n/locale/de/whatsappTemplates.json     | 26 +++++++++----------
 .../dashboard/i18n/locale/it/bulkActions.json | 20 +++++++-------
 .../dashboard/i18n/locale/it/settings.json    |  2 +-
 .../i18n/locale/it/whatsappTemplates.json     | 26 +++++++++----------
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index 5d8d2aaa4..5afc7d0a1 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "Platzieren Sie diese Schaltfläche in Ihrem Body-Tag",
       "INBOX_AGENTS": "Agenten",
       "INBOX_AGENTS_SUB_TEXT": "Hinzufügen oder Entfernen von Agenten zu diesem Posteingang",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT": "Konversationssauftrag",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Konversationszuweisungseinstellungen aktualisieren",
       "UPDATE": "Aktualisieren",
       "ENABLE_EMAIL_COLLECT_BOX": "E-Mail-Sammelbox aktivieren",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "E-Mail-Sammelbox für neue Konversation aktivieren oder deaktivieren",
diff --git a/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json
index bbcf28156..8c114d3b9 100644
--- a/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/de/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "WhatsApp-Vorlagen",
+            "SUBTITLE": "Wählen Sie die WhatsApp-Vorlage aus, die Sie senden möchten",
+            "TEMPLATE_SELECTED_SUBTITLE": "Verarbeite %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Vorlagen suchen",
+            "NO_TEMPLATES_FOUND": "Keine Vorlagen gefunden für",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Sprache",
+                "TEMPLATE_BODY": "Vorlagenbody",
+                "CATEGORY": "Kategorie"
             }
         },
         "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"
+            "VARIABLES_LABEL": "Variablen",
+            "VARIABLE_PLACEHOLDER": "Geben Sie den Wert %{variable} ein",
+            "GO_BACK_LABEL": "Zurück",
+            "SEND_MESSAGE_LABEL": "Nachricht senden",
+            "FORM_ERROR_MESSAGE": "Bitte füllen Sie vor dem Absenden alle Variablen aus"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/bulkActions.json b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
index da7ac4957..a98e133bc 100644
--- a/app/javascript/dashboard/i18n/locale/it/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/it/bulkActions.json
@@ -1,17 +1,17 @@
 {
     "BULK_ACTION": {
-        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversazioni selezionate",
         "AGENT_SELECT_LABEL": "Seleziona agente",
-        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_CONFIRMATION_LABEL": "Sei sicuro di voler assegnare %{conversationCount} %{conversationLabel} a",
+        "GO_BACK_LABEL": "Torna indietro",
         "ASSIGN_LABEL": "Assegna",
-        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "ASSIGN_AGENT_TOOLTIP": "Assegna agente",
         "RESOLVE_TOOLTIP": "Risolvi",
-        "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"
+        "ASSIGN_SUCCESFUL": "Conversazioni assegnate correttamente",
+        "ASSIGN_FAILED": "Assegnazione delle conversazioni non riuscita, riprova",
+        "RESOLVE_SUCCESFUL": "Conversazioni risolte correttamente",
+        "RESOLVE_FAILED": "Risoluzione delle conversazioni non riuscita, riprova",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Le conversazioni visibili in questa pagina sono selezionate.",
+        "AGENT_LIST_LOADING": "Caricamento agenti"
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
index 74a5841be..5898ebc6d 100644
--- a/app/javascript/dashboard/i18n/locale/it/settings.json
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma del messaggio personale",
-        "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.",
+        "NOTE": "Crea una firma personale del messaggio che sarà aggiunta a tutti i messaggi inviati dalla tua casella di posta elettronica. Usa l'editor di contenuti per creare una firma altamente personalizzata.",
         "BTN_TEXT": "Salva firma del messaggio",
         "API_ERROR": "Impossibile salvare la firma! Riprova",
         "API_SUCCESS": "Firma salvata con successo"
diff --git a/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
index bbcf28156..d335fd8b1 100644
--- a/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/it/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "Modelli Whatsapp",
+            "SUBTITLE": "Seleziona il modello whatsapp che vuoi inviare",
+            "TEMPLATE_SELECTED_SUBTITLE": "Elabora %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Cerca modelli",
+            "NO_TEMPLATES_FOUND": "Nessun modello trovato per",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Lingua",
+                "TEMPLATE_BODY": "Corpo modello",
+                "CATEGORY": "Categoria"
             }
         },
         "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"
+            "VARIABLES_LABEL": "Variabili",
+            "VARIABLE_PLACEHOLDER": "Inserisci il valore di %{variable}",
+            "GO_BACK_LABEL": "Torna indietro",
+            "SEND_MESSAGE_LABEL": "Invia messaggio",
+            "FORM_ERROR_MESSAGE": "Si prega di compilare tutte le variabili prima di inviare"
         }
     }
 }

From 6385e42d9b83894d471ee2431795c01ab57e5f4e Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 9 Jun 2022 21:30:03 +0530
Subject: [PATCH 153/177] chore: Update translations from Crowdin (#4833)

---
 .../dashboard/i18n/locale/ar/bulkActions.json | 20 +++++++-------
 .../i18n/locale/ar/conversation.json          |  4 +--
 .../dashboard/i18n/locale/ar/settings.json    |  2 +-
 .../i18n/locale/ar/whatsappTemplates.json     | 26 +++++++++----------
 config/locales/ar.yml                         |  8 +++---
 5 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
index dd41c75c2..1b9374212 100644
--- a/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ar/bulkActions.json
@@ -1,17 +1,17 @@
 {
     "BULK_ACTION": {
-        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "CONVERSATIONS_SELECTED": "%{conversationCount} المحادثات المحددة",
         "AGENT_SELECT_LABEL": "اختر وكيل",
-        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_CONFIRMATION_LABEL": "هل أنت متأكد من أنك تريد تعيين %{conversationCount} %{conversationLabel} إلى",
+        "GO_BACK_LABEL": "العودة للخلف",
         "ASSIGN_LABEL": "تكليف",
-        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "ASSIGN_AGENT_TOOLTIP": "إسناد وكيل",
         "RESOLVE_TOOLTIP": "إغلاق المحادثة",
-        "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"
+        "ASSIGN_SUCCESFUL": "تم تعيين المحادثات بنجاح",
+        "ASSIGN_FAILED": "فشل في تعيين المحادثات، الرجاء المحاولة مرة أخرى",
+        "RESOLVE_SUCCESFUL": "تم تسوية المحادثات بنجاح",
+        "RESOLVE_FAILED": "فشل في حل المحادثات، يرجى المحاولة مرة أخرى",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "المحادثات المرئية في هذه الصفحة هي المحددة فقط.",
+        "AGENT_LIST_LOADING": "تحميل الوكلاء"
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
index a574e9325..5d6d7b7ce 100644
--- a/app/javascript/dashboard/i18n/locale/ar/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "الرجاء اختيار محادثة من قائمة المحادثات",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "DASHBOARD_APP_TAB_MESSAGES": "الرسائل",
     "UNVERIFIED_SESSION": "لم يتم التحقق من هوية هذا المستخدم",
     "NO_MESSAGE_1": "لا توجد رسائل بعد من العملاء في صندوق الوارد الخاص بك.",
     "NO_MESSAGE_2": " لإرسال رسالة إلى الصفحة الخاصة بك!",
@@ -31,7 +31,7 @@
     "REPLYING_TO": "أنت ترد على:",
     "REMOVE_SELECTION": "إزالة التحديد",
     "DOWNLOAD": "تنزيل",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
+    "UNKNOWN_FILE_TYPE": "ملف غير معروف",
     "UPLOADING_ATTACHMENTS": "جاري تحميل المرفقات...",
     "SUCCESS_DELETE_MESSAGE": "تم حذف الرسالة بنجاح",
     "FAIL_DELETE_MESSSAGE": "تعذر حذف الرسالة! حاول مرة أخرى",
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
index b7b0addc4..bb1e9f492 100644
--- a/app/javascript/dashboard/i18n/locale/ar/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "توقيع الرسالة الشخصية",
-        "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.",
+        "NOTE": "إنشاء توقيع رسالة شخصية يتم إضافتها إلى جميع الرسائل التي ترسلها من المنصة. استخدم محرر المحتوى الغني لإنشاء توقيع شديد التخصيص.",
         "BTN_TEXT": "حفظ توقيع الرسالة",
         "API_ERROR": "تعذر إرسال الرسالة! حاول مرة أخرى",
         "API_SUCCESS": "تم حفظ التوقيع بنجاح"
diff --git a/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
index bbcf28156..77687f8df 100644
--- a/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ar/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "قوالب Whatsapp",
+            "SUBTITLE": "حدد قالب ما تريد إرساله",
+            "TEMPLATE_SELECTED_SUBTITLE": "معالجة %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "نماذج البحث",
+            "NO_TEMPLATES_FOUND": "لم يتم العثور على قوالب",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "اللغة",
+                "TEMPLATE_BODY": "نص القالب",
+                "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"
+            "VARIABLES_LABEL": "المتغيرات",
+            "VARIABLE_PLACEHOLDER": "أدخل قيمة %{variable}",
+            "GO_BACK_LABEL": "العودة للخلف",
+            "SEND_MESSAGE_LABEL": "إرسال الرسالة",
+            "FORM_ERROR_MESSAGE": "يرجى ملء جميع المتغيرات قبل الإرسال"
         }
     }
 }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 58d316646..3f568fc4b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -40,14 +40,14 @@ ar:
       avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
       avg_resolution_time: متوسط وقت المحادثة (الدقائق)
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
+      inbox_name: اسم صندوق الوارد
+      inbox_type: نوع صندوق البريد
+      conversations_count: عدد المحادثات
       avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
       avg_resolution_time: متوسط وقت المحادثة (الدقائق)
     label_csv:
       label_title: الوسم
-      conversations_count: No. of conversations
+      conversations_count: عدد المحادثات
       avg_first_response_time: متوسط وقت الرد الأول (الدقائق)
       avg_resolution_time: متوسط وقت المحادثة (الدقائق)
     team_csv:

From c5c89449dd46e63fedf6ca7e59898152af592249 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 9 Jun 2022 21:34:59 +0530
Subject: [PATCH 154/177] fix: Remove validation for WhatsApp templates with no
 params (#4820)

---
 .../WhatsappTemplates/TemplateParser.vue      |  70 ++---
 .../specs/whatsappTemplates/fixtures.js       | 268 ++++++++++++++++++
 .../whatsappTemplates.spec.js                 |  77 +++++
 3 files changed, 375 insertions(+), 40 deletions(-)
 create mode 100644 app/javascript/shared/mixins/specs/whatsappTemplates/fixtures.js
 create mode 100644 app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js

diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
index 7fc8ac431..d2307c55c 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
@@ -6,30 +6,28 @@
       readonly
       class="template-input"
     ></textarea>
-    <div>
-      <div class="template__variables-container">
-        <p class="variables-label">
-          {{ $t('WHATSAPP_TEMPLATES.PARSER.VARIABLES_LABEL') }}
-        </p>
-        <div
-          v-for="(variable, key) in processedParams"
-          :key="key"
-          class="template__variable-item"
-        >
-          <span class="variable-label">
-            {{ key }}
-          </span>
-          <woot-input
-            v-model="processedParams[key]"
-            type="text"
-            class="variable-input"
-            :styles="{ marginBottom: 0 }"
-          />
-        </div>
-        <p v-if="showRequiredMessage" class="error">
-          {{ $t('WHATSAPP_TEMPLATES.PARSER.FORM_ERROR_MESSAGE') }}
-        </p>
+    <div v-if="variables" class="template__variables-container">
+      <p class="variables-label">
+        {{ $t('WHATSAPP_TEMPLATES.PARSER.VARIABLES_LABEL') }}
+      </p>
+      <div
+        v-for="(variable, key) in processedParams"
+        :key="key"
+        class="template__variable-item"
+      >
+        <span class="variable-label">
+          {{ key }}
+        </span>
+        <woot-input
+          v-model="processedParams[key]"
+          type="text"
+          class="variable-input"
+          :styles="{ marginBottom: 0 }"
+        />
       </div>
+      <p v-if="$v.$dirty && $v.$invalid" class="error">
+        {{ $t('WHATSAPP_TEMPLATES.PARSER.FORM_ERROR_MESSAGE') }}
+      </p>
     </div>
     <footer>
       <woot-button variant="smooth" @click="$emit('resetTemplate')">
@@ -43,12 +41,11 @@
 </template>
 
 <script>
-import { required } from 'vuelidate/lib/validators';
-
 const allKeysRequired = value => {
   const keys = Object.keys(value);
   return keys.every(key => value[key]);
 };
+import { requiredIf } from 'vuelidate/lib/validators';
 export default {
   props: {
     template: {
@@ -58,15 +55,13 @@ export default {
   },
   validations: {
     processedParams: {
-      required,
+      requiredIfKeysPresent: requiredIf('variables'),
       allKeysRequired,
     },
   },
   data() {
     return {
-      message: this.template.message,
       processedParams: {},
-      showRequiredMessage: false,
     };
   },
   computed: {
@@ -92,11 +87,8 @@ export default {
   methods: {
     sendMessage() {
       this.$v.$touch();
-      if (this.$v.$invalid) {
-        this.showRequiredMessage = true;
-        return;
-      }
-      const message = {
+      if (this.$v.$invalid) return;
+      const payload = {
         message: this.processedString,
         templateParams: {
           name: this.template.name,
@@ -106,18 +98,16 @@ export default {
           processed_params: this.processedParams,
         },
       };
-      this.$emit('sendMessage', message);
+      this.$emit('sendMessage', payload);
     },
     processVariable(str) {
       return str.replace(/{{|}}/g, '');
     },
     generateVariables() {
-      const templateString = this.template.components.find(
-        component => component.type === 'BODY'
-      ).text;
-      const variables = templateString.match(/{{([^}]+)}}/g).map(variable => {
-        return this.processVariable(variable);
-      });
+      const matchedVariables = this.templateString.match(/{{([^}]+)}}/g);
+      if (!matchedVariables) return;
+
+      const variables = matchedVariables.map(i => this.processVariable(i));
       this.processedParams = variables.reduce((acc, variable) => {
         acc[variable] = '';
         return acc;
diff --git a/app/javascript/shared/mixins/specs/whatsappTemplates/fixtures.js b/app/javascript/shared/mixins/specs/whatsappTemplates/fixtures.js
new file mode 100644
index 000000000..55b9334f5
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/whatsappTemplates/fixtures.js
@@ -0,0 +1,268 @@
+export const templates = [
+  {
+    name: 'sample_flight_confirmation',
+    status: 'approved',
+    category: 'TICKET_UPDATE',
+    language: 'pt_BR',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      { type: 'HEADER', format: 'DOCUMENT' },
+      {
+        text: 'Esta é a sua confirmação de voo para {{1}}-{{2}} em {{3}}.',
+        type: 'BODY',
+      },
+      {
+        text: 'Esta mensagem é de uma empresa não verificada.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_issue_resolution',
+    status: 'approved',
+    category: 'ISSUE_RESOLUTION',
+    language: 'pt_BR',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text:
+          'Oi, {{1}}. Nós conseguimos resolver o problema que você estava enfrentando?',
+        type: 'BODY',
+      },
+      {
+        text: 'Esta mensagem é de uma empresa não verificada.',
+        type: 'FOOTER',
+      },
+      {
+        type: 'BUTTONS',
+        buttons: [
+          { text: 'Sim', type: 'QUICK_REPLY' },
+          { text: 'Não', type: 'QUICK_REPLY' },
+        ],
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_issue_resolution',
+    status: 'approved',
+    category: 'ISSUE_RESOLUTION',
+    language: 'es',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text: 'Hola, {{1}}. ¿Pudiste solucionar el problema que tenías?',
+        type: 'BODY',
+      },
+      {
+        text: 'Este mensaje proviene de un negocio no verificado.',
+        type: 'FOOTER',
+      },
+      {
+        type: 'BUTTONS',
+        buttons: [
+          { text: 'Sí', type: 'QUICK_REPLY' },
+          { text: 'No', type: 'QUICK_REPLY' },
+        ],
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_issue_resolution',
+    status: 'approved',
+    category: 'ISSUE_RESOLUTION',
+    language: 'id',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text:
+          'Halo {{1}}, apakah kami bisa mengatasi masalah yang sedang Anda hadapi?',
+        type: 'BODY',
+      },
+      {
+        text: 'Pesan ini berasal dari bisnis yang tidak terverifikasi.',
+        type: 'FOOTER',
+      },
+      {
+        type: 'BUTTONS',
+        buttons: [
+          { text: 'Ya', type: 'QUICK_REPLY' },
+          { text: 'Tidak', type: 'QUICK_REPLY' },
+        ],
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_shipping_confirmation',
+    status: 'approved',
+    category: 'SHIPPING_UPDATE',
+    language: 'pt_BR',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text: 'Seu pacote foi enviado. Ele será entregue em {{1}} dias úteis.',
+        type: 'BODY',
+      },
+      {
+        text: 'Esta mensagem é de uma empresa não verificada.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_shipping_confirmation',
+    status: 'approved',
+    category: 'SHIPPING_UPDATE',
+    language: 'id',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text:
+          'Paket Anda sudah dikirim. Paket akan sampai dalam {{1}} hari kerja.',
+        type: 'BODY',
+      },
+      {
+        text: 'Pesan ini berasal dari bisnis yang tidak terverifikasi.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_shipping_confirmation',
+    status: 'approved',
+    category: 'SHIPPING_UPDATE',
+    language: 'es',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text: 'ó tu paquete. La entrega se realizará en {{1}} dí.',
+        type: 'BODY',
+      },
+      {
+        text: 'Este mensaje proviene de un negocio no verificado.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_flight_confirmation',
+    status: 'approved',
+    category: 'TICKET_UPDATE',
+    language: 'id',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      { type: 'HEADER', format: 'DOCUMENT' },
+      {
+        text:
+          'Ini merupakan konfirmasi penerbangan Anda untuk {{1}}-{{2}} di {{3}}.',
+        type: 'BODY',
+      },
+      {
+        text: 'Pesan ini berasal dari bisnis yang tidak terverifikasi.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_issue_resolution',
+    status: 'approved',
+    category: 'ISSUE_RESOLUTION',
+    language: 'en_US',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text: 'Hi {{1}}, were we able to solve the issue that you were facing?',
+        type: 'BODY',
+      },
+      { text: 'This message is from an unverified business.', type: 'FOOTER' },
+      {
+        type: 'BUTTONS',
+        buttons: [
+          { text: 'Yes', type: 'QUICK_REPLY' },
+          { text: 'No', type: 'QUICK_REPLY' },
+        ],
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_flight_confirmation',
+    status: 'approved',
+    category: 'TICKET_UPDATE',
+    language: 'es',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      { type: 'HEADER', format: 'DOCUMENT' },
+      {
+        text: 'Confirmamos tu vuelo a {{1}}-{{2}} para el {{3}}.',
+        type: 'BODY',
+      },
+      {
+        text: 'Este mensaje proviene de un negocio no verificado.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_flight_confirmation',
+    status: 'approved',
+    category: 'TICKET_UPDATE',
+    language: 'en_US',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      { type: 'HEADER', format: 'DOCUMENT' },
+      {
+        text: 'This is your flight confirmation for {{1}}-{{2}} on {{3}}.',
+        type: 'BODY',
+      },
+      { text: 'This message is from an unverified business.', type: 'FOOTER' },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'sample_shipping_confirmation',
+    status: 'approved',
+    category: 'SHIPPING_UPDATE',
+    language: 'en_US',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        text:
+          'Your package has been shipped. It will be delivered in {{1}} business days.',
+        type: 'BODY',
+      },
+      { text: 'This message is from an unverified business.', type: 'FOOTER' },
+    ],
+    rejected_reason: 'NONE',
+  },
+  {
+    name: 'no_variable_template',
+    status: 'approved',
+    category: 'TICKET_UPDATE',
+    language: 'pt_BR',
+    namespace: 'ed41a221_133a_4558_a1d6_192960e3aee9',
+    components: [
+      {
+        type: 'HEADER',
+        format: 'DOCUMENT',
+      },
+      {
+        text: 'This is a test whatsapp template',
+        type: 'BODY',
+      },
+      {
+        text: 'Esta mensagem é de uma empresa não verificada.',
+        type: 'FOOTER',
+      },
+    ],
+    rejected_reason: 'NONE',
+  },
+];
diff --git a/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js b/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js
new file mode 100644
index 000000000..6443ea7db
--- /dev/null
+++ b/app/javascript/shared/mixins/specs/whatsappTemplates/whatsappTemplates.spec.js
@@ -0,0 +1,77 @@
+import TemplateParser from '../../../../dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue';
+import { mount, createLocalVue } from '@vue/test-utils';
+import { templates } from './fixtures';
+const localVue = createLocalVue();
+import VueI18n from 'vue-i18n';
+import Vue from 'vue';
+
+import Vuelidate from 'vuelidate';
+Vue.use(Vuelidate);
+
+import i18n from 'dashboard/i18n';
+
+localVue.use(VueI18n);
+
+const i18nConfig = new VueI18n({
+  locale: 'en',
+  messages: i18n,
+});
+
+describe('#WhatsAppTemplates', () => {
+  it('returns all variables from a template string', () => {
+    const wrapper = mount(TemplateParser, {
+      localVue,
+      propsData: {
+        template: templates[0],
+      },
+      i18n: i18nConfig,
+    });
+    expect(wrapper.vm.variables).toEqual(['{{1}}', '{{2}}', '{{3}}']);
+  });
+
+  it('returns no variables from a template string if it does not contain variables', () => {
+    const wrapper = mount(TemplateParser, {
+      localVue,
+      propsData: {
+        template: templates[12],
+      },
+      i18n: i18nConfig,
+    });
+    expect(wrapper.vm.variables).toBeNull();
+  });
+
+  it('returns the body of a template', () => {
+    const wrapper = mount(TemplateParser, {
+      localVue,
+      propsData: {
+        template: templates[1],
+      },
+      i18n: i18nConfig,
+    });
+    const expectedOutput = templates[1].components.find(i => i.type === 'BODY')
+      .text;
+    expect(wrapper.vm.templateString).toEqual(expectedOutput);
+  });
+
+  it('generates the templates from variable input', async () => {
+    const wrapper = mount(TemplateParser, {
+      localVue,
+      propsData: {
+        template: templates[0],
+      },
+      data: () => {
+        return {
+          processedParams: {},
+        };
+      },
+      i18n: i18nConfig,
+    });
+    await wrapper.setData({
+      processedParams: { '1': 'abc', '2': 'xyz', '3': 'qwerty' },
+    });
+    await wrapper.vm.$nextTick();
+    const expectedOutput =
+      'Esta é a sua confirmação de voo para abc-xyz em qwerty.';
+    expect(wrapper.vm.processedString).toEqual(expectedOutput);
+  });
+});

From 9bac5873ef6429bcfce7621bf19453a2e20292d5 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Fri, 10 Jun 2022 12:26:21 +0530
Subject: [PATCH 155/177] chore: upgrade FB api version (#4834)

---
 app/controllers/dashboard_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 107aec56e..243fe00b2 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -43,7 +43,7 @@ class DashboardController < ActionController::Base
       VAPID_PUBLIC_KEY: VapidService.public_key,
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      FACEBOOK_API_VERSION: 'v13.0'
+      FACEBOOK_API_VERSION: 'v14.0'
     }
   end
 end

From 3f3ee6c34a7f8f69f45c1b259d90abb533bcdfae Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 10 Jun 2022 18:40:29 +0530
Subject: [PATCH 156/177] chore: Add support for message_templates in API inbox
 (#4835)

---
 .../widgets/conversation/ReplyBox.vue         |  3 ++-
 .../dashboard/settings/inbox/Settings.vue     |  2 --
 .../dashboard/store/modules/inboxes.js        | 15 +++++++++++--
 app/models/channel/api.rb                     | 19 +++++++++--------
 app/models/message.rb                         | 21 ++++++++++---------
 app/views/api/v1/models/_inbox.json.jbuilder  |  1 +
 ...dd_additional_attributes_to_api_channel.rb |  5 +++++
 db/schema.rb                                  |  3 ++-
 8 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 22c5ee33c..4df0891e4 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -267,7 +267,8 @@ export default {
       return false;
     },
     hasWhatsappTemplates() {
-      return !!this.inbox.message_templates;
+      return !!this.$store.getters['inboxes/getWhatsAppTemplates'](this.inboxId)
+        .length;
     },
     enterToSendEnabled() {
       return !!this.uiSettings.enter_to_send_enabled;
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 97cd3c294..8c32159f2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -318,7 +318,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { required } from 'vuelidate/lib/validators';
 import { shouldBeUrl } from 'shared/helpers/Validators';
 import configMixin from 'shared/mixins/configMixin';
 import alertMixin from 'shared/mixins/alertMixin';
@@ -562,7 +561,6 @@ export default {
   },
   validations: {
     webhookUrl: {
-      required,
       shouldBeUrl,
     },
   },
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index 0795d17af..b16ed4799 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -51,9 +51,20 @@ export const getters = {
     const [inbox] = $state.records.filter(
       record => record.id === Number(inboxId)
     );
+
+    const {
+      message_templates: whatsAppMessageTemplates,
+      additional_attributes: additionalAttributes,
+    } = inbox;
+
+    const { message_templates: apiInboxMessageTemplates } =
+      additionalAttributes || {};
+    const messagesTemplates =
+      whatsAppMessageTemplates || apiInboxMessageTemplates;
+
     // filtering out the whatsapp templates with media
-    if (inbox.message_templates) {
-      return inbox.message_templates.filter(template => {
+    if (messagesTemplates) {
+      return messagesTemplates.filter(template => {
         return !template.components.some(
           i => i.format === 'IMAGE' || i.format === 'VIDEO'
         );
diff --git a/app/models/channel/api.rb b/app/models/channel/api.rb
index fd8abb594..0902fb5dd 100644
--- a/app/models/channel/api.rb
+++ b/app/models/channel/api.rb
@@ -2,14 +2,15 @@
 #
 # Table name: channel_api
 #
-#  id             :bigint           not null, primary key
-#  hmac_mandatory :boolean          default(FALSE)
-#  hmac_token     :string
-#  identifier     :string
-#  webhook_url    :string
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
-#  account_id     :integer          not null
+#  id                    :bigint           not null, primary key
+#  additional_attributes :jsonb
+#  hmac_mandatory        :boolean          default(FALSE)
+#  hmac_token            :string
+#  identifier            :string
+#  webhook_url           :string
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#  account_id            :integer          not null
 #
 # Indexes
 #
@@ -21,7 +22,7 @@ class Channel::Api < ApplicationRecord
   include Channelable
 
   self.table_name = 'channel_api'
-  EDITABLE_ATTRS = [:webhook_url].freeze
+  EDITABLE_ATTRS = [:webhook_url, { additional_attributes: {} }].freeze
 
   has_secure_token :identifier
   has_secure_token :hmac_token
diff --git a/app/models/message.rb b/app/models/message.rb
index 48f58768c..4e119aa6b 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -116,18 +116,19 @@ class Message < ApplicationRecord
 
   def webhook_data
     {
-      id: id,
-      content: content,
-      created_at: created_at,
-      message_type: message_type,
-      content_type: content_type,
-      private: private,
+      account: account.webhook_data,
+      additional_attributes: additional_attributes,
       content_attributes: content_attributes,
-      source_id: source_id,
-      sender: sender.try(:webhook_data),
-      inbox: inbox.webhook_data,
+      content_type: content_type,
+      content: content,
       conversation: conversation.webhook_data,
-      account: account.webhook_data
+      created_at: created_at,
+      id: id,
+      inbox: inbox.webhook_data,
+      message_type: message_type,
+      private: private,
+      sender: sender.try(:webhook_data),
+      source_id: source_id
     }
   end
 
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 7b0839ccc..18b737da3 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -77,6 +77,7 @@ end
 if resource.api?
   json.webhook_url resource.channel.try(:webhook_url)
   json.inbox_identifier resource.channel.try(:identifier)
+  json.additional_attributes resource.channel.try(:additional_attributes)
 end
 
 ### WhatsApp Channel
diff --git a/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb b/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb
new file mode 100644
index 000000000..ca5580883
--- /dev/null
+++ b/db/migrate/20220610091206_add_additional_attributes_to_api_channel.rb
@@ -0,0 +1,5 @@
+class AddAdditionalAttributesToApiChannel < ActiveRecord::Migration[6.1]
+  def change
+    add_column :channel_api, :additional_attributes, :jsonb, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4e2ba8095..9599d193c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_05_25_141844) do
+ActiveRecord::Schema.define(version: 2022_06_10_091206) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -205,6 +205,7 @@ ActiveRecord::Schema.define(version: 2022_05_25_141844) do
     t.string "identifier"
     t.string "hmac_token"
     t.boolean "hmac_mandatory", default: false
+    t.jsonb "additional_attributes", default: {}
     t.index ["hmac_token"], name: "index_channel_api_on_hmac_token", unique: true
     t.index ["identifier"], name: "index_channel_api_on_identifier", unique: true
   end

From 7bb8186e43b87cdcb8049beb24aa216b222072dd Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Fri, 10 Jun 2022 19:29:52 +0530
Subject: [PATCH 157/177] chore: Update self-closing tag eslint config (#4826)

* chore: Fix self-closing tag issues

* Fix merge conflicts

Co-authored-by: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
---
 .eslintrc.js                                  | 36 ++++++++++++-------
 app/javascript/dashboard/App.vue              |  2 +-
 .../dashboard/components/ChatList.vue         |  7 ++--
 .../dashboard/components/ModalHeader.vue      |  2 +-
 .../components/NetworkNotification.vue        |  3 +-
 .../dashboard/components/SettingsSection.vue  |  2 +-
 .../dashboard/components/buttons/Button.vue   |  2 +-
 .../dashboard/components/ui/Banner.vue        |  3 +-
 .../dashboard/components/ui/Switch.vue        |  2 +-
 .../dashboard/components/ui/WootButton.vue    |  2 +-
 .../widgets/AutomationActionInput.vue         |  2 +-
 .../AutomationActionTeamMessageInput.vue      |  2 +-
 .../components/widgets/SettingIntroBanner.vue |  2 +-
 .../widgets/WootWriter/AudioRecorder.vue      |  2 +-
 .../components/widgets/WootWriter/Editor.vue  |  2 +-
 .../widgets/conversation/MessagesView.vue     |  3 +-
 .../WhatsappTemplates/TemplateParser.vue      |  2 +-
 .../widgets/conversation/bubble/Text.vue      |  2 +-
 .../widgets/forms/AvatarUploader.vue          |  2 +-
 .../components/widgets/forms/Input.vue        |  2 +-
 .../widgets/modal/ConfirmationModal.vue       |  2 +-
 .../contact/components/MergeContact.vue       |  4 +--
 .../widget-preview/components/WidgetBody.vue  |  2 +-
 .../components/WidgetFooter.vue               |  2 +-
 .../widget-preview/components/WidgetHead.vue  |  2 +-
 app/javascript/dashboard/routes/auth/Auth.vue |  2 +-
 .../dashboard/routes/auth/Confirmation.vue    |  2 +-
 .../dashboard/routes/auth/PasswordEdit.vue    |  3 +-
 .../dashboard/routes/auth/Signup.vue          |  5 ++-
 .../dashboard/routes/dashboard/Dashboard.vue  |  4 +--
 .../contacts/components/AddReminder.vue       |  3 +-
 .../conversation/ContactConversations.vue     |  2 +-
 .../conversation/ContactCustomAttributes.vue  |  4 +--
 .../conversation/ContactDetailsItem.vue       |  2 +-
 .../dashboard/conversation/ContactPanel.vue   |  3 +-
 .../conversation/ConversationView.vue         |  3 +-
 .../conversation/labels/LabelBox.vue          |  2 +-
 .../conversation/search/SearchMessageItem.vue |  2 +-
 .../components/NotificationPanel.vue          |  8 ++---
 .../components/NotificationPanelList.vue      |  4 +--
 .../components/NotificationTable.vue          |  3 +-
 .../dashboard/settings/SettingsHeader.vue     |  4 +--
 .../settings/SettingsSubPageHeader.vue        |  2 +-
 .../routes/dashboard/settings/Wrapper.vue     |  4 +--
 .../dashboard/settings/account/Index.vue      |  5 ++-
 .../dashboard/settings/agents/Index.vue       |  6 ++--
 .../settings/attributes/CustomAttribute.vue   |  8 ++---
 .../dashboard/settings/automation/Index.vue   | 11 +++---
 .../dashboard/settings/canned/Index.vue       |  8 ++---
 .../dashboard/settings/inbox/AddAgents.vue    |  3 +-
 .../dashboard/settings/inbox/FinishSetup.vue  | 15 +++-----
 .../settings/inbox/InboxChannels.vue          |  2 +-
 .../routes/dashboard/settings/inbox/Index.vue |  6 ++--
 .../settings/inbox/PreChatForm/Settings.vue   |  4 +--
 .../dashboard/settings/inbox/channels/Sms.vue |  2 +-
 .../settings/inbox/channels/Whatsapp.vue      |  2 +-
 .../inbox/settingsPage/ConfigurationPage.vue  | 12 +++----
 .../MultipleIntegrationHooks.vue              |  3 +-
 .../integrations/IntegrationHelpText.vue      |  2 +-
 .../integrations/Webhooks/WebhookRow.vue      |  6 ++--
 .../dashboard/settings/labels/Index.vue       |  8 ++---
 .../dashboard/settings/profile/Index.vue      |  2 +-
 .../reports/components/ReportFilters.vue      |  2 +-
 .../components/overview/MetricCard.vue        |  2 +-
 .../settings/teams/AgentSelector.vue          |  2 +-
 .../dashboard/settings/teams/Create/Index.vue |  2 +-
 .../dashboard/settings/teams/Edit/Index.vue   |  2 +-
 .../routes/dashboard/settings/teams/Index.vue |  6 ++--
 .../dashboard/routes/login/Login.vue          |  3 +-
 app/javascript/shared/components/Button.vue   |  2 +-
 app/javascript/shared/components/Spinner.vue  |  2 +-
 .../ui/MultiselectDropdownItems.vue           |  3 +-
 .../ui/dropdown/DropdownDivider.vue           |  6 +---
 .../components/ui/dropdown/DropdownItem.vue   |  2 +-
 .../components/ui/dropdown/DropdownMenu.vue   |  2 +-
 .../ui/dropdown/DropdownSubMenu.vue           |  2 +-
 .../shared/mixins/specs/MockComponent.vue     |  2 +-
 app/javascript/survey/views/Response.vue      |  2 +-
 app/javascript/widget/App.vue                 |  2 +-
 .../widget/components/AgentMessageBubble.vue  | 13 +++----
 .../widget/components/AgentTypingBubble.vue   |  2 +-
 .../widget/components/ConversationWrap.vue    |  4 +--
 .../widget/components/UnreadMessage.vue       |  2 +-
 .../widget/components/UserAvatar.vue          |  2 +-
 .../components/dropdown/DropdownMenu.vue      |  6 ++--
 package.json                                  |  3 +-
 86 files changed, 151 insertions(+), 186 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index f30e21e03..e699f0fd4 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -19,18 +19,32 @@ module.exports = {
     'jsx-a11y/label-has-for': 'off',
     'jsx-a11y/anchor-is-valid': 'off',
     'import/no-unresolved': 'off',
-    'vue/max-attributes-per-line': ['error', {
-      'singleline': 20,
-      'multiline': {
-        'max': 1,
-        'allowFirstLine': false
+    'vue/max-attributes-per-line': [
+      'error',
+      {
+        singleline: 20,
+        multiline: {
+          max: 1,
+          allowFirstLine: false,
+        },
       },
-    }],
-    'vue/html-self-closing': 'off',
-    "vue/no-v-html": 'off',
+    ],
+    'vue/html-self-closing': [
+      'error',
+      {
+        html: {
+          void: 'always',
+          normal: 'always',
+          component: 'always',
+        },
+        svg: 'always',
+        math: 'always',
+      },
+    ],
+    'vue/no-v-html': 'off',
     'vue/singleline-html-element-content-newline': 'off',
     'import/extensions': ['off'],
-    'no-console': 'error'
+    'no-console': 'error',
   },
   settings: {
     'import/resolver': {
@@ -41,12 +55,10 @@ module.exports = {
   },
   env: {
     browser: true,
-    node: true,
     jest: true,
-    jasmine: true
+    node: true,
   },
   globals: {
-    __WEBPACK_ENV__: true,
     bus: true,
   },
 };
diff --git a/app/javascript/dashboard/App.vue b/app/javascript/dashboard/App.vue
index 1e262f1ff..7243e566e 100644
--- a/app/javascript/dashboard/App.vue
+++ b/app/javascript/dashboard/App.vue
@@ -2,7 +2,7 @@
   <div v-if="!authUIFlags.isFetching" id="app" class="app-wrapper app-root">
     <update-banner :latest-chatwoot-version="latestChatwootVersion" />
     <transition name="fade" mode="out-in">
-      <router-view></router-view>
+      <router-view />
     </transition>
     <add-account-modal
       :show="showAddAccountModal"
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 4a90bf7a1..90eaa7b86 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="conversations-list-wrap">
-    <slot></slot>
+    <slot />
     <div
       class="chat-list__top"
       :class="{ filter__applied: hasAppliedFiltersOrActiveFolders }"
@@ -53,8 +53,7 @@
           size="small"
           class="btn-filter"
           @click="onToggleAdvanceFiltersModal"
-        >
-        </woot-button>
+        />
       </div>
     </div>
 
@@ -102,7 +101,7 @@
       />
 
       <div v-if="chatListLoading" class="text-center">
-        <span class="spinner"></span>
+        <span class="spinner" />
       </div>
 
       <woot-button
diff --git a/app/javascript/dashboard/components/ModalHeader.vue b/app/javascript/dashboard/components/ModalHeader.vue
index 9b80220a5..e0ce5f993 100644
--- a/app/javascript/dashboard/components/ModalHeader.vue
+++ b/app/javascript/dashboard/components/ModalHeader.vue
@@ -7,7 +7,7 @@
     <p v-if="headerContent" class="small-12 column">
       {{ headerContent }}
     </p>
-    <slot></slot>
+    <slot />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/components/NetworkNotification.vue b/app/javascript/dashboard/components/NetworkNotification.vue
index 115a674a2..6f29dbb74 100644
--- a/app/javascript/dashboard/components/NetworkNotification.vue
+++ b/app/javascript/dashboard/components/NetworkNotification.vue
@@ -20,8 +20,7 @@
           color-scheme="warning"
           icon="dismiss-circle"
           @click="closeNotification"
-        >
-        </woot-button>
+        />
       </div>
     </div>
   </transition>
diff --git a/app/javascript/dashboard/components/SettingsSection.vue b/app/javascript/dashboard/components/SettingsSection.vue
index e700e9467..b3348ae04 100644
--- a/app/javascript/dashboard/components/SettingsSection.vue
+++ b/app/javascript/dashboard/components/SettingsSection.vue
@@ -13,7 +13,7 @@
       </p>
     </div>
     <div class="medium-6 small-12">
-      <slot></slot>
+      <slot />
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/buttons/Button.vue b/app/javascript/dashboard/components/buttons/Button.vue
index 69dbc3658..733b84639 100644
--- a/app/javascript/dashboard/components/buttons/Button.vue
+++ b/app/javascript/dashboard/components/buttons/Button.vue
@@ -7,7 +7,7 @@
       :icon="icon"
     />
     <spinner v-if="isLoading" />
-    <slot></slot>
+    <slot />
   </button>
 </template>
 
diff --git a/app/javascript/dashboard/components/ui/Banner.vue b/app/javascript/dashboard/components/ui/Banner.vue
index 227b0a37e..a1b612952 100644
--- a/app/javascript/dashboard/components/ui/Banner.vue
+++ b/app/javascript/dashboard/components/ui/Banner.vue
@@ -30,8 +30,7 @@
       icon="dismiss-circle"
       class-names="banner-action__button"
       @click="onClickClose"
-    >
-    </woot-button>
+    />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/components/ui/Switch.vue b/app/javascript/dashboard/components/ui/Switch.vue
index b0bc32881..e15258c22 100644
--- a/app/javascript/dashboard/components/ui/Switch.vue
+++ b/app/javascript/dashboard/components/ui/Switch.vue
@@ -7,7 +7,7 @@
     :aria-checked="value.toString()"
     @click="onClick"
   >
-    <span aria-hidden="true" :class="{ active: value }"></span>
+    <span aria-hidden="true" :class="{ active: value }" />
   </button>
 </template>
 
diff --git a/app/javascript/dashboard/components/ui/WootButton.vue b/app/javascript/dashboard/components/ui/WootButton.vue
index 3d08ec928..e87c12e90 100644
--- a/app/javascript/dashboard/components/ui/WootButton.vue
+++ b/app/javascript/dashboard/components/ui/WootButton.vue
@@ -13,7 +13,7 @@
       :icon="icon"
       :icon-size="iconSize"
     />
-    <span v-if="$slots.default" class="button__content"><slot></slot></span>
+    <span v-if="$slots.default" class="button__content"><slot /></span>
   </button>
 </template>
 <script>
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
index 8230c6963..248bb5b35 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionInput.vue
@@ -77,7 +77,7 @@
       rows="4"
       :placeholder="$t('AUTOMATION.ACTION.TEAM_MESSAGE_INPUT_PLACEHOLDER')"
       class="action-message"
-    ></textarea>
+    />
     <p
       v-if="v.action_params.$dirty && v.action_params.$error"
       class="filter-error"
diff --git a/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
index cddaab713..61eb74f22 100644
--- a/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
+++ b/app/javascript/dashboard/components/widgets/AutomationActionTeamMessageInput.vue
@@ -20,7 +20,7 @@
         rows="4"
         :placeholder="$t('AUTOMATION.ACTION.TEAM_MESSAGE_INPUT_PLACEHOLDER')"
         @input="updateValue"
-      ></textarea>
+      />
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
index 557880056..a5e1cd871 100644
--- a/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
+++ b/app/javascript/dashboard/components/widgets/SettingIntroBanner.vue
@@ -6,7 +6,7 @@
     <p v-if="headerContent" class="small-12 column">
       {{ headerContent }}
     </p>
-    <slot></slot>
+    <slot />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
index 8796065ac..893bdcf3a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/AudioRecorder.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="audio-wave-wrapper">
-    <audio id="audio-wave" class="video-js vjs-fill vjs-default-skin"></audio>
+    <audio id="audio-wave" class="video-js vjs-fill vjs-default-skin" />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
index 1ac0ec333..a21658a8a 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/Editor.vue
@@ -10,7 +10,7 @@
       :search-key="cannedSearchTerm"
       @click="insertCannedResponse"
     />
-    <div ref="editor"></div>
+    <div ref="editor" />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 3ebf59a54..e291ecffe 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -32,8 +32,7 @@
         class="sidebar-toggle--button"
         :icon="isRightOrLeftIcon"
         @click="onToggleContactPanel"
-      >
-      </woot-button>
+      />
     </div>
     <ul class="conversation-panel">
       <transition name="slide-up">
diff --git a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
index d2307c55c..985c62138 100644
--- a/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/WhatsappTemplates/TemplateParser.vue
@@ -5,7 +5,7 @@
       rows="4"
       readonly
       class="template-input"
-    ></textarea>
+    />
     <div v-if="variables" class="template__variables-container">
       <p class="variables-label">
         {{ $t('WHATSAPP_TEMPLATES.PARSER.VARIABLES_LABEL') }}
diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
index bf21d535e..87df4d281 100644
--- a/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/bubble/Text.vue
@@ -6,7 +6,7 @@
       'hide--quoted': !showQuotedContent,
     }"
   >
-    <div v-dompurify-html="message" class="text-content"></div>
+    <div v-dompurify-html="message" class="text-content" />
     <button
       v-if="displayQuotedButton"
       class="quoted-text--button"
diff --git a/app/javascript/dashboard/components/widgets/forms/AvatarUploader.vue b/app/javascript/dashboard/components/widgets/forms/AvatarUploader.vue
index 768d9c119..5d1a325ea 100644
--- a/app/javascript/dashboard/components/widgets/forms/AvatarUploader.vue
+++ b/app/javascript/dashboard/components/widgets/forms/AvatarUploader.vue
@@ -22,7 +22,7 @@
         accept="image/png, image/jpeg, image/gif"
         @change="handleImageUpload"
       />
-      <slot></slot>
+      <slot />
     </label>
   </div>
 </template>
diff --git a/app/javascript/dashboard/components/widgets/forms/Input.vue b/app/javascript/dashboard/components/widgets/forms/Input.vue
index f2c8044cd..0161240b8 100644
--- a/app/javascript/dashboard/components/widgets/forms/Input.vue
+++ b/app/javascript/dashboard/components/widgets/forms/Input.vue
@@ -10,7 +10,7 @@
       @input="onChange"
       @blur="onBlur"
     />
-    <p v-if="helpText" class="help-text"></p>
+    <p v-if="helpText" class="help-text" />
     <span v-if="error" class="message">
       {{ error }}
     </span>
diff --git a/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue b/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
index 0c1472a84..18d8783ee 100644
--- a/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
+++ b/app/javascript/dashboard/components/widgets/modal/ConfirmationModal.vue
@@ -1,7 +1,7 @@
 <template>
   <modal :show.sync="show" :on-close="cancel">
     <div class="column content-box">
-      <woot-modal-header :header-title="title"> </woot-modal-header>
+      <woot-modal-header :header-title="title" />
       <div class="row modal-content">
         <div class="medium-12 columns">
           <p>
diff --git a/app/javascript/dashboard/modules/contact/components/MergeContact.vue b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
index 2c886ac64..addc1c1e2 100644
--- a/app/javascript/dashboard/modules/contact/components/MergeContact.vue
+++ b/app/javascript/dashboard/modules/contact/components/MergeContact.vue
@@ -9,7 +9,7 @@
             color-scheme="success"
             small
             class="label--merge-warning"
-          ></woot-label>
+          />
         </label>
         <multiselect
           :value="primaryContact"
@@ -46,7 +46,7 @@
               color-scheme="alert"
               small
               class="label--merge-warning"
-            ></woot-label>
+            />
           </label>
           <multiselect
             v-model="childContact"
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
index 3bba815db..7114e3bf6 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetBody.vue
@@ -14,7 +14,7 @@
       </div>
       <div class="agent-message-wrap">
         <div class="agent-message">
-          <div class="avatar-wrap"></div>
+          <div class="avatar-wrap" />
           <div class="message-wrap">
             <div class="chat-bubble agent">
               <div class="message-content">
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
index 1150b884e..8aa5c5925 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetFooter.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="footer-wrap">
-    <div class="input-area"></div>
+    <div class="input-area" />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
index 7857df8a4..6a08f2f55 100644
--- a/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
+++ b/app/javascript/dashboard/modules/widget-preview/components/WidgetHead.vue
@@ -11,7 +11,7 @@
         <div v-if="!config.isExpanded">
           <div class="title-block text-base font-medium">
             <span class="mr-1">{{ config.websiteName }}</span>
-            <div v-if="config.isOnline" class="online-dot"></div>
+            <div v-if="config.isOnline" class="online-dot" />
           </div>
           <div class="text-xs mt-1 text-black-700">
             {{ responseTime }}
diff --git a/app/javascript/dashboard/routes/auth/Auth.vue b/app/javascript/dashboard/routes/auth/Auth.vue
index e829308fb..757bd6578 100644
--- a/app/javascript/dashboard/routes/auth/Auth.vue
+++ b/app/javascript/dashboard/routes/auth/Auth.vue
@@ -1,5 +1,5 @@
 <template>
   <div class="row auth-wrap login align-center">
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/auth/Confirmation.vue b/app/javascript/dashboard/routes/auth/Confirmation.vue
index 1abf16f1e..839744a08 100644
--- a/app/javascript/dashboard/routes/auth/Confirmation.vue
+++ b/app/javascript/dashboard/routes/auth/Confirmation.vue
@@ -1,5 +1,5 @@
 <template>
-  <loading-state :message="$t('CONFIRM_EMAIL')"></loading-state>
+  <loading-state :message="$t('CONFIRM_EMAIL')" />
 </template>
 <script>
 import LoadingState from '../../components/widgets/LoadingState';
diff --git a/app/javascript/dashboard/routes/auth/PasswordEdit.vue b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
index 94380674f..b5d07cf8b 100644
--- a/app/javascript/dashboard/routes/auth/PasswordEdit.vue
+++ b/app/javascript/dashboard/routes/auth/PasswordEdit.vue
@@ -38,8 +38,7 @@
         :button-text="$t('SET_NEW_PASSWORD.SUBMIT')"
         :loading="newPasswordAPI.showLoading"
         button-class="expanded"
-      >
-      </woot-submit-button>
+      />
       <!-- <input type="submit" class="button " v-on:click.prevent="login()" v-bind:value="" > -->
     </div>
   </form>
diff --git a/app/javascript/dashboard/routes/auth/Signup.vue b/app/javascript/dashboard/routes/auth/Signup.vue
index a91ab5f12..ce892d765 100644
--- a/app/javascript/dashboard/routes/auth/Signup.vue
+++ b/app/javascript/dashboard/routes/auth/Signup.vue
@@ -89,9 +89,8 @@
             :button-text="$t('REGISTER.SUBMIT')"
             :loading="isSignupInProgress"
             button-class="large expanded"
-          >
-          </woot-submit-button>
-          <p v-dompurify-html="termsLink" class="accept--terms"></p>
+          />
+          <p v-dompurify-html="termsLink" class="accept--terms" />
         </form>
         <div class="column text-center sigin--footer">
           <span>{{ $t('REGISTER.HAVE_AN_ACCOUNT') }}</span>
diff --git a/app/javascript/dashboard/routes/dashboard/Dashboard.vue b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
index cfcaccfe5..f88aefe3a 100644
--- a/app/javascript/dashboard/routes/dashboard/Dashboard.vue
+++ b/app/javascript/dashboard/routes/dashboard/Dashboard.vue
@@ -8,9 +8,9 @@
       @open-key-shortcut-modal="toggleKeyShortcutModal"
       @close-key-shortcut-modal="closeKeyShortcutModal"
       @show-add-label-popup="showAddLabelPopup"
-    ></sidebar>
+    />
     <section class="app-content columns" :class="contentClassName">
-      <router-view></router-view>
+      <router-view />
       <command-bar />
       <account-selector
         :show-account-modal="showAccountModal"
diff --git a/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue
index 0408d2c70..54e900c30 100644
--- a/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue
+++ b/app/javascript/dashboard/routes/dashboard/contacts/components/AddReminder.vue
@@ -5,8 +5,7 @@
         v-model="content"
         class="input--reminder"
         @keydown.enter.shift.exact="onAdd"
-      >
-      </textarea>
+      />
       <div class="select-wrap">
         <div class="select">
           <div class="input-group">
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
index c4a4b9117..0ae756c8a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactConversations.vue
@@ -17,7 +17,7 @@
         />
       </div>
     </div>
-    <spinner v-else></spinner>
+    <spinner v-else />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
index a9a809385..bf3ee8140 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactCustomAttributes.vue
@@ -9,9 +9,7 @@
         {{ attribute }}
       </div>
       <div>
-        <span
-          v-dompurify-html="valueWithLink(customAttributes[attribute])"
-        ></span>
+        <span v-dompurify-html="valueWithLink(customAttributes[attribute])" />
       </div>
     </div>
     <p v-if="!listOfAttributes.length">
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
index c2987fe9c..e19d2990d 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
@@ -4,7 +4,7 @@
       <span class="item__title">
         {{ title }}
       </span>
-      <slot name="button"></slot>
+      <slot name="button" />
     </h4>
     <div v-if="value" class="conv-details--item__value">
       <slot>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index 294f2b6ba..d7318ce56 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -50,8 +50,7 @@
               <conversation-info
                 :conversation-attributes="conversationAdditionalAttributes"
                 :contact-attributes="contactAdditionalAttributes"
-              >
-              </conversation-info>
+              />
             </accordion-item>
           </div>
           <div v-else-if="element.name === 'contact_attributes'">
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index 5f8d3b6f8..13515ac21 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -14,8 +14,7 @@
       :inbox-id="inboxId"
       :is-contact-panel-open="isContactPanelOpen"
       @contact-panel-toggle="onToggleContactPanel"
-    >
-    </conversation-box>
+    />
   </section>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index bf0bd3692..57c6d211c 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -36,7 +36,7 @@
         </div>
       </div>
     </div>
-    <spinner v-else></spinner>
+    <spinner v-else />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
index 9064110db..ee66d2646 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SearchMessageItem.vue
@@ -14,7 +14,7 @@
         </div>
         <span class="timestamp">{{ readableTime }} </span>
       </div>
-      <p v-dompurify-html="prepareContent(content)" class="message-content"></p>
+      <p v-dompurify-html="prepareContent(content)" class="message-content" />
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
index b3ebdd23a..ee31d94b2 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanel.vue
@@ -64,8 +64,7 @@
             icon="chevron-left"
             :disabled="inFirstPage"
             @click="onClickPreviousPage"
-          >
-          </woot-button>
+          />
         </div>
         <span class="page-count"> {{ currentPage }} - {{ lastPage }} </span>
         <div class="flex-view">
@@ -76,8 +75,7 @@
             icon="chevron-right"
             :disabled="inLastPage"
             @click="onClickNextPage"
-          >
-          </woot-button>
+          />
           <woot-button
             size="medium"
             variant="clear"
@@ -95,7 +93,7 @@
           </woot-button>
         </div>
       </div>
-      <div v-else></div>
+      <div v-else />
     </div>
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
index 215e001fc..06c87d1b9 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationPanelList.vue
@@ -13,8 +13,8 @@
         <div
           v-if="!notificationItem.read_at"
           class="notification-unread--indicator"
-        ></div>
-        <div v-else class="empty flex-view"></div>
+        />
+        <div v-else class="empty flex-view" />
         <div class="notification-content--wrap w-full flex-space-between">
           <div class="flex-space-between">
             <div class="title-wrap flex-view ">
diff --git a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
index 77fa640a1..cd9c9b3d8 100644
--- a/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
+++ b/app/javascript/dashboard/routes/dashboard/notifications/components/NotificationTable.vue
@@ -6,8 +6,7 @@
       :button-text="$t('NOTIFICATIONS_PAGE.MARK_ALL_DONE')"
       :loading="isUpdating"
       @click="onMarkAllDoneClick"
-    >
-    </woot-submit-button>
+    />
 
     <table class="woot-table notifications-table">
       <tbody v-show="!isLoading">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 064bf1191..808516185 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="settings-header">
     <h1 class="page-title">
-      <woot-sidemenu-icon></woot-sidemenu-icon>
+      <woot-sidemenu-icon />
       <back-button
         v-if="showBackButton"
         :button-label="backButtonLabel"
         :back-url="backUrl"
       />
       <fluent-icon v-if="icon" :icon="icon" :class="iconClass" />
-      <slot></slot>
+      <slot />
       <span>{{ headerTitle }}</span>
     </h1>
     <router-link
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
index ea6a6e86b..e5451873c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsSubPageHeader.vue
@@ -3,7 +3,7 @@
     <h2 class="page-sub-title">
       {{ headerTitle }}
     </h2>
-    <p v-dompurify-html="headerContent" class="small-12 column"></p>
+    <p v-dompurify-html="headerContent" class="small-12 column" />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index 4842c0244..d781a7420 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -10,9 +10,9 @@
       :show-new-button="showNewButton"
     />
     <keep-alive v-if="keepAlive">
-      <router-view></router-view>
+      <router-view />
     </keep-alive>
-    <router-view v-else></router-view>
+    <router-view v-else />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
index 37639d9f8..9a23ceb1e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/account/Index.vue
@@ -89,7 +89,7 @@
           </p>
         </div>
         <div class="columns small-9 medium-5">
-          <woot-code :script="getAccountId"></woot-code>
+          <woot-code :script="getAccountId" />
         </div>
       </div>
       <div class="current-version">
@@ -107,8 +107,7 @@
         class="button nice success button--fixed-right-top"
         :button-text="$t('GENERAL_SETTINGS.SUBMIT')"
         :loading="isUpdating"
-      >
-      </woot-submit-button>
+      />
     </form>
 
     <woot-loading-state v-if="uiFlags.isFetchingItem" />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
index d58ca76fa..1622ec14e 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/agents/Index.vue
@@ -66,8 +66,7 @@
                       icon="edit"
                       class-names="grey-btn"
                       @click="openEditPopup(agent)"
-                    >
-                    </woot-button>
+                    />
                     <woot-button
                       v-if="showDeleteAction(agent)"
                       v-tooltip.top="$t('AGENT_MGMT.DELETE.BUTTON_TEXT')"
@@ -78,8 +77,7 @@
                       class-names="grey-btn"
                       :is-loading="loading[agent.id]"
                       @click="openDeletePopup(agent, index)"
-                    >
-                    </woot-button>
+                    />
                   </div>
                 </td>
               </tr>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
index f89bb6eb2..f71adc4fe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/CustomAttribute.vue
@@ -57,8 +57,7 @@
                   class-names="grey-btn"
                   icon="edit"
                   @click="openEditPopup(attribute)"
-                >
-                </woot-button>
+                />
                 <woot-button
                   v-tooltip.top="$t('ATTRIBUTES_MGMT.LIST.BUTTONS.DELETE')"
                   variant="smooth"
@@ -67,8 +66,7 @@
                   icon="dismiss-circle"
                   class-names="grey-btn"
                   @click="openDelete(attribute)"
-                >
-                </woot-button>
+                />
               </td>
             </tr>
           </tbody>
@@ -76,7 +74,7 @@
       </div>
     </div>
     <div class="small-4 columns">
-      <span v-dompurify-html="$t('ATTRIBUTES_MGMT.SIDEBAR_TXT')"></span>
+      <span v-dompurify-html="$t('ATTRIBUTES_MGMT.SIDEBAR_TXT')" />
     </div>
     <woot-modal :show.sync="showEditPopup" :on-close="hideEditPopup">
       <edit-attribute
diff --git a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
index 60f3c6dde..bad916e83 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/automation/Index.vue
@@ -50,8 +50,7 @@
                   :is-loading="loading[automation.id]"
                   icon="edit"
                   @click="openEditPopup(automation)"
-                >
-                </woot-button>
+                />
                 <woot-button
                   v-tooltip.top="$t('AUTOMATION.CLONE.TOOLTIP')"
                   variant="smooth"
@@ -61,8 +60,7 @@
                   :is-loading="loading[automation.id]"
                   icon="copy"
                   @click="cloneAutomation(automation.id)"
-                >
-                </woot-button>
+                />
                 <woot-button
                   v-tooltip.top="$t('AUTOMATION.FORM.DELETE')"
                   variant="smooth"
@@ -72,8 +70,7 @@
                   class-names="grey-btn"
                   :is-loading="loading[automation.id]"
                   @click="openDeletePopup(automation, index)"
-                >
-                </woot-button>
+                />
               </td>
             </tr>
           </tbody>
@@ -81,7 +78,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-dompurify-html="$t('AUTOMATION.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('AUTOMATION.SIDEBAR_TXT')" />
       </div>
     </div>
     <woot-modal
diff --git a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
index bde14d385..b35ee4e82 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/canned/Index.vue
@@ -56,8 +56,7 @@
                   color-scheme="secondary"
                   icon="edit"
                   @click="openEditPopup(cannedItem)"
-                >
-                </woot-button>
+                />
                 <woot-button
                   v-tooltip.top="$t('CANNED_MGMT.DELETE.BUTTON_TEXT')"
                   variant="smooth"
@@ -67,8 +66,7 @@
                   class-names="grey-btn"
                   :is-loading="loading[cannedItem.id]"
                   @click="openDeletePopup(cannedItem, index)"
-                >
-                </woot-button>
+                />
               </td>
             </tr>
           </tbody>
@@ -76,7 +74,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-dompurify-html="$t('CANNED_MGMT.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('CANNED_MGMT.SIDEBAR_TXT')" />
       </div>
     </div>
     <!-- Add Agent -->
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
index b42e5e9c3..93c6e52c2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/AddAgents.vue
@@ -25,8 +25,7 @@
               :deselect-label="$t('FORMS.MULTISELECT.ENTER_TO_REMOVE')"
               :placeholder="$t('INBOX_MGMT.ADD.AGENTS.PICK_AGENTS')"
               @select="$v.selectedAgents.$touch"
-            >
-            </multiselect>
+            />
             <span v-if="$v.selectedAgents.$error" class="message">
               {{ $t('INBOX_MGMT.ADD.AGENTS.VALIDATION_ERROR') }}
             </span>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
index 270c28fc6..e4fda7269 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/FinishSetup.vue
@@ -10,40 +10,35 @@
           <woot-code
             v-if="currentInbox.web_widget_script"
             :script="currentInbox.web_widget_script"
-          >
-          </woot-code>
+          />
         </div>
         <div class="medium-6 small-offset-3">
           <woot-code
             v-if="isATwilioInbox"
             lang="html"
             :script="currentInbox.callback_webhook_url"
-          >
-          </woot-code>
+          />
         </div>
         <div class="medium-6 small-offset-3">
           <woot-code
             v-if="isALineInbox"
             lang="html"
             :script="currentInbox.callback_webhook_url"
-          >
-          </woot-code>
+          />
         </div>
         <div class="medium-6 small-offset-3">
           <woot-code
             v-if="isASmsInbox"
             lang="html"
             :script="currentInbox.callback_webhook_url"
-          >
-          </woot-code>
+          />
         </div>
         <div class="medium-6 small-offset-3">
           <woot-code
             v-if="isAEmailInbox"
             lang="html"
             :script="currentInbox.forward_to_email"
-          >
-          </woot-code>
+          />
         </div>
         <div class="footer">
           <router-link
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
index 18bd8a6af..a17faa9cc 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/InboxChannels.vue
@@ -5,7 +5,7 @@
       :global-config="globalConfig"
       :items="items"
     />
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
index d5abbaaf5..5ac72be93 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Index.vue
@@ -77,8 +77,7 @@
                       icon="settings"
                       color-scheme="secondary"
                       class-names="grey-btn"
-                    >
-                    </woot-button>
+                    />
                   </router-link>
 
                   <woot-button
@@ -91,8 +90,7 @@
                     :is-loading="loading[item.id]"
                     icon="dismiss-circle"
                     @click="openDelete(item)"
-                  >
-                  </woot-button>
+                  />
                 </div>
               </td>
             </tr>
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 15bed8dfa..0e6891910 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/PreChatForm/Settings.vue
@@ -31,8 +31,8 @@
           <table class="table table-striped w-full">
             <thead class="thead-dark">
               <tr>
-                <th scope="col"></th>
-                <th scope="col"></th>
+                <th scope="col" />
+                <th scope="col" />
                 <th scope="col">
                   {{ $t('INBOX_MGMT.PRE_CHAT_FORM.SET_FIELDS_HEADER.KEY') }}
                 </th>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
index b669ad27d..514ea1181 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Sms.vue
@@ -17,7 +17,7 @@
         </select>
       </label>
     </div>
-    <twilio v-if="provider === 'twilio'" type="sms"></twilio>
+    <twilio v-if="provider === 'twilio'" type="sms" />
     <bandwidth-sms v-else />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
index d6f13c426..dadce2d3b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Whatsapp.vue
@@ -18,7 +18,7 @@
       </label>
     </div>
 
-    <twilio v-if="provider === 'twilio'" type="whatsapp"></twilio>
+    <twilio v-if="provider === 'twilio'" type="whatsapp" />
     <three-sixty-dialog-whatsapp v-else />
   </div>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
index cc8746fed..3a7a61760 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/ConfigurationPage.vue
@@ -4,7 +4,7 @@
       :title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.TITLE')"
       :sub-title="$t('INBOX_MGMT.ADD.TWILIO.API_CALLBACK.SUBTITLE')"
     >
-      <woot-code :script="inbox.callback_webhook_url" lang="html"></woot-code>
+      <woot-code :script="inbox.callback_webhook_url" lang="html" />
     </settings-section>
   </div>
   <div v-else-if="isALineChannel" class="settings--content">
@@ -12,7 +12,7 @@
       :title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.TITLE')"
       :sub-title="$t('INBOX_MGMT.ADD.LINE_CHANNEL.API_CALLBACK.SUBTITLE')"
     >
-      <woot-code :script="inbox.callback_webhook_url" lang="html"></woot-code>
+      <woot-code :script="inbox.callback_webhook_url" lang="html" />
     </settings-section>
   </div>
   <div v-else-if="isAWebWidgetInbox">
@@ -21,14 +21,14 @@
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_HEADING')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.MESSENGER_SUB_HEAD')"
       >
-        <woot-code :script="inbox.web_widget_script"></woot-code>
+        <woot-code :script="inbox.web_widget_script" />
       </settings-section>
 
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_VERIFICATION')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_DESCRIPTION')"
       >
-        <woot-code :script="inbox.hmac_token"></woot-code>
+        <woot-code :script="inbox.hmac_token" />
       </settings-section>
       <settings-section
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.HMAC_MANDATORY_VERIFICATION')"
@@ -53,7 +53,7 @@
       :title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER')"
       :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.INBOX_IDENTIFIER_SUB_TEXT')"
     >
-      <woot-code :script="inbox.inbox_identifier"></woot-code>
+      <woot-code :script="inbox.inbox_identifier" />
     </settings-section>
   </div>
   <div v-else-if="isAnEmailChannel">
@@ -62,7 +62,7 @@
         :title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_TITLE')"
         :sub-title="$t('INBOX_MGMT.SETTINGS_POPUP.FORWARD_EMAIL_SUB_TEXT')"
       >
-        <woot-code :script="inbox.forward_to_email"></woot-code>
+        <woot-code :script="inbox.forward_to_email" />
       </settings-section>
     </div>
     <imap-settings :inbox="inbox" />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
index 19ec1d597..7268606fe 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/MultipleIntegrationHooks.vue
@@ -31,8 +31,7 @@
                 icon="dismiss-circle"
                 class-names="grey-btn"
                 @click="$emit('delete', hook)"
-              >
-              </woot-button>
+              />
             </td>
           </tr>
         </tbody>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
index c99f8827d..2e6d00dac 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/IntegrationHelpText.vue
@@ -6,7 +6,7 @@
         <p>
           <span
             v-dompurify-html="$t('INTEGRATION_SETTINGS.SLACK.HELP_TEXT.BODY')"
-          ></span>
+          />
         </p>
       </div>
     </div>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
index 0e754d93d..5c4640ca2 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhooks/WebhookRow.vue
@@ -17,8 +17,7 @@
         color-scheme="secondary"
         icon="edit"
         @click="$emit('edit', webhook)"
-      >
-      </woot-button>
+      />
       <woot-button
         v-tooltip.top="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT')"
         variant="smooth"
@@ -26,8 +25,7 @@
         size="tiny"
         icon="dismiss-circle"
         @click="$emit('delete', webhook, index)"
-      >
-      </woot-button>
+      />
     </td>
   </tr>
 </template>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
index 66de41a00..66f763524 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -52,8 +52,7 @@
                   :is-loading="loading[label.id]"
                   icon="edit"
                   @click="openEditPopup(label)"
-                >
-                </woot-button>
+                />
                 <woot-button
                   v-tooltip.top="$t('LABEL_MGMT.FORM.DELETE')"
                   variant="smooth"
@@ -63,8 +62,7 @@
                   class-names="grey-btn"
                   :is-loading="loading[label.id]"
                   @click="openDeletePopup(label, index)"
-                >
-                </woot-button>
+                />
               </td>
             </tr>
           </tbody>
@@ -72,7 +70,7 @@
       </div>
 
       <div class="small-4 columns">
-        <span v-dompurify-html="$t('LABEL_MGMT.SIDEBAR_TXT')"></span>
+        <span v-dompurify-html="$t('LABEL_MGMT.SIDEBAR_TXT')" />
       </div>
     </div>
     <woot-modal :show.sync="showAddPopup" :on-close="hideAddPopup">
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 850130f08..53152f09d 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -87,7 +87,7 @@
         </p>
       </div>
       <div class="columns small-9 medium-5">
-        <woot-code :script="currentUser.access_token"></woot-code>
+        <woot-code :script="currentUser.access_token" />
       </div>
     </div>
   </div>
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 c0b87e19b..0ad8fb710 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -76,7 +76,7 @@
                 reports-option__item
                 reports-option__label--swatch
               "
-            ></div>
+            />
             <span class="reports-option__desc">
               <span class="reports-option__title">
                 {{ props.option.title }}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
index 5dd81f5ac..04394b151 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/overview/MetricCard.vue
@@ -7,7 +7,7 @@
       </span>
     </div>
     <div v-if="!isLoading" class="card-body row">
-      <slot></slot>
+      <slot />
     </div>
     <div v-else-if="isLoading" class="conversation-metric-loader">
       <spinner />
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
index 6a0bb7e21..aa4dd2e20 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/AgentSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="add-agents__header"></div>
+    <div class="add-agents__header" />
     <table class="woot-table">
       <thead>
         <tr>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
index 33f6b3c3f..3009ac570 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Create/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row content-box full-height">
     <woot-wizard class="small-3 columns" :items="items" />
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
index f85042003..49aa09d70 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Edit/Index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="row content-box full-height">
     <woot-wizard class="small-3 columns" :items="items" />
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
index c9bea40f6..b1d0ca7ec 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/teams/Index.vue
@@ -33,8 +33,7 @@
                       color-scheme="secondary"
                       class-names="grey-btn"
                       icon="settings"
-                    >
-                    </woot-button>
+                    />
                   </router-link>
                   <woot-button
                     v-if="isAdmin"
@@ -46,8 +45,7 @@
                     class-names="grey-btn"
                     :is-loading="loading[item.id]"
                     @click="openDelete(item)"
-                  >
-                  </woot-button>
+                  />
                 </div>
               </td>
             </tr>
diff --git a/app/javascript/dashboard/routes/login/Login.vue b/app/javascript/dashboard/routes/login/Login.vue
index 428974af7..c0626a87c 100644
--- a/app/javascript/dashboard/routes/login/Login.vue
+++ b/app/javascript/dashboard/routes/login/Login.vue
@@ -45,8 +45,7 @@
               :button-text="$t('LOGIN.SUBMIT')"
               :loading="loginApi.showLoading"
               button-class="large expanded"
-            >
-            </woot-submit-button>
+            />
           </div>
         </form>
         <div class="column text-center sigin__footer">
diff --git a/app/javascript/shared/components/Button.vue b/app/javascript/shared/components/Button.vue
index 3f85fe57a..142561114 100644
--- a/app/javascript/shared/components/Button.vue
+++ b/app/javascript/shared/components/Button.vue
@@ -5,7 +5,7 @@
     :disabled="disabled"
     @click="onClick"
   >
-    <slot></slot>
+    <slot />
   </button>
 </template>
 <script>
diff --git a/app/javascript/shared/components/Spinner.vue b/app/javascript/shared/components/Spinner.vue
index 2da912dee..8c5bc9071 100644
--- a/app/javascript/shared/components/Spinner.vue
+++ b/app/javascript/shared/components/Spinner.vue
@@ -1,5 +1,5 @@
 <template>
-  <span class="spinner" :class="size"></span>
+  <span class="spinner" :class="size" />
 </template>
 <script>
 export default {
diff --git a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
index fbd4c91bf..8aadcb7cb 100644
--- a/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
+++ b/app/javascript/shared/components/ui/MultiselectDropdownItems.vue
@@ -43,8 +43,7 @@
                   <fluent-icon
                     v-if="option.id === (selectedItem && selectedItem.id)"
                     icon="checkmark"
-                  >
-                  </fluent-icon>
+                  />
                 </div>
               </div>
             </woot-button>
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownDivider.vue b/app/javascript/shared/components/ui/dropdown/DropdownDivider.vue
index 3240275d9..6654830a5 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownDivider.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownDivider.vue
@@ -1,9 +1,5 @@
 <template>
-  <li
-    class="dropdown-menu--divider"
-    :tabindex="null"
-    :aria-disabled="true"
-  ></li>
+  <li class="dropdown-menu--divider" :tabindex="null" :aria-disabled="true" />
 </template>
 <script>
 export default {};
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownItem.vue b/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
index 225b67b1d..34ec42f27 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownItem.vue
@@ -7,7 +7,7 @@
     :tabindex="disabled ? null : -1"
     :aria-disabled="disabled"
   >
-    <slot></slot>
+    <slot />
   </li>
 </template>
 <script>
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue b/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
index 2f72a824c..c2211ae2c 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownMenu.vue
@@ -4,7 +4,7 @@
     class="dropdown menu vertical"
     :class="[placement && `dropdown--${placement}`]"
   >
-    <slot></slot>
+    <slot />
   </ul>
 </template>
 <script>
diff --git a/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue b/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
index 2055ffc5e..7a1318404 100644
--- a/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
+++ b/app/javascript/shared/components/ui/dropdown/DropdownSubMenu.vue
@@ -2,7 +2,7 @@
   <li class="sub-menu-container">
     <ul class="sub-menu-li-container">
       <woot-dropdown-header :title="title" />
-      <slot></slot>
+      <slot />
     </ul>
   </li>
 </template>
diff --git a/app/javascript/shared/mixins/specs/MockComponent.vue b/app/javascript/shared/mixins/specs/MockComponent.vue
index 1d1012c3a..050205f70 100644
--- a/app/javascript/shared/mixins/specs/MockComponent.vue
+++ b/app/javascript/shared/mixins/specs/MockComponent.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="test"></div>
+  <div class="test" />
 </template>
 
 <script>
diff --git a/app/javascript/survey/views/Response.vue b/app/javascript/survey/views/Response.vue
index d855c253c..6ec4ec100 100644
--- a/app/javascript/survey/views/Response.vue
+++ b/app/javascript/survey/views/Response.vue
@@ -45,7 +45,7 @@
         />
       </div>
       <div class="mb-3">
-        <branding></branding>
+        <branding />
       </div>
     </div>
   </div>
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index f31ba57ad..0af28295a 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -15,7 +15,7 @@
       'is-flat-design': isWidgetStyleFlat,
     }"
   >
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
 
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index 0695292a7..3c51de944 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -11,7 +11,7 @@
         v-dompurify-html="formatMessage(message, false)"
         class="message-content"
         :class="$dm('text-black-900', 'dark:text-slate-50')"
-      ></div>
+      />
       <email-input
         v-if="isTemplateEmail"
         :message-id="messageId"
@@ -24,8 +24,7 @@
         :options="messageContentAttributes.items"
         :hide-fields="!!messageContentAttributes.submitted_values"
         @click="onOptionSelect"
-      >
-      </chat-options>
+      />
     </div>
     <chat-form
       v-if="isForm && !messageContentAttributes.submitted_values"
@@ -33,8 +32,7 @@
       :button-label="messageContentAttributes.button_label"
       :submitted-values="messageContentAttributes.submitted_values"
       @submit="onFormSubmit"
-    >
-    </chat-form>
+    />
     <div v-if="isCards">
       <chat-card
         v-for="item in messageContentAttributes.items"
@@ -43,11 +41,10 @@
         :title="item.title"
         :description="item.description"
         :actions="item.actions"
-      >
-      </chat-card>
+      />
     </div>
     <div v-if="isArticle">
-      <chat-article :items="messageContentAttributes.items"></chat-article>
+      <chat-article :items="messageContentAttributes.items" />
     </div>
     <customer-satisfaction
       v-if="isCSAT"
diff --git a/app/javascript/widget/components/AgentTypingBubble.vue b/app/javascript/widget/components/AgentTypingBubble.vue
index 8e93be85c..fffca9f79 100644
--- a/app/javascript/widget/components/AgentTypingBubble.vue
+++ b/app/javascript/widget/components/AgentTypingBubble.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="agent-message-wrap">
     <div class="agent-message">
-      <div class="avatar-wrap"></div>
+      <div class="avatar-wrap" />
       <div class="message-wrap">
         <div
           class="typing-bubble chat-bubble agent"
diff --git a/app/javascript/widget/components/ConversationWrap.vue b/app/javascript/widget/components/ConversationWrap.vue
index 813325fcd..07b7a61e6 100755
--- a/app/javascript/widget/components/ConversationWrap.vue
+++ b/app/javascript/widget/components/ConversationWrap.vue
@@ -2,14 +2,14 @@
   <div class="conversation--container">
     <div class="conversation-wrap" :class="{ 'is-typing': isAgentTyping }">
       <div v-if="isFetchingList" class="message--loader">
-        <spinner></spinner>
+        <spinner />
       </div>
       <div
         v-for="groupedMessage in groupedMessages"
         :key="groupedMessage.date"
         class="messages-wrap"
       >
-        <date-separator :date="groupedMessage.date"></date-separator>
+        <date-separator :date="groupedMessage.date" />
         <chat-message
           v-for="message in groupedMessage.messages"
           :key="message.id"
diff --git a/app/javascript/widget/components/UnreadMessage.vue b/app/javascript/widget/components/UnreadMessage.vue
index f7494aec4..84a1114ff 100644
--- a/app/javascript/widget/components/UnreadMessage.vue
+++ b/app/javascript/widget/components/UnreadMessage.vue
@@ -18,7 +18,7 @@
       <div
         v-dompurify-html="formatMessage(message, false)"
         class="message-content"
-      ></div>
+      />
     </button>
   </div>
 </template>
diff --git a/app/javascript/widget/components/UserAvatar.vue b/app/javascript/widget/components/UserAvatar.vue
index f7399bcd6..c6120b3ce 100755
--- a/app/javascript/widget/components/UserAvatar.vue
+++ b/app/javascript/widget/components/UserAvatar.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="user-avatar" :class="size" :style="getBgImage"></div>
+  <div class="user-avatar" :class="size" :style="getBgImage" />
 </template>
 <script>
 /**
diff --git a/app/javascript/widget/components/dropdown/DropdownMenu.vue b/app/javascript/widget/components/dropdown/DropdownMenu.vue
index 1bccb7147..85db8ad21 100644
--- a/app/javascript/widget/components/dropdown/DropdownMenu.vue
+++ b/app/javascript/widget/components/dropdown/DropdownMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="relative">
     <button class="z-10 focus:outline-none select-none" @click="toggleMenu">
-      <slot name="button"></slot>
+      <slot name="button" />
     </button>
 
     <!-- to close when clicked on space around it-->
@@ -10,7 +10,7 @@
       tabindex="-1"
       class="fixed inset-0 h-full w-full cursor-default focus:outline-none"
       @click="toggleMenu"
-    ></button>
+    />
 
     <!--dropdown menu-->
     <transition
@@ -26,7 +26,7 @@
         class="menu-content absolute shadow-xl rounded-md border-solid border border-slate-100 mt-1 py-1 px-2 bg-white z-10"
         :class="menuPlacement === 'right' ? 'right-0' : 'left-0'"
       >
-        <slot name="content"></slot>
+        <slot name="content" />
       </div>
     </transition>
   </div>
diff --git a/package.json b/package.json
index dcfd8d5db..a33a9045d 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
   "version": "2.5.0",
   "license": "MIT",
   "scripts": {
-    "eslint": "eslint app/**/*.{js,vue} --fix",
+    "eslint": "eslint app/**/*.{js,vue}",
+    "eslint:fix": "eslint app/**/*.{js,vue} --fix",
     "pretest": "rimraf .jest-cache",
     "test": "jest  -w 1 --no-cache",
     "test:watch": "jest -w 1 --watch --no-cache",

From bc8e08f126fed5db2668b302a8cebe2fa59489f1 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sun, 12 Jun 2022 11:08:06 +0530
Subject: [PATCH 158/177] chore: Update translations from Crowdin (#4838)

---
 .../i18n/locale/es/advancedFilters.json       |  4 +-
 .../dashboard/i18n/locale/es/automation.json  | 48 ++++++-------
 .../dashboard/i18n/locale/es/bulkActions.json | 20 +++---
 .../dashboard/i18n/locale/es/chatlist.json    |  2 +-
 .../i18n/locale/es/contactFilters.json        |  4 +-
 .../i18n/locale/es/conversation.json          |  4 +-
 .../i18n/locale/es/generalSettings.json       |  4 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   | 22 +++---
 .../i18n/locale/es/integrations.json          | 24 +++----
 .../dashboard/i18n/locale/es/report.json      | 72 +++++++++----------
 .../dashboard/i18n/locale/es/settings.json    |  8 +--
 .../dashboard/i18n/locale/es/signup.json      |  2 +-
 .../i18n/locale/es/teamsSettings.json         |  2 +-
 .../i18n/locale/es/whatsappTemplates.json     | 24 +++----
 .../dashboard/i18n/locale/ru/bulkActions.json | 20 +++---
 .../i18n/locale/ru/conversation.json          |  4 +-
 .../dashboard/i18n/locale/ru/inboxMgmt.json   |  4 +-
 .../dashboard/i18n/locale/ru/report.json      |  2 +-
 .../dashboard/i18n/locale/ru/settings.json    |  2 +-
 .../i18n/locale/ru/whatsappTemplates.json     | 26 +++----
 app/javascript/widget/i18n/locale/es.json     | 12 ++--
 config/locales/es.yml                         | 24 +++----
 22 files changed, 167 insertions(+), 167 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
index 23a5e1daa..bbe86dec7 100644
--- a/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
+++ b/app/javascript/dashboard/i18n/locale/es/advancedFilters.json
@@ -22,7 +22,7 @@
       "is_not_present": "No está presente",
       "is_greater_than": "Es mayor que",
       "is_less_than": "Es menor que",
-      "days_before": "Is x days before"
+      "days_before": "Es X días antes"
     },
     "ATTRIBUTE_LABELS": {
       "TRUE": "Verdadero",
@@ -44,7 +44,7 @@
       "CUSTOM_ATTRIBUTE_NUMBER": "Número",
       "CUSTOM_ATTRIBUTE_LINK": "Enlace",
       "CUSTOM_ATTRIBUTE_CHECKBOX": "Casilla",
-      "CREATED_AT": "Created At",
+      "CREATED_AT": "Creado el",
       "LAST_ACTIVITY": "Última actividad"
     },
     "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/es/automation.json b/app/javascript/dashboard/i18n/locale/es/automation.json
index 6328ceda4..ae24fcb1a 100644
--- a/app/javascript/dashboard/i18n/locale/es/automation.json
+++ b/app/javascript/dashboard/i18n/locale/es/automation.json
@@ -59,23 +59,23 @@
       },
       "API": {
         "SUCCESS_MESSAGE": "Regla de automatización eliminada correctamente",
-        "ERROR_MESSAGE": "Could not able to delete a automation rule, Please try again later"
+        "ERROR_MESSAGE": "No se pudo eliminar una regla de automatización, por favor inténtalo más tarde"
       }
     },
     "EDIT": {
-      "TITLE": "Edit Automation Rule",
+      "TITLE": "Editar regla de automatización",
       "SUBMIT": "Actualizar",
       "CANCEL_BUTTON_TEXT": "Cancelar",
       "API": {
-        "SUCCESS_MESSAGE": "Automation rule updated successfully",
-        "ERROR_MESSAGE": "Could not update automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Regla de automatización actualizada correctamente",
+        "ERROR_MESSAGE": "No se pudo actualizar la regla de automatización, por favor inténtalo más tarde"
       }
     },
     "CLONE": {
-      "TOOLTIP": "Clone",
+      "TOOLTIP": "Clonar",
       "API": {
-        "SUCCESS_MESSAGE": "Automation cloned successfully",
-        "ERROR_MESSAGE": "Could not clone automation rule, Please try again later"
+        "SUCCESS_MESSAGE": "Automatización clonada con éxito",
+        "ERROR_MESSAGE": "No se pudo clonar la regla de automatización, por favor inténtalo más tarde"
       }
     },
     "FORM": {
@@ -83,34 +83,34 @@
       "CREATE": "Crear",
       "DELETE": "Eliminar",
       "CANCEL": "Cancelar",
-      "RESET_MESSAGE": "Changing event type will reset the conditions and events you have added below"
+      "RESET_MESSAGE": "El cambio de tipo de evento restablecerá las condiciones y eventos que has añadido abajo"
     },
     "CONDITION": {
-      "DELETE_MESSAGE": "You need to have atleast one condition to save"
+      "DELETE_MESSAGE": "Necesitas tener al menos una condición para guardar"
     },
     "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": "Necesitas tener al menos una acción para guardar",
+      "TEAM_MESSAGE_INPUT_PLACEHOLDER": "Introduzca su mensaje aquí",
+      "TEAM_DROPDOWN_PLACEHOLDER": "Seleccionar equipos"
     },
     "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": "Activar regla de automatización",
+      "DEACTIVATION_TITLE": "Desactivar regla de automatización",
+      "ACTIVATION_DESCRIPTION": "Esta acción activará la regla de automatización '{automationName}'. ¿Seguro que desea continuar?",
+      "DEACTIVATION_DESCRIPTION": "Esta acción desactivará la regla de automatización '{automationName}'. ¿Está seguro que desea continuar?",
+      "ACTIVATION_SUCCESFUL": "Regla de automatización activada con éxito",
+      "DEACTIVATION_SUCCESFUL": "Regla de automatización desactivada con éxito",
+      "ACTIVATION_ERROR": "No se pudo activar la automatización, por favor inténtelo de nuevo más tarde",
+      "DEACTIVATION_ERROR": "No se pudo desactivar la automatización, por favor inténtelo de nuevo más tarde",
       "CONFIRMATION_LABEL": "Si",
       "CANCEL_LABEL": "No"
     },
     "ATTACHMENT": {
-      "UPLOAD_ERROR": "Could not upload attachment, Please try again",
-      "LABEL_IDLE": "Upload Attachment",
+      "UPLOAD_ERROR": "No se pudo subir el archivo adjunto, por favor inténtelo de nuevo",
+      "LABEL_IDLE": "Subir archivo adjunto",
       "LABEL_UPLOADING": "Subiendo...",
-      "LABEL_UPLOADED": "Succesfully Uploaded",
-      "LABEL_UPLOAD_FAILED": "Upload Failed"
+      "LABEL_UPLOADED": "Subido correctamente",
+      "LABEL_UPLOAD_FAILED": "Error al subir"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/bulkActions.json b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
index b887e6126..28f1ba533 100644
--- a/app/javascript/dashboard/i18n/locale/es/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/es/bulkActions.json
@@ -1,17 +1,17 @@
 {
     "BULK_ACTION": {
-        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "CONVERSATIONS_SELECTED": "%{conversationCount} conversaciones seleccionadas",
         "AGENT_SELECT_LABEL": "Seleccionar agente",
-        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_CONFIRMATION_LABEL": "¿Está seguro que desea asignar %{conversationCount} %{conversationLabel} a",
+        "GO_BACK_LABEL": "Volver",
         "ASSIGN_LABEL": "Asignar",
-        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "ASSIGN_AGENT_TOOLTIP": "Asignar agente",
         "RESOLVE_TOOLTIP": "Resolver",
-        "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"
+        "ASSIGN_SUCCESFUL": "Conversaciones asignadas con éxito",
+        "ASSIGN_FAILED": "Error al asignar conversaciones, inténtelo de nuevo",
+        "RESOLVE_SUCCESFUL": "Conversaciones resueltas con éxito",
+        "RESOLVE_FAILED": "Error al resolver las conversaciones, inténtelo de nuevo",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Las conversaciones visibles en esta página sólo están seleccionadas.",
+        "AGENT_LIST_LOADING": "Cargando agentes"
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/chatlist.json b/app/javascript/dashboard/i18n/locale/es/chatlist.json
index a8d0062ee..26b365f21 100644
--- a/app/javascript/dashboard/i18n/locale/es/chatlist.json
+++ b/app/javascript/dashboard/i18n/locale/es/chatlist.json
@@ -60,6 +60,6 @@
     "NO_CONTENT": "No hay contenido disponible",
     "HIDE_QUOTED_TEXT": "Ocultar texto citado",
     "SHOW_QUOTED_TEXT": "Mostrar texto citado",
-    "MESSAGE_READ": "Read"
+    "MESSAGE_READ": "Leído"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/contactFilters.json b/app/javascript/dashboard/i18n/locale/es/contactFilters.json
index 51fba0d0b..d5fb5a1c2 100644
--- a/app/javascript/dashboard/i18n/locale/es/contactFilters.json
+++ b/app/javascript/dashboard/i18n/locale/es/contactFilters.json
@@ -23,7 +23,7 @@
             "is_not_present": "No está presente",
             "is_greater_than": "Es mayor que",
             "is_lesser_than": "Es menor que",
-            "days_before": "Is x days before"
+            "days_before": "Es X días antes"
         },
         "ATTRIBUTES": {
             "NAME": "Nombre",
@@ -37,7 +37,7 @@
             "CUSTOM_ATTRIBUTE_NUMBER": "Número",
             "CUSTOM_ATTRIBUTE_LINK": "Enlace",
             "CUSTOM_ATTRIBUTE_CHECKBOX": "Casilla",
-            "CREATED_AT": "Created At",
+            "CREATED_AT": "Creado el",
             "LAST_ACTIVITY": "Última actividad"
         },
         "GROUPS": {
diff --git a/app/javascript/dashboard/i18n/locale/es/conversation.json b/app/javascript/dashboard/i18n/locale/es/conversation.json
index 07ce4cc5b..afd28d55a 100644
--- a/app/javascript/dashboard/i18n/locale/es/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/es/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Por favor, selecciona una conversación del panel izquierdo",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "DASHBOARD_APP_TAB_MESSAGES": "Mensajes",
     "UNVERIFIED_SESSION": "La identidad de este usuario no está verificada",
     "NO_MESSAGE_1": "¡Oh oh! Parece que no hay mensajes de los clientes en tu bandeja de entrada.",
     "NO_MESSAGE_2": " para enviar un mensaje a tu página!",
@@ -31,7 +31,7 @@
     "REPLYING_TO": "Esta respondiendo a:",
     "REMOVE_SELECTION": "Eliminar selección",
     "DOWNLOAD": "Descargar",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
+    "UNKNOWN_FILE_TYPE": "Archivo desconocido",
     "UPLOADING_ATTACHMENTS": "Subiendo archivos adjuntos...",
     "SUCCESS_DELETE_MESSAGE": "Mensaje eliminado correctamente",
     "FAIL_DELETE_MESSSAGE": "¡No se pudo eliminar el mensaje! Inténtalo de nuevo",
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index 64ecf7005..bdb1b73a7 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -62,7 +62,7 @@
     "MARK_ALL_DONE": "Marcar Todo Hecho",
     "DELETE_TITLE": "Eliminado",
     "UNREAD_NOTIFICATION": {
-      "TITLE": "Unread Notifications",
+      "TITLE": "Notificaciones sin leer",
       "ALL_NOTIFICATIONS": "Ver todas las notificaciones",
       "LOADING_UNREAD_MESSAGE": "Cargando notificaciones no leídas...",
       "EMPTY_MESSAGE": "No tiene notificaciones sin leer"
@@ -108,7 +108,7 @@
       "GO_TO_CONVERSATION_DASHBOARD": "Ir al panel de conversaciones",
       "GO_TO_CONTACTS_DASHBOARD": "Ir al panel de contactos",
       "GO_TO_REPORTS_OVERVIEW": "Ir al Resumen de Reportes",
-      "GO_TO_CONVERSATION_REPORTS": "Go to Conversation Reports",
+      "GO_TO_CONVERSATION_REPORTS": "Ir a Reportes de Conversación",
       "GO_TO_AGENT_REPORTS": "Ir a Reportes de Agente",
       "GO_TO_LABEL_REPORTS": "Ir a Reportes de Etiquetas",
       "GO_TO_INBOX_REPORTS": "Ir a Reportes de Entrada",
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index bb46e4faf..044fb4072 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "Coloca este botón dentro de tu etiqueta cuerpo",
       "INBOX_AGENTS": "Agentes",
       "INBOX_AGENTS_SUB_TEXT": "Añadir o quitar agentes de esta bandeja de entrada",
-      "AGENT_ASSIGNMENT": "Conversation Assignment",
-      "AGENT_ASSIGNMENT_SUB_TEXT": "Update conversation assignment settings",
+      "AGENT_ASSIGNMENT": "Asignación de conversación",
+      "AGENT_ASSIGNMENT_SUB_TEXT": "Actualizar configuración de la asignación de conversación",
       "UPDATE": "Actualizar",
       "ENABLE_EMAIL_COLLECT_BOX": "Activar caja de recolección de correo electrónico",
       "ENABLE_EMAIL_COLLECT_BOX_SUB_TEXT": "Activar o desactivar la caja de recolección de correo electrónico",
@@ -430,14 +430,14 @@
     },
     "PRE_CHAT_FORM": {
       "DESCRIPTION": "Los formularios de Pre Chat le permiten capturar la información del usuario antes de que comiencen la conversación con usted.",
-      "SET_FIELDS": "Pre chat form fields",
+      "SET_FIELDS": "Campos del formulario del chat",
       "SET_FIELDS_HEADER": {
-        "FIELDS": "Fields",
-        "LABEL": "Label",
-        "PLACE_HOLDER": "Placeholder",
+        "FIELDS": "Campos",
+        "LABEL": "Etiqueta",
+        "PLACE_HOLDER": "Marca de posición",
         "KEY": "Llave",
         "TYPE": "Tipo",
-        "REQUIRED": "Required"
+        "REQUIRED": "Requerido"
       },
       "ENABLE": {
         "LABEL": "Activar formulario de pre-chat",
@@ -447,7 +447,7 @@
         }
       },
       "PRE_CHAT_MESSAGE": {
-        "LABEL": "Pre chat message",
+        "LABEL": "Mensaje de prechat",
         "PLACEHOLDER": "Este mensaje sería visible para los usuarios junto con el formulario"
       },
       "REQUIRE_EMAIL": {
@@ -476,7 +476,7 @@
     "IMAP": {
       "TITLE": "IMAP",
       "SUBTITLE": "Configura los detalles de IMAP",
-      "NOTE_TEXT": "To enable SMTP, please configure IMAP.",
+      "NOTE_TEXT": "Para habilitar SMTP, por favor configure IMAP.",
       "UPDATE": "Actualizar ajustes IMAP",
       "TOGGLE_AVAILABILITY": "Habilitar configuración IMAP para esta bandeja de entrada",
       "TOGGLE_HELP": "Habilitar IMAP ayudará al usuario a recibir correo electrónico",
@@ -536,8 +536,8 @@
       "SSL_TLS": "SSL/TLS",
       "START_TLS": "STARTTLS",
       "OPEN_SSL_VERIFY_MODE": "Abrir modo de verificación SSL",
-      "AUTH_MECHANISM": "Authentication"
+      "AUTH_MECHANISM": "Autenticación"
     },
-    "NOTE": "Note: "
+    "NOTE": "Nota: "
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 2476d4cad..b60f2a6dd 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -2,19 +2,19 @@
   "INTEGRATION_SETTINGS": {
     "HEADER": "Integraciones",
     "WEBHOOK": {
-      "SUBSCRIBED_EVENTS": "Subscribed Events",
+      "SUBSCRIBED_EVENTS": "Eventos suscritos",
       "FORM": {
         "CANCEL": "Cancelar",
         "DESC": "Los eventos Webhook te proporcionan la información en tiempo real sobre lo que está sucediendo en tu cuenta de Chatwoot. Por favor, introduce una URL válida para configurar un 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"
+            "CONVERSATION_CREATED": "Conversación creada",
+            "CONVERSATION_STATUS_CHANGED": "Estado de la conversación cambiado",
+            "CONVERSATION_UPDATED": "Conversación actualizada",
+            "MESSAGE_CREATED": "Mensaje creado",
+            "MESSAGE_UPDATED": "Mensaje actualizado",
+            "WEBWIDGET_TRIGGERED": "Widget de Live Chat abierto por el usuario"
           }
         },
         "END_POINT": {
@@ -22,7 +22,7 @@
           "PLACEHOLDER": "Ejemplo: https://example/api/webhook",
           "ERROR": "Por favor, introduzca una URL válida"
         },
-        "EDIT_SUBMIT": "Update webhook",
+        "EDIT_SUBMIT": "Actualizar webhook",
         "ADD_SUBMIT": "Crear webhook"
       },
       "TITLE": "Webhook",
@@ -44,7 +44,7 @@
         "BUTTON_TEXT": "Editar",
         "TITLE": "Editar Webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration updated successfully",
+          "SUCCESS_MESSAGE": "Configuración de webhook actualizada correctamente",
           "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
         }
       },
@@ -52,7 +52,7 @@
         "CANCEL": "Cancelar",
         "TITLE": "Añadir nuevo webhook",
         "API": {
-          "SUCCESS_MESSAGE": "Webhook configuration added successfully",
+          "SUCCESS_MESSAGE": "Configuración de webhook añadida correctamente",
           "ERROR_MESSAGE": "No se pudo conectar al servidor Woot, por favor inténtalo de nuevo más tarde"
         }
       },
@@ -64,7 +64,7 @@
         },
         "CONFIRM": {
           "TITLE": "Confirmar eliminación",
-          "MESSAGE": "Are you sure to delete the webhook? (%{webhookURL})",
+          "MESSAGE": "¿Está seguro de eliminar el webhook? (%{webhookURL})",
           "YES": "Sí, eliminar ",
           "NO": "No, mantenerlo"
         }
diff --git a/app/javascript/dashboard/i18n/locale/es/report.json b/app/javascript/dashboard/i18n/locale/es/report.json
index 2ba73dda2..81051a66f 100644
--- a/app/javascript/dashboard/i18n/locale/es/report.json
+++ b/app/javascript/dashboard/i18n/locale/es/report.json
@@ -18,16 +18,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
+        "NAME": "Tiempo de primera respuesta",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "Tiempo de primera respuesta es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "El tiempo de resolución es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -135,16 +135,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
+        "NAME": "Tiempo de primera respuesta",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "Tiempo de primera respuesta es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "El tiempo de resolución es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -202,16 +202,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
+        "NAME": "Tiempo de primera respuesta",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "Tiempo de primera respuesta es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "El tiempo de resolución es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -269,16 +269,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
+        "NAME": "Tiempo de primera respuesta",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "Tiempo de primera respuesta es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "El tiempo de resolución es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -336,16 +336,16 @@
         "DESC": "( Total )"
       },
       "FIRST_RESPONSE_TIME": {
-        "NAME": "First Response Time",
+        "NAME": "Tiempo de primera respuesta",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "First Response Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "Tiempo de primera respuesta es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_TIME": {
         "NAME": "Tiempo de resolución",
         "DESC": "( Media )",
-        "INFO_TEXT": "Total number of conversations used for computation:",
-        "TOOLTIP_TEXT": "Resolution Time is %{metricValue} (based on %{conversationCount} conversations)"
+        "INFO_TEXT": "Número total de conversaciones utilizadas en el cálculo:",
+        "TOOLTIP_TEXT": "El tiempo de resolución es %{metricValue} (basado en %{conversationCount} conversaciones)"
       },
       "RESOLUTION_COUNT": {
         "NAME": "Número de resoluciones",
@@ -386,7 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Reporte de encuestas de satisfacción",
     "NO_RECORDS": "No hay respuestas de encuestas de satisfacción disponibles.",
-    "DOWNLOAD": "Download CSAT Reports",
+    "DOWNLOAD": "Descargar reportes CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Elegir agentes"
@@ -417,27 +417,27 @@
   },
   "OVERVIEW_REPORTS": {
     "HEADER": "Resumen",
-    "LIVE": "Live",
+    "LIVE": "En vivo",
     "ACCOUNT_CONVERSATIONS": {
-      "HEADER": "Open Conversations",
-      "LOADING_MESSAGE": "Loading conversation metrics...",
+      "HEADER": "Conversaciones abiertas",
+      "LOADING_MESSAGE": "Cargando métricas de conversación...",
       "OPEN": "Abrir",
-      "UNATTENDED": "Unattended",
+      "UNATTENDED": "Desatendido",
       "UNASSIGNED": "Sin asignar"
     },
     "AGENT_CONVERSATIONS": {
-      "HEADER": "Conversations by agents",
-      "LOADING_MESSAGE": "Loading agent metrics...",
-      "NO_AGENTS": "There are no conversations by agents",
+      "HEADER": "Conversaciones por agentes",
+      "LOADING_MESSAGE": "Cargando métricas del agente...",
+      "NO_AGENTS": "No hay conversaciones por agentes",
       "TABLE_HEADER": {
         "AGENT": "Agente",
-        "OPEN": "OPEN",
-        "UNATTENDED": "Unattended",
+        "OPEN": "ABIERTA",
+        "UNATTENDED": "Desatendido",
         "STATUS": "Estado"
       }
     },
     "AGENT_STATUS": {
-      "HEADER": "Agent status",
+      "HEADER": "Estado del agente",
       "ONLINE": "En línea",
       "BUSY": "Ocupado",
       "OFFLINE": "Fuera de línea"
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 7b16e5385..e3032cc4f 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Firma de mensaje personal",
-        "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.",
+        "NOTE": "Cree una firma de mensaje personal que se añadirá a todos los mensajes que envíe desde su buzón de correo electrónico. Utilice el rico editor de contenidos para crear una firma altamente personalizada.",
         "BTN_TEXT": "Guardar firma de mensaje",
         "API_ERROR": "¡No se pudo guardar la firma! Inténtalo de nuevo",
         "API_SUCCESS": "Firma guardada correctamente"
@@ -132,8 +132,8 @@
       "COPY_SUCCESSFUL": "Código copiado al portapapeles con éxito"
     },
     "SHOW_MORE_BLOCK": {
-      "SHOW_MORE": "Show More",
-      "SHOW_LESS": "Show Less"
+      "SHOW_MORE": "Mostrar más",
+      "SHOW_LESS": "Mostrar menos"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descargar",
@@ -151,7 +151,7 @@
   },
   "SIDEBAR": {
     "CURRENTLY_VIEWING_ACCOUNT": "Visualizando:",
-    "SWITCH": "Switch",
+    "SWITCH": "Cambiar",
     "CONVERSATIONS": "Conversaciones",
     "ALL_CONVERSATIONS": "Todas las conversaciones",
     "MENTIONED_CONVERSATIONS": "Menciones",
diff --git a/app/javascript/dashboard/i18n/locale/es/signup.json b/app/javascript/dashboard/i18n/locale/es/signup.json
index 498c84f06..480c912bd 100644
--- a/app/javascript/dashboard/i18n/locale/es/signup.json
+++ b/app/javascript/dashboard/i18n/locale/es/signup.json
@@ -22,7 +22,7 @@
       "LABEL": "Contraseña",
       "PLACEHOLDER": "Contraseña",
       "ERROR": "La contraseña es demasiado corta",
-      "IS_INVALID_PASSWORD": "Password should contain atleast 1 uppercase letter, 1 lowercase letter, 1 number and 1 special character"
+      "IS_INVALID_PASSWORD": "La contraseña debe contener al menos 1 letra mayúscula, 1 letra minúscula, 1 número y 1 carácter especial"
     },
     "CONFIRM_PASSWORD": {
       "LABEL": "Confirmar contraseña",
diff --git a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
index 77cf7035e..2125e478b 100644
--- a/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/teamsSettings.json
@@ -83,7 +83,7 @@
       "SELECT_ALL": "seleccionar todos los agentes",
       "SELECTED_COUNT": "%{selected} de %{total} agentes seleccionados.",
       "BUTTON_TEXT": "Añadir agentes",
-      "AGENT_VALIDATION_ERROR": "Select at least one agent."
+      "AGENT_VALIDATION_ERROR": "Seleccione al menos un agente."
     },
     "FINISH": {
       "TITLE": "¡Su equipo está listo!",
diff --git a/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json
index bbcf28156..6e74612ab 100644
--- a/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/es/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "Plantillas de Whatsapp",
+            "SUBTITLE": "Seleccione la plantilla de Whatsapp que desea enviar",
+            "TEMPLATE_SELECTED_SUBTITLE": "Procesar %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Buscar plantillas",
+            "NO_TEMPLATES_FOUND": "No se encontraron plantillas para",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Idioma",
+                "TEMPLATE_BODY": "Cuerpo de plantilla",
+                "CATEGORY": "Categoría"
             }
         },
         "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"
+            "VARIABLE_PLACEHOLDER": "Introduzca el valor de %{variable}",
+            "GO_BACK_LABEL": "Volver",
+            "SEND_MESSAGE_LABEL": "Enviar mensaje",
+            "FORM_ERROR_MESSAGE": "Por favor, rellene todas las variables antes de enviar"
         }
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
index 86d29b5cc..0b6180a42 100644
--- a/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/ru/bulkActions.json
@@ -1,17 +1,17 @@
 {
     "BULK_ACTION": {
-        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+        "CONVERSATIONS_SELECTED": "%{conversationCount} бесед выбрано",
         "AGENT_SELECT_LABEL": "Выбрать Агента",
-        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-        "GO_BACK_LABEL": "Go back",
+        "ASSIGN_CONFIRMATION_LABEL": "Вы уверены, что хотите назначить %{conversationCount} %{conversationLabel}",
+        "GO_BACK_LABEL": "Вернуться",
         "ASSIGN_LABEL": "Назначить",
-        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+        "ASSIGN_AGENT_TOOLTIP": "Назначенный оператор",
         "RESOLVE_TOOLTIP": "Завершить",
-        "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"
+        "ASSIGN_SUCCESFUL": "Беседы успешно назначены",
+        "ASSIGN_FAILED": "Не удалось назначить беседы, попробуйте еще раз",
+        "RESOLVE_SUCCESFUL": "Беседы успешно завершены",
+        "RESOLVE_FAILED": "Не удалось завершить беседы, попробуйте еще раз",
+        "ALL_CONVERSATIONS_SELECTED_ALERT": "Беседы, видимые на этой странице, выбраны.",
+        "AGENT_LIST_LOADING": "Загрузка Операторов"
     }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
index 83167558e..6f1d30332 100644
--- a/app/javascript/dashboard/i18n/locale/ru/conversation.json
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -1,7 +1,7 @@
 {
   "CONVERSATION": {
     "404": "Пожалуйста, выберите диалог из левой панели",
-    "DASHBOARD_APP_TAB_MESSAGES": "Messages",
+    "DASHBOARD_APP_TAB_MESSAGES": "Сообщения",
     "UNVERIFIED_SESSION": "Подлинность этого пользователя не подтверждена",
     "NO_MESSAGE_1": "Ой! Похоже, сообщений от клиентов нет.",
     "NO_MESSAGE_2": " чтобы отправить сообщение на вашу страницу!",
@@ -31,7 +31,7 @@
     "REPLYING_TO": "Вы отвечаете на:",
     "REMOVE_SELECTION": "Удалить выделенное",
     "DOWNLOAD": "Скачать",
-    "UNKNOWN_FILE_TYPE": "Unknown File",
+    "UNKNOWN_FILE_TYPE": "Неизвестный файл",
     "UPLOADING_ATTACHMENTS": "Загрузка вложений...",
     "SUCCESS_DELETE_MESSAGE": "Сообщение успешно удалено",
     "FAIL_DELETE_MESSSAGE": "Не удалось удалить сообщение! Попробуйте еще раз",
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
index 08e8f33d1..0eebc9430 100644
--- a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -398,8 +398,8 @@
       "MESSENGER_SUB_HEAD": "Поместите эту кнопку внутри тега <body>",
       "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": "Включение или отключение ящик для сбора почты в новой беседе",
diff --git a/app/javascript/dashboard/i18n/locale/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
index 8dc221b4e..dd763da32 100644
--- a/app/javascript/dashboard/i18n/locale/ru/report.json
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -386,7 +386,7 @@
   "CSAT_REPORTS": {
     "HEADER": "Отчёты CSAT",
     "NO_RECORDS": "Нет ответов на опрос CSAT.",
-    "DOWNLOAD": "Download CSAT Reports",
+    "DOWNLOAD": "Скачать отчёты CSAT",
     "FILTERS": {
       "AGENTS": {
         "PLACEHOLDER": "Выберите Операторов"
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
index 8c28e454b..a5788f28c 100644
--- a/app/javascript/dashboard/i18n/locale/ru/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -21,7 +21,7 @@
       },
       "MESSAGE_SIGNATURE_SECTION": {
         "TITLE": "Подпись личных сообщений",
-        "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.",
+        "NOTE": "Создать подпись для личных сообщений, которая будет добавлена ко всем сообщениям, которые вы отправляете из вашего почтового ящика. Используйте редактор текста для создания персональной подписи.",
         "BTN_TEXT": "Сохранить подпись",
         "API_ERROR": "Не удалось сохранить подпись! Повторите попытку",
         "API_SUCCESS": "Подпись успешно сохранена"
diff --git a/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json b/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json
index bbcf28156..f05321d14 100644
--- a/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json
+++ b/app/javascript/dashboard/i18n/locale/ru/whatsappTemplates.json
@@ -1,25 +1,25 @@
 {
     "WHATSAPP_TEMPLATES": {
         "MODAL": {
-            "TITLE": "Whatsapp Templates",
-            "SUBTITLE": "Select the whatsapp template you want to send",
-            "TEMPLATE_SELECTED_SUBTITLE": "Process %{templateName}"
+            "TITLE": "Шаблоны Whatsapp",
+            "SUBTITLE": "Выберите шаблон whatsapp, который вы хотите отправить",
+            "TEMPLATE_SELECTED_SUBTITLE": "Обработка %{templateName}"
         },
         "PICKER": {
-            "SEARCH_PLACEHOLDER": "Search Templates",
-            "NO_TEMPLATES_FOUND": "No templates found for",
+            "SEARCH_PLACEHOLDER": "Найти шаблоны",
+            "NO_TEMPLATES_FOUND": "Не найдено шаблонов для",
             "LABELS": {
-                "LANGUAGE": "Language",
-                "TEMPLATE_BODY": "Template Body",
-                "CATEGORY": "Category"
+                "LANGUAGE": "Язык",
+                "TEMPLATE_BODY": "Тело шаблона",
+                "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"
+            "VARIABLES_LABEL": "Переменные",
+            "VARIABLE_PLACEHOLDER": "Введите значение %{variable}",
+            "GO_BACK_LABEL": "Вернуться",
+            "SEND_MESSAGE_LABEL": "Отправить сообщение",
+            "FORM_ERROR_MESSAGE": "Пожалуйста, заполните все переменные перед отправкой"
         }
     }
 }
diff --git a/app/javascript/widget/i18n/locale/es.json b/app/javascript/widget/i18n/locale/es.json
index a0998fdbe..a469de66c 100644
--- a/app/javascript/widget/i18n/locale/es.json
+++ b/app/javascript/widget/i18n/locale/es.json
@@ -22,7 +22,7 @@
     "IN_A_DAY": "Normalmente responde en un día"
   },
   "START_CONVERSATION": "Iniciar conversación",
-  "END_CONVERSATION": "End Conversation",
+  "END_CONVERSATION": "Finalizar conversación",
   "CONTINUE_CONVERSATION": "Continuar conversación",
   "START_NEW_CONVERSATION": "Iniciar una nueva conversación",
   "UNREAD_VIEW": {
@@ -49,14 +49,14 @@
       "EMAIL_ADDRESS": {
         "LABEL": "Dirección de correo",
         "PLACEHOLDER": "Introduzca su dirección de correo electrónico",
-        "REQUIRED_ERROR": "Email Address is required",
+        "REQUIRED_ERROR": "La dirección de correo es obligatoria",
         "VALID_ERROR": "Por favor, introduzca una dirección de correo válida"
       },
       "PHONE_NUMBER": {
         "LABEL": "Número telefónico",
-        "PLACEHOLDER": "Please enter your phone number",
-        "REQUIRED_ERROR": "Phone Number is required",
-        "VALID_ERROR": "Phone number should be of E.164 format eg: +1415555555"
+        "PLACEHOLDER": "Por favor ingrese su número de teléfono",
+        "REQUIRED_ERROR": "El número de teléfono es obligatorio",
+        "VALID_ERROR": "El número de teléfono debe ser de formato E.164 por ejemplo: +5493995777777"
       },
       "MESSAGE": {
         "LABEL": "Mensaje",
@@ -65,7 +65,7 @@
       }
     },
     "CAMPAIGN_HEADER": "Por favor, introduce tu nombre y correo electrónico antes de iniciar la conversación",
-    "IS_REQUIRED": "is required"
+    "IS_REQUIRED": "es obligatorio"
   },
   "FILE_SIZE_LIMIT": "El archivo excede el límite de los archivos adjuntos {MAXIMUM_FILE_UPLOAD_SIZE}",
   "CHAT_FORM": {
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 680eb5da7..9ca9b2c50 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -23,7 +23,7 @@ es:
     reset_password_failure: '¡Uh ho! No hemos podido encontrar ningún usuario con el correo electrónico especificado.'
   errors:
     webhook:
-      invalid: Invalid events
+      invalid: Eventos inválidos
     signup:
       disposable_email: No permitimos correos electrónicos desechables
       invalid_email: Ha introducido un correo electrónico no válido
@@ -40,14 +40,14 @@ es:
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
     inbox_csv:
-      inbox_name: Inbox name
-      inbox_type: Inbox type
-      conversations_count: No. of conversations
+      inbox_name: Nombre de la bandeja de entrada
+      inbox_type: Tipo de bandeja de entrada
+      conversations_count: Núm. de conversaciones
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
     label_csv:
-      label_title: Label
-      conversations_count: No. of conversations
+      label_title: Etiqueta
+      conversations_count: Núm. de conversaciones
       avg_first_response_time: Promedio de tiempo de la primera respuesta (Minutos)
       avg_resolution_time: Promedio de tiempo de resolución (Minutos)
     team_csv:
@@ -58,14 +58,14 @@ es:
     default_group_by: día
     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
+        contact_name: Nombre de Contacto
+        contact_email_address: Correo electrónico de contacto
+        contact_phone_number: Número de teléfono de contacto
+        link_to_the_conversation: Enlace a la conversación
         agent_name: Nombre del agente
         rating: Calificación
-        feedback: Feedback Comment
-        recorded_at: Recorded date
+        feedback: Comentario de opinión
+        recorded_at: Fecha registrada
   notifications:
     notification_title:
       conversation_creation: "[Nueva conversación] - #%{display_id} ha sido creado en %{inbox_name}"

From 98f216046294d60fd1f925f3c2ba92c63455f79d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Mon, 13 Jun 2022 11:27:22 +0530
Subject: [PATCH 159/177] chore: Remove partner signup link (#4843)

---
 .../dashboard/i18n/locale/en/inboxMgmt.json         |  1 -
 .../settings/inbox/channels/360DialogWhatsapp.vue   | 13 +------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 405348058..252a041bc 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -209,7 +209,6 @@
           "LABEL": "API key",
           "SUBTITLE": "Configure the WhatsApp API key.",
           "PLACEHOLDER": "API key",
-          "APPLY_FOR_ACCESS": "Don't have any API key? Apply for access here",
           "ERROR": "Please enter a valid value."
         },
         "SUBMIT_BUTTON": "Create WhatsApp Channel",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
index 11488ca06..90ba80a52 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/360DialogWhatsapp.vue
@@ -34,14 +34,6 @@
       <label :class="{ error: $v.apiKey.$error }">
         <span>
           {{ $t('INBOX_MGMT.ADD.WHATSAPP.API_KEY.LABEL') }}
-          <a
-            v-if="globalConfig.installationName === 'Chatwoot'"
-            href="https://hub.360dialog.com/lp/whatsapp/L9dj7aPA"
-            target="_blank"
-            rel="noopener noreferrer nofollow"
-          >
-            ({{ $t('INBOX_MGMT.ADD.WHATSAPP.API_KEY.APPLY_FOR_ACCESS') }})
-          </a>
         </span>
         <input
           v-model.trim="apiKey"
@@ -82,10 +74,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters({
-      uiFlags: 'inboxes/getUIFlags',
-      globalConfig: 'globalConfig/get',
-    }),
+    ...mapGetters({ uiFlags: 'inboxes/getUIFlags' }),
   },
   validations: {
     inboxName: { required },

From aa903a5da98651bc45e6852f5b16bbc99ae24f13 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 13 Jun 2022 11:58:54 +0530
Subject: [PATCH 160/177] Fix: backend changes for custom attribute (#4830)

---
 .../accounts/automation_rules_controller.rb   |   2 +-
 .../components/widgets/FilterInput/Index.vue  |  26 +++++
 .../conditions_filter_service.rb              |   4 +-
 app/services/contacts/filter_service.rb       |   2 +-
 app/services/conversations/filter_service.rb  |   2 +-
 app/services/filter_service.rb                |  26 +++--
 .../automation_rules_controller_spec.rb       | 104 +++++++++---------
 .../automation_rule_listener_spec.rb          |  25 +++++
 8 files changed, 122 insertions(+), 69 deletions(-)

diff --git a/app/controllers/api/v1/accounts/automation_rules_controller.rb b/app/controllers/api/v1/accounts/automation_rules_controller.rb
index 78cd15e31..859c8a4bf 100644
--- a/app/controllers/api/v1/accounts/automation_rules_controller.rb
+++ b/app/controllers/api/v1/accounts/automation_rules_controller.rb
@@ -76,7 +76,7 @@ class Api::V1::Accounts::AutomationRulesController < Api::V1::Accounts::BaseCont
   def automation_rules_permit
     params.permit(
       :name, :description, :event_name, :account_id, :active,
-      conditions: [:attribute_key, :filter_operator, :query_operator, { values: [] }],
+      conditions: [:attribute_key, :filter_operator, :query_operator, :custom_attribute_type, { values: [] }],
       actions: [:action_name, { action_params: [] }]
     )
   end
diff --git a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
index 25203642a..46c64fc53 100644
--- a/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
+++ b/app/javascript/dashboard/components/widgets/FilterInput/Index.vue
@@ -215,6 +215,32 @@ export default {
         this.$emit('input', { ...payload, query_operator: value });
       },
     },
+    custom_attribute_type: {
+      get() {
+        if (!this.customAttributeType) return '';
+        return this.customAttributeType;
+      },
+      set() {
+        const payload = this.value || {};
+        this.$emit('input', {
+          ...payload,
+          custom_attribute_type: this.customAttributeType,
+        });
+      },
+    },
+  },
+  watch: {
+    customAttributeType: {
+      handler(value) {
+        if (
+          value === 'conversation_attribute' ||
+          value === 'contact_attribute'
+        ) {
+          this.value.custom_attribute_type = this.customAttributeType;
+        } else this.value.custom_attribute_type = '';
+      },
+      immediate: true,
+    },
   },
   methods: {
     removeFilter() {
diff --git a/app/services/automation_rules/conditions_filter_service.rb b/app/services/automation_rules/conditions_filter_service.rb
index e32a95751..eb351efbe 100644
--- a/app/services/automation_rules/conditions_filter_service.rb
+++ b/app/services/automation_rules/conditions_filter_service.rb
@@ -43,9 +43,9 @@ class AutomationRules::ConditionsFilterService < FilterService
       @query_string += contact_query_string(contact_filter, query_hash.with_indifferent_access, current_index)
     elsif message_filter
       @query_string += message_query_string(message_filter, query_hash.with_indifferent_access, current_index)
-    elsif custom_attribute(query_hash['attribute_key'], @account)
+    elsif custom_attribute(query_hash['attribute_key'], @account, query_hash['custom_attribute_type'])
       # send table name according to attribute key right now we are supporting contact based custom attribute filter
-      @query_string += custom_attribute_query(query_hash.with_indifferent_access, 'contacts', current_index)
+      @query_string += custom_attribute_query(query_hash.with_indifferent_access, query_hash['custom_attribute_type'], current_index)
     end
   end
 
diff --git a/app/services/contacts/filter_service.rb b/app/services/contacts/filter_service.rb
index 22ed9891b..aedeb172b 100644
--- a/app/services/contacts/filter_service.rb
+++ b/app/services/contacts/filter_service.rb
@@ -26,7 +26,7 @@ class Contacts::FilterService < FilterService
     query_operator = query_hash[:query_operator]
     filter_operator_value = filter_operation(query_hash, current_index)
 
-    return custom_attribute_query(query_hash, 'contacts', current_index) if current_filter.nil?
+    return custom_attribute_query(query_hash, 'contact_attribute', current_index) if current_filter.nil?
 
     case current_filter['attribute_type']
     when 'additional_attributes'
diff --git a/app/services/conversations/filter_service.rb b/app/services/conversations/filter_service.rb
index e52fd279d..d91916b12 100644
--- a/app/services/conversations/filter_service.rb
+++ b/app/services/conversations/filter_service.rb
@@ -32,7 +32,7 @@ class Conversations::FilterService < FilterService
     query_operator = query_hash[:query_operator]
     filter_operator_value = filter_operation(query_hash, current_index)
 
-    return custom_attribute_query(query_hash, 'conversations', current_index) if current_filter.nil?
+    return custom_attribute_query(query_hash, 'conversation_attribute', current_index) if current_filter.nil?
 
     case current_filter['attribute_type']
     when 'additional_attributes'
diff --git a/app/services/filter_service.rb b/app/services/filter_service.rb
index 0031d828d..4d17356aa 100644
--- a/app/services/filter_service.rb
+++ b/app/services/filter_service.rb
@@ -58,14 +58,14 @@ class FilterService
   end
 
   def string_filter_values(query_hash)
-    return query_hash['values'][0] if query_hash['values'].is_a?(Array)
+    return query_hash['values'][0].downcase if query_hash['values'].is_a?(Array)
 
-    query_hash['values']
+    query_hash['values'].downcase
   end
 
   def lt_gt_filter_values(query_hash)
     attribute_key = query_hash[:attribute_key]
-    attribute_type = custom_attribute(attribute_key).try(:attribute_display_type)
+    attribute_type = custom_attribute(attribute_key, @account, query_hash['custom_attribute_type']).try(:attribute_display_type)
     attribute_data_type = self.class::ATTRIBUTE_TYPES[attribute_type]
     value = query_hash['values'][0]
     operator = query_hash['filter_operator'] == 'is_less_than' ? '<' : '>'
@@ -87,27 +87,29 @@ class FilterService
     ]
   end
 
-  def custom_attribute_query(query_hash, table_name, current_index)
+  def custom_attribute_query(query_hash, custom_attribute_type, current_index)
     attribute_key = query_hash[:attribute_key]
     query_operator = query_hash[:query_operator]
+    attribute_model = custom_attribute_type || self.class::ATTRIBUTE_MODEL
 
-    attribute_type = custom_attribute(attribute_key, @account).try(:attribute_display_type)
+    attribute_type = custom_attribute(attribute_key, @account, attribute_model).try(:attribute_display_type)
     filter_operator_value = filter_operation(query_hash, current_index)
     attribute_data_type = self.class::ATTRIBUTE_TYPES[attribute_type]
 
-    if custom_attribute(attribute_key, @account)
-      "  LOWER(#{table_name}.custom_attributes ->> '#{attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
-    else
-      ' '
-    end
+    return ' ' if @custom_attribute.blank?
+
+    table_name = attribute_model == 'conversation_attribute' ? 'conversations' : 'contacts'
+
+    "  LOWER(#{table_name}.custom_attributes ->> '#{attribute_key}')::#{attribute_data_type} #{filter_operator_value} #{query_operator} "
   end
 
   private
 
-  def custom_attribute(attribute_key, account = nil)
+  def custom_attribute(attribute_key, account, custom_attribute_type)
     current_account = account || Current.account
+    attribute_model = custom_attribute_type || self.class::ATTRIBUTE_MODEL
     @custom_attribute = current_account.custom_attribute_definitions.where(
-      attribute_model: self.class::ATTRIBUTE_MODEL
+      attribute_model: attribute_model
     ).find_by(attribute_key: attribute_key)
   end
 
diff --git a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
index 4513773bc..06620f7a5 100644
--- a/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/automation_rules_controller_spec.rb
@@ -42,55 +42,55 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
     context 'when it is an authenticated user' do
       let(:params) do
         {
-          name: 'Notify Conversation Created and mark priority query',
-          description: 'Notify all administrator about conversation created and mark priority query',
-          event_name: 'conversation_created',
-          conditions: [
+          'name': 'Notify Conversation Created and mark priority query',
+          'description': 'Notify all administrator about conversation created and mark priority query',
+          'event_name': 'conversation_created',
+          'conditions': [
             {
-              attribute_key: 'browser_language',
-              filter_operator: 'equal_to',
-              values: ['en'],
-              query_operator: 'AND'
+              'attribute_key': 'browser_language',
+              'filter_operator': 'equal_to',
+              'values': ['en'],
+              'query_operator': 'AND'
             },
             {
-              attribute_key: 'country_code',
-              filter_operator: 'equal_to',
-              values: %w[USA UK],
-              query_operator: nil
+              'attribute_key': 'country_code',
+              'filter_operator': 'equal_to',
+              'values': %w[USA UK],
+              'query_operator': nil
             }
           ],
-          actions: [
+          'actions': [
             {
-              action_name: :send_message,
-              action_params: ['Welcome to the chatwoot platform.']
+              'action_name': :send_message,
+              'action_params': ['Welcome to the chatwoot platform.']
             },
             {
-              action_name: :assign_team,
-              action_params: [1]
+              'action_name': :assign_team,
+              'action_params': [1]
             },
             {
-              action_name: :add_label,
-              action_params: %w[support priority_customer]
+              'action_name': :add_label,
+              'action_params': %w[support priority_customer]
             },
             {
-              action_name: :assign_best_administrator,
-              action_params: [1]
+              'action_name': :assign_best_administrator,
+              'action_params': [1]
             },
             {
-              action_name: :update_additional_attributes,
-              action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
+              'action_name': :update_additional_attributes,
+              'action_params': [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
             }
           ]
-        }.with_indifferent_access
+        }
       end
 
       it 'throws an error for unknown attributes in condtions' do
         expect(account.automation_rules.count).to eq(0)
         params[:conditions] << {
-          attribute_key: 'unknown_attribute',
-          filter_operator: 'equal_to',
-          values: ['en'],
-          query_operator: 'AND'
+          'attribute_key': 'unknown_attribute',
+          'filter_operator': 'equal_to',
+          'values': ['en'],
+          'query_operator': 'AND'
         }
 
         post "/api/v1/accounts/#{account.id}/automation_rules",
@@ -115,11 +115,11 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
       it 'Saves for automation_rules for account with status conditions' do
         params[:conditions] = [
           {
-            attribute_key: 'status',
-            filter_operator: 'equal_to',
-            values: ['resolved'],
-            query_operator: nil
-          }.with_indifferent_access
+            'attribute_key': 'status',
+            'filter_operator': 'equal_to',
+            'values': ['resolved'],
+            'query_operator': nil
+          }
         ]
         expect(account.automation_rules.count).to eq(0)
 
@@ -149,12 +149,12 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
         params[:actions] = [
           {
-            action_name: :send_message,
-            action_params: ['Welcome to the chatwoot platform.']
+            'action_name': :send_message,
+            'action_params': ['Welcome to the chatwoot platform.']
           },
           {
-            action_name: :send_attachment,
-            action_params: [blob['blob_id']]
+            'action_name': :send_attachment,
+            'action_params': [blob['blob_id']]
           }
         ]
 
@@ -185,12 +185,12 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
 
         params[:actions] = [
           {
-            action_name: :send_attachment,
-            action_params: [blob_1['blob_id']]
+            'action_name': :send_attachment,
+            'action_params': [blob_1['blob_id']]
           },
           {
-            action_name: :send_attachment,
-            action_params: [blob_2['blob_id']]
+            'action_name': :send_attachment,
+            'action_params': [blob_2['blob_id']]
           }
         ]
 
@@ -271,23 +271,23 @@ RSpec.describe 'Api::V1::Accounts::AutomationRulesController', type: :request do
     context 'when it is an authenticated user' do
       let(:update_params) do
         {
-          description: 'Update description',
-          name: 'Update name',
-          conditions: [
+          'description': 'Update description',
+          'name': 'Update name',
+          'conditions': [
             {
-              attribute_key: 'browser_language',
-              filter_operator: 'equal_to',
-              values: ['en'],
-              query_operator: 'AND'
+              'attribute_key': 'browser_language',
+              'filter_operator': 'equal_to',
+              'values': ['en'],
+              'query_operator': 'AND'
             }
           ],
-          actions: [
+          'actions': [
             {
-              action_name: :update_additional_attributes,
-              action_params: [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
+              'action_name': :update_additional_attributes,
+              'action_params': [{ intiated_at: '2021-12-03 17:25:26.844536 +0530' }]
             }
           ]
-        }.with_indifferent_access
+        }
       end
 
       it 'returns for cloned automation_rule for account' do
diff --git a/spec/listeners/automation_rule_listener_spec.rb b/spec/listeners/automation_rule_listener_spec.rb
index 8f4213137..ee13a01ba 100644
--- a/spec/listeners/automation_rule_listener_spec.rb
+++ b/spec/listeners/automation_rule_listener_spec.rb
@@ -356,6 +356,31 @@ describe AutomationRuleListener do
     end
   end
 
+  describe '#message_created event based on case in-sensitive filter' do
+    before do
+      automation_rule.update!(
+        event_name: 'message_created',
+        name: 'Call actions message created based on case in-sensitive filter',
+        description: 'Add labels, assign team after message created',
+        conditions: [{ 'values': ['KYC'], 'attribute_key': 'content', 'query_operator': nil, 'filter_operator': 'contains' }]
+      )
+    end
+
+    let!(:message) { create(:message, account: account, conversation: conversation, message_type: 'incoming', content: 'kyc message') }
+    let!(:event) do
+      Events::Base.new('message_created', Time.zone.now, { conversation: conversation, message: message })
+    end
+
+    it 'triggers automation rule based on case in-sensitive filter' do
+      expect(conversation.labels).to eq([])
+      expect(TeamNotifications::AutomationNotificationMailer).to receive(:conversation_creation)
+      listener.message_created(event)
+      conversation.reload
+
+      expect(conversation.labels.pluck(:name)).to contain_exactly('support', 'priority_customer')
+    end
+  end
+
   describe '#message_created' do
     before do
       automation_rule.update!(

From 2198930185458ad2fa9610cf35d5e11e536f346a Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Mon, 13 Jun 2022 12:14:27 +0530
Subject: [PATCH 161/177] feat: Add snooze, reopen option to bulk actions
 (#4831)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../assets/scss/_utility-helpers.scss         |   6 +
 .../dashboard/components/ChatList.vue         |  60 ++++---
 .../widgets/conversation/ConversationCard.vue |   3 +-
 .../conversationBulkActions/AgentSelector.vue |  47 +++--
 .../{Actions.vue => Index.vue}                |  85 +++++++--
 .../conversationBulkActions/UpdateActions.vue | 166 ++++++++++++++++++
 .../dashboard/i18n/locale/en/bulkActions.json |  33 ++--
 .../shared/assets/stylesheets/z-index.scss    |   1 +
 .../FluentIcon/dashboard-icons.json           |   1 +
 9 files changed, 331 insertions(+), 71 deletions(-)
 rename app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/{Actions.vue => Index.vue} (61%)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue

diff --git a/app/javascript/dashboard/assets/scss/_utility-helpers.scss b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
index 71977cf2b..4120af396 100644
--- a/app/javascript/dashboard/assets/scss/_utility-helpers.scss
+++ b/app/javascript/dashboard/assets/scss/_utility-helpers.scss
@@ -60,3 +60,9 @@
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
+.flex-between {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+}
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 90eaa7b86..6f6b1961c 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -84,7 +84,18 @@
     <p v-if="!chatListLoading && !conversationList.length" class="content-box">
       {{ $t('CHAT_LIST.LIST.404') }}
     </p>
-
+    <conversation-bulk-actions
+      v-if="selectedConversations.length"
+      :conversations="selectedConversations"
+      :all-conversations-selected="allConversationsSelected"
+      :selected-inboxes="uniqueInboxes"
+      :show-open-action="allSelectedConversationsStatus('open')"
+      :show-resolved-action="allSelectedConversationsStatus('resolved')"
+      :show-snoozed-action="allSelectedConversationsStatus('snoozed')"
+      @select-all-conversations="selectAllConversations"
+      @assign-agent="onAssignAgent"
+      @update-conversations="onUpdateConversations"
+    />
     <div ref="activeConversation" class="conversations-list">
       <conversation-card
         v-for="chat in conversationList"
@@ -114,11 +125,7 @@
       </woot-button>
 
       <p
-        v-if="
-          conversationList.length &&
-            hasCurrentPageEndReached &&
-            !chatListLoading
-        "
+        v-if="showEndOfListMessage"
         class="text-center text-muted end-of-list-text"
       >
         {{ $t('CHAT_LIST.EOF') }}
@@ -136,16 +143,6 @@
         @applyFilter="onApplyFilter"
       />
     </woot-modal>
-
-    <conversation-bulk-actions
-      v-if="selectedConversations.length"
-      :conversations="selectedConversations"
-      :all-conversations-selected="allConversationsSelected"
-      :selected-inboxes="uniqueInboxes"
-      @select-all-conversations="selectAllConversations"
-      @assign-agent="onAssignAgent"
-      @resolve-conversations="onResolveConversations"
-    />
   </div>
 </template>
 
@@ -164,7 +161,7 @@ import advancedFilterTypes from './widgets/conversation/advancedFilterItems';
 import filterQueryGenerator from '../helper/filterQueryGenerator.js';
 import AddCustomViews from 'dashboard/routes/dashboard/customviews/AddCustomViews';
 import DeleteCustomViews from 'dashboard/routes/dashboard/customviews/DeleteCustomViews.vue';
-import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Actions.vue';
+import ConversationBulkActions from './widgets/conversation/conversationBulkActions/Index.vue';
 import alertMixin from 'shared/mixins/alertMixin';
 
 import {
@@ -252,6 +249,13 @@ export default {
       }
       return {};
     },
+    showEndOfListMessage() {
+      return (
+        this.conversationList.length &&
+        this.hasCurrentPageEndReached &&
+        !this.chatListLoading
+      );
+    },
     assigneeTabItems() {
       const ASSIGNEE_TYPE_TAB_KEYS = {
         me: 'mineCount',
@@ -363,8 +367,10 @@ export default {
     },
     allConversationsSelected() {
       return (
-        JSON.stringify(this.selectedConversations) ===
-        JSON.stringify(this.conversationList.map(item => item.id))
+        this.conversationList.length === this.selectedConversations.length &&
+        this.conversationList.every(el =>
+          this.selectedConversations.includes(el.id)
+        )
       );
     },
     uniqueInboxes() {
@@ -592,21 +598,27 @@ export default {
         this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
       }
     },
-    async onResolveConversations() {
+    async onUpdateConversations(status) {
       try {
         await this.$store.dispatch('bulkActions/process', {
           type: 'Conversation',
           ids: this.selectedConversations,
           fields: {
-            status: 'resolved',
+            status,
           },
         });
         this.selectedConversations = [];
-        this.showAlert(this.$t('BULK_ACTION.RESOLVE_SUCCESFUL'));
-      } catch (error) {
-        this.showAlert(this.$t('BULK_ACTION.RESOLVE_FAILED'));
+        this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_SUCCESFUL'));
+      } catch (err) {
+        this.showAlert(this.$t('BULK_ACTION.UPDATE.UPDATE_FAILED'));
       }
     },
+    allSelectedConversationsStatus(status) {
+      if (!this.selectedConversations.length) return false;
+      return this.selectedConversations.every(item => {
+        return this.$store.getters.getConversationById(item).status === status;
+      });
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index ee12b989a..7b90ef6eb 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -11,14 +11,13 @@
     @mouseleave="onCardLeave"
     @click="cardClick(chat)"
   >
-    <label v-if="hovered || selected" class="checkbox-wrapper">
+    <label v-if="hovered || selected" class="checkbox-wrapper" @click.stop>
       <input
         :value="selected"
         :checked="selected"
         class="checkbox"
         type="checkbox"
         @change="onSelectConversation($event.target.checked)"
-        @click.stop
       />
     </label>
     <thumbnail
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 1d7fe6ec0..70a314f5b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -1,5 +1,16 @@
 <template>
   <div class="bulk-action__agents">
+    <div class="triangle">
+      <svg height="12" viewBox="0 0 24 12" width="24">
+        <path
+          d="M20 12l-8-8-12 12"
+          fill="var(--white)"
+          fill-rule="evenodd"
+          stroke="var(--s-50)"
+          stroke-width="1px"
+        />
+      </svg>
+    </div>
     <div class="header flex-between">
       <span>{{ $t('BULK_ACTION.AGENT_SELECT_LABEL') }}</span>
       <woot-button
@@ -148,30 +159,30 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.flex-between {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
 .bulk-action__agents {
-  position: absolute;
-  bottom: 40px;
-  right: var(--space-small);
-  width: 100%;
-  box-shadow: var(--shadow-dropdown-pane);
+  background-color: var(--white);
   border-radius: var(--border-radius-large);
   border: 1px solid var(--s-50);
-  background-color: var(--white);
-  width: 75%;
+  box-shadow: var(--shadow-dropdown-pane);
+  max-width: 75%;
+  position: absolute;
+  right: var(--space-small);
+  top: var(--space-larger);
+  transform-origin: top right;
+  width: auto;
+  z-index: var(--z-index-twenty);
+
   .header {
     padding: var(--space-one);
+
     span {
-      font-size: var(--font-size-default);
+      font-size: var(--font-size-small);
       font-weight: var(--font-weight-medium);
     }
   }
+
   .container {
-    height: 240px;
+    height: 24rem;
     overflow-y: auto;
     .agent__list-container {
       height: 100%;
@@ -194,6 +205,14 @@ export default {
       }
     }
   }
+  .triangle {
+    display: block;
+    z-index: var(--z-index-one);
+    position: absolute;
+    top: calc(var(--space-slab) * -1);
+    right: var(--space-micro);
+    text-align: left;
+  }
 }
 ul {
   margin: 0;
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
similarity index 61%
rename from app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue
rename to app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index 5466f559d..5f1aa37e0 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Actions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -7,6 +7,7 @@
           type="checkbox"
           class="checkbox"
           :checked="allConversationsSelected"
+          :indeterminate.prop="!allConversationsSelected"
           @change="selectAll($event)"
         />
         <span>
@@ -19,13 +20,13 @@
       </label>
       <div class="bulk-action__actions flex-between">
         <woot-button
-          v-tooltip="$t('BULK_ACTION.RESOLVE_TOOLTIP')"
+          v-tooltip="$t('BULK_ACTION.UPDATE.CHANGE_STATUS')"
           size="tiny"
           variant="flat"
           color-scheme="success"
-          icon="checkmark"
+          icon="repeat"
           class="margin-right-smaller"
-          @click="resolveConversations"
+          @click="toggleUpdateActions"
         />
         <woot-button
           v-tooltip="$t('BULK_ACTION.ASSIGN_AGENT_TOOLTIP')"
@@ -33,10 +34,10 @@
           variant="flat"
           color-scheme="secondary"
           icon="person-assign"
-          @click="showAgentsList = true"
+          @click="toggleAgentList"
         />
       </div>
-      <transition name="menu-slide">
+      <transition name="popover-animation">
         <agent-selector
           v-if="showAgentsList"
           :selected-inboxes="selectedInboxes"
@@ -45,6 +46,18 @@
           @close="showAgentsList = false"
         />
       </transition>
+      <transition name="popover-animation">
+        <update-actions
+          v-if="showUpdateActions"
+          :selected-inboxes="selectedInboxes"
+          :conversation-count="conversations.length"
+          :show-resolve="!showResolvedAction"
+          :show-reopen="!showOpenAction"
+          :show-snooze="!showSnoozedAction"
+          @update="updateConversations"
+          @close="showUpdateActions = false"
+        />
+      </transition>
     </div>
     <div v-if="allConversationsSelected" class="bulk-action__alert">
       {{ $t('BULK_ACTION.ALL_CONVERSATIONS_SELECTED_ALERT') }}
@@ -54,9 +67,11 @@
 
 <script>
 import AgentSelector from './AgentSelector.vue';
+import UpdateActions from './UpdateActions.vue';
 export default {
   components: {
     AgentSelector,
+    UpdateActions,
   },
   props: {
     conversations: {
@@ -71,15 +86,25 @@ export default {
       type: Array,
       default: () => [],
     },
+    showOpenAction: {
+      type: Boolean,
+      default: false,
+    },
+    showResolvedAction: {
+      type: Boolean,
+      default: false,
+    },
+    showSnoozedAction: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
       showAgentsList: false,
+      showUpdateActions: false,
     };
   },
-  mounted() {
-    this.$refs.selectAllCheck.indeterminate = true;
-  },
   methods: {
     selectAll(e) {
       this.$emit('select-all-conversations', e.target.checked);
@@ -87,24 +112,25 @@ export default {
     submit(agent) {
       this.$emit('assign-agent', agent);
     },
+    updateConversations(status) {
+      this.$emit('update-conversations', status);
+    },
     resolveConversations() {
       this.$emit('resolve-conversations');
     },
+    toggleUpdateActions() {
+      this.showUpdateActions = !this.showUpdateActions;
+    },
+    toggleAgentList() {
+      this.showAgentsList = !this.showAgentsList;
+    },
   },
 };
 </script>
 
 <style scoped lang="scss">
-.flex-between {
-  align-items: center;
-  display: flex;
-  justify-content: space-between;
-}
-
 .bulk-action__container {
-  background-color: var(--s-50);
-  border-top: 1px solid var(--s-100);
-  box-shadow: var(--shadow-bulk-action-container);
+  border-bottom: 1px solid var(--s-100);
   padding: var(--space-normal) var(--space-one);
   position: relative;
 }
@@ -132,4 +158,29 @@ export default {
   margin-top: var(--space-small);
   padding: var(--space-half) var(--space-one);
 }
+
+.popover-animation-enter-active,
+.popover-animation-leave-active {
+  transition: transform ease-out 0.1s;
+}
+
+.popover-animation-enter {
+  opacity: 0;
+  transform: scale(0.95);
+}
+
+.popover-animation-enter-to {
+  opacity: 1;
+  transform: scale(1);
+}
+
+.popover-animation-leave {
+  opacity: 1;
+  transform: scale(1);
+}
+
+.popover-animation-leave-to {
+  opacity: 0;
+  transform: scale(0.95);
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
new file mode 100644
index 000000000..f6bd53a9a
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/UpdateActions.vue
@@ -0,0 +1,166 @@
+<template>
+  <div v-on-clickaway="onClose" class="actions-container">
+    <div class="triangle">
+      <svg height="12" viewBox="0 0 24 12" width="24">
+        <path
+          d="M20 12l-8-8-12 12"
+          fill="var(--white)"
+          fill-rule="evenodd"
+          stroke="var(--s-50)"
+          stroke-width="1px"
+        />
+      </svg>
+    </div>
+    <div class="header flex-between">
+      <span>{{ $t('BULK_ACTION.UPDATE.CHANGE_STATUS') }}</span>
+      <woot-button
+        size="tiny"
+        variant="clear"
+        color-scheme="secondary"
+        icon="dismiss"
+        @click="onClose"
+      />
+    </div>
+    <div class="container">
+      <woot-dropdown-menu>
+        <template v-for="action in actions">
+          <woot-dropdown-item v-if="showAction(action.key)" :key="action.key">
+            <woot-button
+              variant="clear"
+              color-scheme="secondary"
+              size="small"
+              :icon="action.icon"
+              @click="updateConversations(action.key)"
+            >
+              {{ actionLabel(action.key) }}
+            </woot-button>
+          </woot-dropdown-item>
+        </template>
+      </woot-dropdown-menu>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import WootDropdownItem from 'shared/components/ui/dropdown/DropdownItem.vue';
+import WootDropdownMenu from 'shared/components/ui/dropdown/DropdownMenu.vue';
+export default {
+  components: {
+    WootDropdownItem,
+    WootDropdownMenu,
+  },
+  mixins: [clickaway],
+  props: {
+    selectedInboxes: {
+      type: Array,
+      default: () => [],
+    },
+    conversationCount: {
+      type: Number,
+      default: 0,
+    },
+    showResolve: {
+      type: Boolean,
+      default: true,
+    },
+    showReopen: {
+      type: Boolean,
+      default: true,
+    },
+    showSnooze: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      query: '',
+      selectedAction: null,
+      actions: [
+        {
+          icon: 'checkmark',
+          key: 'resolved',
+        },
+        {
+          icon: 'arrow-redo',
+          key: 'open',
+        },
+        {
+          icon: 'send-clock',
+          key: 'snoozed',
+        },
+      ],
+    };
+  },
+  methods: {
+    updateConversations(key) {
+      this.$emit('update', key);
+    },
+    goBack() {
+      this.selectedAgent = null;
+    },
+    onClose() {
+      this.$emit('close');
+    },
+    showAction(key) {
+      const actionsMap = {
+        resolved: this.showResolve,
+        open: this.showReopen,
+        snoozed: this.showSnooze,
+      };
+      return actionsMap[key] || false;
+    },
+    actionLabel(key) {
+      const labelsMap = {
+        resolved: this.$t('CONVERSATION.HEADER.RESOLVE_ACTION'),
+        open: this.$t('CONVERSATION.HEADER.REOPEN_ACTION'),
+        snoozed: this.$t('BULK_ACTION.UPDATE.SNOOZE_UNTIL_NEXT_REPLY'),
+      };
+      return labelsMap[key] || '';
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.actions-container {
+  background-color: var(--white);
+  border-radius: var(--border-radius-large);
+  border: 1px solid var(--s-50);
+  box-shadow: var(--shadow-dropdown-pane);
+  position: absolute;
+  right: var(--space-small);
+  top: 48px;
+  transform-origin: top right;
+  width: auto;
+  z-index: var(--z-index-twenty);
+
+  .header {
+    padding: var(--space-one);
+
+    span {
+      font-size: var(--font-size-small);
+      font-weight: var(--font-weight-medium);
+    }
+  }
+  .container {
+    padding: var(--space-one);
+    padding-top: var(--space-zero);
+  }
+
+  .triangle {
+    display: block;
+    position: absolute;
+    right: 2.8rem;
+    text-align: left;
+    top: calc(var(--space-slab) * -1);
+    z-index: var(--z-index-one);
+  }
+}
+
+ul {
+  margin: 0;
+  list-style: none;
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index bfd688bef..f9e084cd7 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -1,17 +1,22 @@
 {
-    "BULK_ACTION": {
-        "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
-        "AGENT_SELECT_LABEL": "Select Agent",
-        "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
-        "GO_BACK_LABEL": "Go back",
-        "ASSIGN_LABEL": "Assign",
-        "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
-        "RESOLVE_TOOLTIP": "Resolve",
-        "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"
+  "BULK_ACTION": {
+    "CONVERSATIONS_SELECTED": "%{conversationCount} conversations selected",
+    "AGENT_SELECT_LABEL": "Select Agent",
+    "ASSIGN_CONFIRMATION_LABEL": "Are you sure you want to assign %{conversationCount} %{conversationLabel} to",
+    "GO_BACK_LABEL": "Go back",
+    "ASSIGN_LABEL": "Assign",
+    "ASSIGN_AGENT_TOOLTIP": "Assign Agent",
+    "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"
     }
+  }
 }
diff --git a/app/javascript/shared/assets/stylesheets/z-index.scss b/app/javascript/shared/assets/stylesheets/z-index.scss
index 011bdf11c..43c28d575 100644
--- a/app/javascript/shared/assets/stylesheets/z-index.scss
+++ b/app/javascript/shared/assets/stylesheets/z-index.scss
@@ -2,6 +2,7 @@
   // z-index
   --z-index-minus: -1;
   --z-index-zero: 0;
+  --z-index-one: 1;
   --z-index-low: 10;
   --z-index-twenty: 20;
   --z-index-normal: 100;
diff --git a/app/javascript/shared/components/FluentIcon/dashboard-icons.json b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
index 1f4a35b2f..518a44cac 100644
--- a/app/javascript/shared/components/FluentIcon/dashboard-icons.json
+++ b/app/javascript/shared/components/FluentIcon/dashboard-icons.json
@@ -103,6 +103,7 @@
   "power-outline": "M8.204 4.82a.75.75 0 0 1 .634 1.36A7.51 7.51 0 0 0 4.5 12.991c0 4.148 3.358 7.51 7.499 7.51s7.499-3.362 7.499-7.51a7.51 7.51 0 0 0-4.323-6.804.75.75 0 1 1 .637-1.358 9.01 9.01 0 0 1 5.186 8.162c0 4.976-4.029 9.01-9 9.01C7.029 22 3 17.966 3 12.99a9.01 9.01 0 0 1 5.204-8.17ZM12 2.496a.75.75 0 0 1 .743.648l.007.102v7.5a.75.75 0 0 1-1.493.102l-.007-.102v-7.5a.75.75 0 0 1 .75-.75Z",
   "quote-outline": "M7.5 6a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.555-1.24 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.64-1.737 2.66-3.674 3.077-5.859A2.5 2.5 0 1 1 7.5 6Zm9 0a2.5 2.5 0 0 1 2.495 2.336l.005.206c-.01 3.56-1.238 6.614-3.705 9.223a.75.75 0 1 1-1.09-1.03c1.643-1.738 2.662-3.672 3.078-5.859A2.5 2.5 0 1 1 16.5 6Zm-9 1.5a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Zm9 0a1 1 0 1 0 .993 1.117l.007-.124a1 1 0 0 0-1-.993Z",
   "resize-large-outline": "M6.25 4.5A1.75 1.75 0 0 0 4.5 6.25v1.5a.75.75 0 0 1-1.5 0v-1.5A3.25 3.25 0 0 1 6.25 3h1.5a.75.75 0 0 1 0 1.5h-1.5ZM19.5 6.25a1.75 1.75 0 0 0-1.75-1.75h-1.5a.75.75 0 0 1 0-1.5h1.5A3.25 3.25 0 0 1 21 6.25v1.5a.75.75 0 0 1-1.5 0v-1.5ZM19.5 17.75a1.75 1.75 0 0 1-1.75 1.75h-1.5a.75.75 0 0 0 0 1.5h1.5A3.25 3.25 0 0 0 21 17.75v-1.5a.75.75 0 0 0-1.5 0v1.5ZM4.5 17.75c0 .966.784 1.75 1.75 1.75h1.5a.75.75 0 0 1 0 1.5h-1.5A3.25 3.25 0 0 1 3 17.75v-1.5a.75.75 0 0 1 1.5 0v1.5ZM8.25 6A2.25 2.25 0 0 0 6 8.25v7.5A2.25 2.25 0 0 0 8.25 18h7.5A2.25 2.25 0 0 0 18 15.75v-7.5A2.25 2.25 0 0 0 15.75 6h-7.5ZM7.5 8.25a.75.75 0 0 1 .75-.75h7.5a.75.75 0 0 1 .75.75v7.5a.75.75 0 0 1-.75.75h-7.5a.75.75 0 0 1-.75-.75v-7.5Z",
+  "repeat-outline": "m14.712 2.289l-.087-.078a1 1 0 0 0-1.327.078l-.078.087a.999.999 0 0 0 .078 1.326l1.299 1.297H8.999l-.24.004A6.997 6.997 0 0 0 2 11.993a6.94 6.94 0 0 0 1.189 3.899a.999.999 0 0 0 1.626-1.163l-.135-.218A4.997 4.997 0 0 1 9 6.998h5.595l-1.297 1.297l-.078.087a.999.999 0 0 0 1.492 1.326l3.006-3.003l.077-.087a.999.999 0 0 0-.078-1.326l-3.005-3.003Zm6.075 5.771A.999.999 0 0 0 19 8.677c0 .209.064.402.172.561a4.997 4.997 0 0 1-4.17 7.75H9.414l1.294-1.29l.083-.096a1 1 0 0 0-.006-1.23l-.077-.088l-.095-.084a1.001 1.001 0 0 0-1.232.006l-.088.078l-3.005 3.003l-.083.095a1 1 0 0 0 .006 1.231l.077.087l3.005 3.003l.095.084a1 1 0 0 0 1.397-1.41l-.077-.087l-1.304-1.303H15l.24-.003a6.997 6.997 0 0 0 5.546-10.927v.003Z",
   "save-outline": "M3 5.75A2.75 2.75 0 0 1 5.75 3h9.964a3.25 3.25 0 0 1 2.299.952l2.035 2.035c.61.61.952 1.437.952 2.299v9.964A2.75 2.75 0 0 1 18.25 21H5.75A2.75 2.75 0 0 1 3 18.25V5.75ZM5.75 4.5c-.69 0-1.25.56-1.25 1.25v12.5c0 .69.56 1.25 1.25 1.25H6v-5.25A2.25 2.25 0 0 1 8.25 12h7.5A2.25 2.25 0 0 1 18 14.25v5.25h.25c.69 0 1.25-.56 1.25-1.25V8.286c0-.465-.184-.91-.513-1.238l-2.035-2.035a1.75 1.75 0 0 0-.952-.49V7.25a2.25 2.25 0 0 1-2.25 2.25h-4.5A2.25 2.25 0 0 1 7 7.25V4.5H5.75Zm10.75 15v-5.25a.75.75 0 0 0-.75-.75h-7.5a.75.75 0 0 0-.75.75v5.25h9Zm-8-15v2.75c0 .414.336.75.75.75h4.5a.75.75 0 0 0 .75-.75V4.5h-6Z",
   "search-outline": "M10 2.75a7.25 7.25 0 0 1 5.63 11.819l4.9 4.9a.75.75 0 0 1-.976 1.134l-.084-.073-4.901-4.9A7.25 7.25 0 1 1 10 2.75Zm0 1.5a5.75 5.75 0 1 0 0 11.5 5.75 5.75 0 0 0 0-11.5Z",
   "send-outline": "M5.694 12 2.299 3.272c-.236-.607.356-1.188.942-.982l.093.04 18 9a.75.75 0 0 1 .097 1.283l-.097.058-18 9c-.583.291-1.217-.244-1.065-.847l.03-.096L5.694 12 2.299 3.272 5.694 12ZM4.402 4.54l2.61 6.71h6.627a.75.75 0 0 1 .743.648l.007.102a.75.75 0 0 1-.649.743l-.101.007H7.01l-2.609 6.71L19.322 12 4.401 4.54Z",

From ae72757d23da8ce4aa0f65145469c6bcb0844eb8 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Mon, 13 Jun 2022 15:56:49 +0530
Subject: [PATCH 162/177] feat: APIs for Articles (#4777)

Fixes: #4802
---
 Gemfile                                       |   3 +
 Gemfile.lock                                  |   6 +-
 .../api/v1/accounts/articles_controller.rb    |  48 ++++++
 .../api/v1/accounts/categories_controller.rb  |   4 +-
 app/models/article.rb                         |  67 +++++++--
 app/models/category.rb                        |  37 +++--
 app/models/user.rb                            |   1 +
 .../accounts/articles/_article.json.jbuilder  |  20 +++
 .../v1/accounts/articles/create.json.jbuilder |   3 +
 .../v1/accounts/articles/edit.json.jbuilder   |   3 +
 .../v1/accounts/articles/index.json.jbuilder  |   3 +
 .../v1/accounts/articles/show.json.jbuilder   |   3 +
 .../v1/accounts/articles/update.json.jbuilder |   3 +
 .../categories/_category.json.jbuilder        |   2 +
 config/routes.rb                              |   2 +-
 ...20527080906_add_reference_for_author_id.rb |   6 +
 ...6_add_index_on_category_slug_and_locale.rb |   7 +
 db/schema.rb                                  |   6 +-
 .../v1/accounts/articles_controller_spec.rb   | 137 ++++++++++++++++++
 .../v1/accounts/categories_controller_spec.rb |  52 +++++--
 spec/factories/articles.rb                    |   4 +-
 spec/models/article_spec.rb                   | 101 +++++++++++++
 spec/models/category_spec.rb                  |  35 +++++
 23 files changed, 511 insertions(+), 42 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/articles_controller.rb
 create mode 100644 app/views/api/v1/accounts/articles/_article.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/articles/create.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/articles/edit.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/articles/index.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/articles/show.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/articles/update.json.jbuilder
 create mode 100644 db/migrate/20220527080906_add_reference_for_author_id.rb
 create mode 100644 db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb
 create mode 100644 spec/controllers/api/v1/accounts/articles_controller_spec.rb

diff --git a/Gemfile b/Gemfile
index b8e511b1b..9029ccbcb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -128,6 +128,9 @@ gem 'html2text'
 # to calculate working hours
 gem 'working_hours'
 
+# full text search for articles
+gem 'pg_search'
+
 group :production, :staging do
   # we dont want request timing out in development while using byebug
   gem 'rack-timeout'
diff --git a/Gemfile.lock b/Gemfile.lock
index de9443f29..cff30308b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -388,6 +388,9 @@ GEM
     parser (3.1.1.0)
       ast (~> 2.4.1)
     pg (1.3.2)
+    pg_search (2.3.6)
+      activerecord (>= 5.2)
+      activesupport (>= 5.2)
     procore-sift (0.16.0)
       rails (> 4.2.0)
     pry (0.14.1)
@@ -694,6 +697,7 @@ DEPENDENCIES
   mock_redis
   newrelic_rpm
   pg
+  pg_search
   procore-sift
   pry-rails
   puma
@@ -742,4 +746,4 @@ RUBY VERSION
    ruby 3.0.4p208
 
 BUNDLED WITH
-   2.3.14
+   2.3.15
diff --git a/app/controllers/api/v1/accounts/articles_controller.rb b/app/controllers/api/v1/accounts/articles_controller.rb
new file mode 100644
index 000000000..232eecd32
--- /dev/null
+++ b/app/controllers/api/v1/accounts/articles_controller.rb
@@ -0,0 +1,48 @@
+class Api::V1::Accounts::ArticlesController < Api::V1::Accounts::BaseController
+  before_action :portal
+  before_action :fetch_article, except: [:index, :create]
+
+  def index
+    @articles = @portal.articles
+    @articles.search(list_params) if params[:payload].present?
+  end
+
+  def create
+    @article = @portal.articles.create!(article_params)
+  end
+
+  def edit; end
+
+  def show; end
+
+  def update
+    @article.update!(article_params)
+  end
+
+  def destroy
+    @article.destroy!
+    head :ok
+  end
+
+  private
+
+  def fetch_article
+    @article = @portal.articles.find(params[:id])
+  end
+
+  def portal
+    @portal ||= Current.account.portals.find_by(slug: params[:portal_id])
+  end
+
+  def article_params
+    params.require(:article).permit(
+      :title, :content, :description, :position, :category_id, :author_id
+    )
+  end
+
+  def list_params
+    params.require(:payload).permit(
+      :category_slug, :locale, :query
+    )
+  end
+end
diff --git a/app/controllers/api/v1/accounts/categories_controller.rb b/app/controllers/api/v1/accounts/categories_controller.rb
index 246eeb2a2..a77f1fb2a 100644
--- a/app/controllers/api/v1/accounts/categories_controller.rb
+++ b/app/controllers/api/v1/accounts/categories_controller.rb
@@ -3,7 +3,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
   before_action :fetch_category, except: [:index, :create]
 
   def index
-    @categories = @portal.categories
+    @categories = @portal.categories.search(params)
   end
 
   def create
@@ -31,7 +31,7 @@ class Api::V1::Accounts::CategoriesController < Api::V1::Accounts::BaseControlle
 
   def category_params
     params.require(:category).permit(
-      :name, :description, :position
+      :name, :description, :position, :slug, :locale
     )
   end
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index 750e3a4fd..72bf3b2c4 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -2,25 +2,34 @@
 #
 # Table name: articles
 #
-#  id          :bigint           not null, primary key
-#  content     :text
-#  description :text
-#  status      :integer
-#  title       :string
-#  views       :integer
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :integer          not null
-#  author_id   :integer
-#  category_id :integer
-#  folder_id   :integer
-#  portal_id   :integer          not null
+#  id                       :bigint           not null, primary key
+#  content                  :text
+#  description              :text
+#  status                   :integer
+#  title                    :string
+#  views                    :integer
+#  created_at               :datetime         not null
+#  updated_at               :datetime         not null
+#  account_id               :integer          not null
+#  author_id                :bigint
+#  category_id              :integer
+#  folder_id                :integer
+#  portal_id                :integer          not null
+#
+# Indexes
+#
+#  index_articles_on_author_id                 (author_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (author_id => users.id)
 #
 class Article < ApplicationRecord
+  include PgSearch::Model
+
   belongs_to :account
   belongs_to :category
   belongs_to :portal
-  belongs_to :folder
   belongs_to :author, class_name: 'User'
 
   before_validation :ensure_account_id
@@ -32,6 +41,36 @@ class Article < ApplicationRecord
 
   enum status: { draft: 0, published: 1 }
 
+  scope :search_by_category_slug, ->(category_slug) { where(categories: { slug: category_slug }) if category_slug.present? }
+  scope :search_by_category_locale, ->(locale) { where(categories: { locale: locale }) if locale.present? }
+
+  # TODO: if text search slows down https://www.postgresql.org/docs/current/textsearch-features.html#TEXTSEARCH-UPDATE-TRIGGERS
+  pg_search_scope(
+    :text_search,
+    against: %i[
+      title
+      description
+      content
+    ],
+    using: {
+      tsearch: {
+        prefix: true
+      }
+    }
+  )
+
+  def self.search(params)
+    records = joins(
+      :category
+    ).search_by_category_slug(params[:category_slug]).search_by_category_locale(params[:locale])
+    records.text_search(params[:query]) if params[:query].present?
+    records.page(current_page(params))
+  end
+
+  def self.current_page(params)
+    params[:page] || 1
+  end
+
   private
 
   def ensure_account_id
diff --git a/app/models/category.rb b/app/models/category.rb
index 2fb5815f2..8c5989c0f 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -2,20 +2,22 @@
 #
 # Table name: categories
 #
-#  id          :bigint           not null, primary key
-#  description :text
-#  locale      :string           default("en")
-#  name        :string
-#  position    :integer
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  account_id  :integer          not null
-#  portal_id   :integer          not null
+#  id                        :bigint           not null, primary key
+#  description               :text
+#  locale                    :string           default("en")
+#  name                      :string
+#  position                  :integer
+#  slug                      :string           not null
+#  created_at                :datetime         not null
+#  updated_at                :datetime         not null
+#  account_id                :integer          not null
+#  portal_id                 :integer          not null
 #
 # Indexes
 #
-#  index_categories_on_locale                 (locale)
-#  index_categories_on_locale_and_account_id  (locale,account_id)
+#  index_categories_on_locale                         (locale)
+#  index_categories_on_locale_and_account_id          (locale,account_id)
+#  index_categories_on_slug_and_locale_and_portal_id  (slug,locale,portal_id) UNIQUE
 #
 class Category < ApplicationRecord
   belongs_to :account
@@ -25,7 +27,20 @@ class Category < ApplicationRecord
 
   before_validation :ensure_account_id
   validates :account_id, presence: true
+  validates :slug, presence: true
   validates :name, presence: true
+  validates :locale, uniqueness: { scope: %i[slug portal_id],
+                                   message: 'should be unique in the category and portal' }
+
+  scope :search_by_locale, ->(locale) { where(locale: locale) if locale.present? }
+
+  def self.search(params)
+    search_by_locale(params[:locale]).page(current_page(params)).order(position: :asc)
+  end
+
+  def self.current_page(params)
+    params[:page] || 1
+  end
 
   private
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 534ebea21..2125f88d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -92,6 +92,7 @@ class User < ApplicationRecord
   has_many :portals, through: :portals_members
   has_many :team_members, dependent: :destroy_async
   has_many :teams, through: :team_members
+  has_many :articles, foreign_key: 'author_id', dependent: :nullify
 
   before_validation :set_password_and_uid, on: :create
 
diff --git a/app/views/api/v1/accounts/articles/_article.json.jbuilder b/app/views/api/v1/accounts/articles/_article.json.jbuilder
new file mode 100644
index 000000000..85ff7c1a0
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/_article.json.jbuilder
@@ -0,0 +1,20 @@
+json.id article.id
+json.category_id article.category_id
+json.title article.title
+json.content article.content
+json.description article.description
+json.status article.status
+json.account_id article.account_id
+
+if article.portal.present?
+  json.portal do
+    json.partial! 'api/v1/accounts/portals/portal.json.jbuilder', portal: article.portal
+  end
+end
+json.views article.views
+
+if article.author.present?
+  json.author do
+    json.partial! 'api/v1/models/agent.json.jbuilder', resource: article.author
+  end
+end
diff --git a/app/views/api/v1/accounts/articles/create.json.jbuilder b/app/views/api/v1/accounts/articles/create.json.jbuilder
new file mode 100644
index 000000000..fdc6247c2
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/create.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'article', article: @article
+end
diff --git a/app/views/api/v1/accounts/articles/edit.json.jbuilder b/app/views/api/v1/accounts/articles/edit.json.jbuilder
new file mode 100644
index 000000000..fdc6247c2
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/edit.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'article', article: @article
+end
diff --git a/app/views/api/v1/accounts/articles/index.json.jbuilder b/app/views/api/v1/accounts/articles/index.json.jbuilder
new file mode 100644
index 000000000..3e3364007
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/index.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.array! @articles, partial: 'article', as: :article
+end
diff --git a/app/views/api/v1/accounts/articles/show.json.jbuilder b/app/views/api/v1/accounts/articles/show.json.jbuilder
new file mode 100644
index 000000000..fdc6247c2
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/show.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'article', article: @article
+end
diff --git a/app/views/api/v1/accounts/articles/update.json.jbuilder b/app/views/api/v1/accounts/articles/update.json.jbuilder
new file mode 100644
index 000000000..fdc6247c2
--- /dev/null
+++ b/app/views/api/v1/accounts/articles/update.json.jbuilder
@@ -0,0 +1,3 @@
+json.payload do
+  json.partial! 'article', article: @article
+end
diff --git a/app/views/api/v1/accounts/categories/_category.json.jbuilder b/app/views/api/v1/accounts/categories/_category.json.jbuilder
index 358420231..4b4915da9 100644
--- a/app/views/api/v1/accounts/categories/_category.json.jbuilder
+++ b/app/views/api/v1/accounts/categories/_category.json.jbuilder
@@ -1,5 +1,7 @@
 json.id category.id
 json.name category.name
+json.slug category.slug
+json.locale category.locale
 json.description category.description
 json.position category.position
 json.account_id category.account_id
diff --git a/config/routes.rb b/config/routes.rb
index a09311b3e..5d1718841 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -162,8 +162,8 @@ Rails.application.routes.draw do
             resources :categories do
               resources :folders
             end
+            resources :articles
           end
-          resources :articles
         end
       end
       # end of account scoped api routes
diff --git a/db/migrate/20220527080906_add_reference_for_author_id.rb b/db/migrate/20220527080906_add_reference_for_author_id.rb
new file mode 100644
index 000000000..cf7fd22fc
--- /dev/null
+++ b/db/migrate/20220527080906_add_reference_for_author_id.rb
@@ -0,0 +1,6 @@
+class AddReferenceForAuthorId < ActiveRecord::Migration[6.1]
+  def change
+    remove_column :articles, :author_id, :integer
+    add_reference :articles, :author, foreign_key: { to_table: :users }
+  end
+end
diff --git a/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb b/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb
new file mode 100644
index 000000000..be17caac7
--- /dev/null
+++ b/db/migrate/20220527120826_add_index_on_category_slug_and_locale.rb
@@ -0,0 +1,7 @@
+class AddIndexOnCategorySlugAndLocale < ActiveRecord::Migration[6.1]
+  def change
+    add_column :categories, :slug, :string, null: false, default: ''
+    add_index :categories, [:slug, :locale, :portal_id], unique: true
+    change_column_default :categories, :slug, from: '', to: nil
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 9599d193c..6f1ffe408 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -116,7 +116,6 @@ ActiveRecord::Schema.define(version: 2022_06_10_091206) do
     t.integer "portal_id", null: false
     t.integer "category_id"
     t.integer "folder_id"
-    t.integer "author_id"
     t.string "title"
     t.text "description"
     t.text "content"
@@ -124,6 +123,8 @@ ActiveRecord::Schema.define(version: 2022_06_10_091206) do
     t.integer "views"
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
+    t.bigint "author_id"
+    t.index ["author_id"], name: "index_articles_on_author_id"
   end
 
   create_table "attachments", id: :serial, force: :cascade do |t|
@@ -193,8 +194,10 @@ ActiveRecord::Schema.define(version: 2022_06_10_091206) do
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.string "locale", default: "en"
+    t.string "slug", null: false
     t.index ["locale", "account_id"], name: "index_categories_on_locale_and_account_id"
     t.index ["locale"], name: "index_categories_on_locale"
+    t.index ["slug", "locale", "portal_id"], name: "index_categories_on_slug_and_locale_and_portal_id", unique: true
   end
 
   create_table "channel_api", force: :cascade do |t|
@@ -817,6 +820,7 @@ ActiveRecord::Schema.define(version: 2022_06_10_091206) do
   add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
   add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "agent_bots", "accounts", on_delete: :cascade
+  add_foreign_key "articles", "users", column: "author_id"
   add_foreign_key "campaigns", "accounts", on_delete: :cascade
   add_foreign_key "campaigns", "inboxes", on_delete: :cascade
   add_foreign_key "contact_inboxes", "contacts", on_delete: :cascade
diff --git a/spec/controllers/api/v1/accounts/articles_controller_spec.rb b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
new file mode 100644
index 000000000..69c1ee4ca
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/articles_controller_spec.rb
@@ -0,0 +1,137 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Articles', 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) }
+  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, locale: 'en', slug: 'category_slug') }
+  let!(:article) { create(:article, category: category, portal: portal, account_id: account.id, author_id: agent.id) }
+
+  describe 'POST /api/v1/accounts/{account.id}/portals/{portal.slug}/articles' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles", params: {}
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'creates article' do
+        article_params = {
+          article: {
+            category_id: category.id,
+            description: 'test description',
+            title: 'MyTitle',
+            content: 'This is my content.',
+            status: :published,
+            author_id: agent.id
+          }
+        }
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
+             params: article_params,
+             headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload']['title']).to eql('MyTitle')
+      end
+    end
+  end
+
+  describe 'PUT /api/v1/accounts/{account.id}/portals/{portal.slug}/articles/{article.id}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article.id}", params: {}
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'updates category' do
+        article_params = {
+          article: {
+            title: 'MyTitle2',
+            description: 'test_description'
+          }
+        }
+
+        expect(article.title).not_to eql(article_params[:article][:title])
+
+        put "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article.id}",
+            params: article_params,
+            headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload']['title']).to eql(article_params[:article][:title])
+      end
+    end
+  end
+
+  describe 'DELETE /api/v1/accounts/{account.id}/portals/{portal.slug}/articles/{article.id}' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article.id}", params: {}
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'deletes category' do
+        delete "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article.id}",
+               headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        deleted_article = Article.find_by(id: article.id)
+        expect(deleted_article).to be nil
+      end
+    end
+  end
+
+  describe 'GET /api/v1/accounts/{account.id}/portals/{portal.slug}/articles' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles"
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'get all articles' do
+        article2 = create(:article, account_id: account.id, portal: portal, category: category, author_id: agent.id)
+        expect(article2.id).not_to be nil
+
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
+            headers: agent.create_new_auth_token,
+            params: { payload: {} }
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload'].count).to be 2
+      end
+
+      it 'get all articles with searched params' do
+        article2 = create(:article, account_id: account.id, portal: portal, category: category, author_id: agent.id)
+        expect(article2.id).not_to be nil
+
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles",
+            headers: agent.create_new_auth_token,
+            params: { payload: { category_slug: category.slug } }
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['payload'].count).to be 2
+      end
+    end
+
+    describe 'GET /api/v1/accounts/{account.id}/portals/{portal.slug}/articles/{article.id}' do
+      it 'get article' do
+        article2 = create(:article, account_id: account.id, portal: portal, category: category, author_id: agent.id)
+        expect(article2.id).not_to be nil
+
+        get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/articles/#{article2.id}",
+            headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['payload']['title']).to eq(article2.title)
+        expect(json_response['payload']['id']).to eq(article2.id)
+      end
+    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 a1b767166..053fe9d5e 100644
--- a/spec/controllers/api/v1/accounts/categories_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/categories_controller_spec.rb
@@ -4,7 +4,7 @@ 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) }
-  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id) }
+  let!(:category) { create(:category, name: 'category', portal: portal, account_id: account.id, slug: 'category_slug') }
 
   describe 'POST /api/v1/accounts/{account.id}/portals/{portal.slug}/categories' do
     context 'when it is an unauthenticated user' do
@@ -15,14 +15,17 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      it 'creates category' do
-        category_params = {
-          category: {
-            name: 'test_category',
-            description: 'test_description',
-            position: 1
-          }
+      category_params = {
+        category: {
+          name: 'test_category',
+          description: 'test_description',
+          position: 1,
+          locale: 'es',
+          slug: 'test_category_1'
         }
+      }
+
+      it 'creates category' do
         post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
              params: category_params,
              headers: agent.create_new_auth_token
@@ -30,6 +33,37 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
         json_response = JSON.parse(response.body)
         expect(json_response['payload']['name']).to eql('test_category')
       end
+
+      it 'will throw an error on locale, category_id uniqueness' do
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
+             params: category_params,
+             headers: agent.create_new_auth_token
+
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
+             params: category_params,
+             headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eql('Locale should be unique in the category and portal')
+      end
+
+      it 'will throw an error slug presence' do
+        category_params = {
+          category: {
+            name: 'test_category',
+            description: 'test_description',
+            position: 1,
+            locale: 'es'
+          }
+        }
+
+        post "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
+             params: category_params,
+             headers: agent.create_new_auth_token
+        expect(response).to have_http_status(:unprocessable_entity)
+        json_response = JSON.parse(response.body)
+        expect(json_response['message']).to eql("Slug can't be blank")
+      end
     end
   end
 
@@ -92,7 +126,7 @@ RSpec.describe 'Api::V1::Accounts::Categories', type: :request do
 
     context 'when it is an authenticated user' do
       it 'get all portals' do
-        category2 = create(:category, name: 'test_category_2', portal: portal)
+        category2 = create(:category, name: 'test_category_2', portal: portal, locale: 'es', slug: 'category_slug_2')
         expect(category2.id).not_to be nil
 
         get "/api/v1/accounts/#{account.id}/portals/#{portal.slug}/categories",
diff --git a/spec/factories/articles.rb b/spec/factories/articles.rb
index 3f0c94c47..9ba5d9ac4 100644
--- a/spec/factories/articles.rb
+++ b/spec/factories/articles.rb
@@ -2,13 +2,11 @@ FactoryBot.define do
   factory :article, class: 'Article' do
     account_id { 1 }
     category_id { 1 }
-    folder_id { 1 }
     author_id { 1 }
     title { 'MyString' }
     content { 'MyText' }
+    description { 'MyDescrption' }
     status { 1 }
     views { 1 }
-    seo_title { 'MyString' }
-    seo { '' }
   end
 end
diff --git a/spec/models/article_spec.rb b/spec/models/article_spec.rb
index ee1e7f618..1945cca62 100644
--- a/spec/models/article_spec.rb
+++ b/spec/models/article_spec.rb
@@ -14,4 +14,105 @@ RSpec.describe Article, type: :model do
     it { is_expected.to belong_to(:category) }
     it { is_expected.to belong_to(:author) }
   end
+
+  describe 'search' do
+    let!(:account) { create(:account) }
+    let(:user) { create(:user, account_ids: [account.id], role: :agent) }
+    let!(:portal_1) { create(:portal, account_id: account.id) }
+    let!(:portal_2) { create(:portal, account_id: account.id) }
+    let!(:category_1) { create(:category, slug: 'category_1', locale: 'en', portal_id: portal_1.id) }
+    let!(:category_2) { create(:category, slug: 'category_2', locale: 'es', portal_id: portal_1.id) }
+    let!(:category_3) { create(:category, slug: 'category_3', locale: 'es', portal_id: portal_2.id) }
+
+    before do
+      create(:article, category_id: category_1.id, content: 'This is the content', description: 'this is the description', title: 'this is title',
+                       portal_id: portal_1.id, author_id: user.id)
+      create(:article, category_id: category_1.id, title: 'title 1', portal_id: portal_1.id, author_id: user.id)
+      create(:article, category_id: category_2.id, title: 'title 2', portal_id: portal_2.id, author_id: user.id)
+      create(:article, category_id: category_2.id, title: 'title 3', portal_id: portal_1.id, author_id: user.id)
+      create(:article, category_id: category_3.id, title: 'title 6', portal_id: portal_2.id, author_id: user.id)
+      create(:article, category_id: category_2.id, title: 'title 7', portal_id: portal_1.id, author_id: user.id)
+    end
+
+    context 'when no parameters passed' do
+      it 'returns all the articles in portal' do
+        records = portal_1.articles.search({})
+        expect(records.count).to eq(portal_1.articles.count)
+
+        records = portal_2.articles.search({})
+        expect(records.count).to eq(portal_2.articles.count)
+      end
+    end
+
+    context 'when params passed' do
+      it 'returns all the articles with all the params filters' do
+        params = { query: 'title', locale: 'es', category_slug: 'category_3' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(1)
+
+        params = { query: 'this', locale: 'en', category_slug: 'category_1' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+    end
+
+    context 'when some params missing' do
+      it 'returns data with category slug' do
+        params = { category_slug: 'category_2' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+
+      it 'returns data with locale' do
+        params = { locale: 'es' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(2)
+
+        params = { locale: 'en' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+
+      it 'returns data with text_search query' do
+        params = { query: 'title' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(2)
+
+        params = { query: 'title' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(4)
+
+        params = { query: 'the content' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+
+      it 'returns data with text_search query and locale' do
+        params = { query: 'the title', locale: 'es' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+
+      it 'returns records with locale and category_slug' do
+        params = { category_slug: 'category_2', locale: 'es' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+
+      it 'return records with category_slug and text_search query' do
+        params = { category_slug: 'category_2', query: 'the title' }
+        records = portal_1.articles.search(params)
+        expect(records.count).to eq(2)
+      end
+    end
+
+    context 'with pagination' do
+      it 'returns paginated articles' do
+        create_list(:article, 30, category_id: category_2.id, title: 'title 1', portal_id: portal_2.id, author_id: user.id)
+        params = { category_slug: 'category_2' }
+        records = portal_2.articles.search(params)
+        expect(records.count).to eq(25)
+      end
+    end
+  end
 end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 55bad9a14..37b17284a 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -12,4 +12,39 @@ RSpec.describe Category, type: :model do
     it { is_expected.to have_many(:folders) }
     it { is_expected.to have_many(:articles) }
   end
+
+  describe 'search' do
+    let!(:account) { create(:account) }
+    let(:user) { create(:user, account_ids: [account.id], role: :agent) }
+    let!(:portal_1) { create(:portal, account_id: account.id) }
+    let!(:portal_2) { create(:portal, account_id: account.id) }
+
+    before do
+      create(:category, slug: 'category_1', locale: 'en', portal_id: portal_1.id)
+      create(:category, slug: 'category_2', locale: 'es', portal_id: portal_1.id)
+      create(:category, slug: 'category_3', locale: 'es', portal_id: portal_2.id)
+    end
+
+    context 'when no parameters passed' do
+      it 'returns all the articles in portal' do
+        records = portal_1.categories.search({})
+        expect(records.count).to eq(portal_1.categories.count)
+
+        records = portal_2.categories.search({})
+        expect(records.count).to eq(portal_2.categories.count)
+      end
+    end
+
+    context 'when params passed' do
+      it 'returns all the categories with all the params filters' do
+        params = { locale: 'es' }
+        records = portal_2.categories.search(params)
+        expect(records.count).to eq(1)
+
+        params = { locale: 'en' }
+        records = portal_1.categories.search(params)
+        expect(records.count).to eq(1)
+      end
+    end
+  end
 end

From 713fdb44ee09e7f16ffb83d71c5faf7036d6d807 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 13 Jun 2022 20:18:38 +0530
Subject: [PATCH 163/177] feat (ee): APIs to configure an auto assignment limit
 for inboxes (#4672)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../api/v1/accounts/inboxes_controller.rb     | 30 +++-------
 app/controllers/application_controller.rb     |  2 +-
 app/controllers/dashboard_controller.rb       |  3 +-
 app/helpers/api/v1/inboxes_helper.rb          | 18 ++++++
 .../dashboard/i18n/locale/en/inboxMgmt.json   |  5 ++
 .../inbox/settingsPage/CollaboratorsPage.vue  | 56 ++++++++++++++++++-
 app/javascript/shared/mixins/configMixin.js   |  3 +
 app/models/account.rb                         |  3 +-
 app/models/concerns/round_robin_handler.rb    |  2 +-
 app/models/inbox.rb                           | 12 ++++
 app/services/round_robin/manage_service.rb    | 33 ++++++-----
 app/views/api/v1/models/_inbox.json.jbuilder  |  1 +
 app/views/layouts/vueapp.html.erb             |  1 +
 ...uto_assignment_configuration_to_inboxes.rb |  5 ++
 db/schema.rb                                  |  1 +
 .../api/v1/accounts/inboxes_controller.rb     |  9 +++
 enterprise/app/models/enterprise/inbox.rb     | 20 +++++++
 .../v1/accounts/inboxes_controller_spec.rb    | 46 +++++++++++++++
 spec/enterprise/models/inbox_spec.rb          | 38 +++++++++++++
 .../round_robin/manage_service_spec.rb        | 12 ++--
 20 files changed, 255 insertions(+), 45 deletions(-)
 create mode 100644 db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb
 create mode 100644 enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
 create mode 100644 enterprise/app/models/enterprise/inbox.rb
 create mode 100644 spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb
 create mode 100644 spec/enterprise/models/inbox_spec.rb

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 4bc85546a..ded4db598 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -42,7 +42,7 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def update
-    @inbox.update(permitted_params.except(:channel))
+    @inbox.update!(permitted_params.except(:channel))
     @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
     channel_attributes = get_channel_attributes(@inbox.channel_type)
 
@@ -109,10 +109,14 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @inbox.channel.save!
   end
 
+  def inbox_attributes
+    [:name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
+     :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved]
+  end
+
   def permitted_params(channel_attributes = [])
     params.permit(
-      :name, :avatar, :greeting_enabled, :greeting_message, :enable_email_collect, :csat_survey_enabled,
-      :enable_auto_assignment, :working_hours_enabled, :out_of_office_message, :timezone, :allow_messages_after_resolved,
+      *inbox_attributes,
       channel: [:type, *channel_attributes]
     )
   end
@@ -129,18 +133,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     }[permitted_params[:channel][:type]]
   end
 
-  def account_channels_method
-    {
-      'web_widget' => Current.account.web_widgets,
-      'api' => Current.account.api_channels,
-      'email' => Current.account.email_channels,
-      'line' => Current.account.line_channels,
-      'telegram' => Current.account.telegram_channels,
-      'whatsapp' => Current.account.whatsapp_channels,
-      'sms' => Current.account.sms_channels
-    }[permitted_params[:channel][:type]]
-  end
-
   def get_channel_attributes(channel_type)
     if channel_type.constantize.const_defined?(:EDITABLE_ATTRS)
       channel_type.constantize::EDITABLE_ATTRS.presence
@@ -148,10 +140,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
       []
     end
   end
-
-  def validate_limit
-    return unless Current.account.inboxes.count >= Current.account.usage_limits[:inboxes]
-
-    render_payment_required('Account limit exceeded. Upgrade to a higher plan')
-  end
 end
+
+Api::V1::Accounts::InboxesController.prepend_mod_with('Api::V1::Accounts::InboxesController')
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0a1c672ec..0762c3d91 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   include DeviseTokenAuth::Concerns::SetUserByToken
   include RequestExceptionHandler
-  include Pundit
+  include Pundit::Authorization
   include SwitchLocale
 
   skip_before_action :verify_authenticity_token
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 243fe00b2..36c789b52 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -43,7 +43,8 @@ class DashboardController < ActionController::Base
       VAPID_PUBLIC_KEY: VapidService.public_key,
       ENABLE_ACCOUNT_SIGNUP: GlobalConfigService.load('ENABLE_ACCOUNT_SIGNUP', 'false'),
       FB_APP_ID: GlobalConfigService.load('FB_APP_ID', ''),
-      FACEBOOK_API_VERSION: 'v14.0'
+      FACEBOOK_API_VERSION: 'v14.0',
+      IS_ENTERPRISE: ChatwootApp.enterprise?
     }
   end
 end
diff --git a/app/helpers/api/v1/inboxes_helper.rb b/app/helpers/api/v1/inboxes_helper.rb
index 56fb79908..82644e62f 100644
--- a/app/helpers/api/v1/inboxes_helper.rb
+++ b/app/helpers/api/v1/inboxes_helper.rb
@@ -74,4 +74,22 @@ module Api::V1::InboxesHelper
     context.verify_mode = openssl_verify_mode
     context
   end
+
+  def account_channels_method
+    {
+      'web_widget' => Current.account.web_widgets,
+      'api' => Current.account.api_channels,
+      'email' => Current.account.email_channels,
+      'line' => Current.account.line_channels,
+      'telegram' => Current.account.telegram_channels,
+      'whatsapp' => Current.account.whatsapp_channels,
+      'sms' => Current.account.sms_channels
+    }[permitted_params[:channel][:type]]
+  end
+
+  def validate_limit
+    return unless Current.account.inboxes.count >= Current.account.usage_limits[:inboxes]
+
+    render_payment_required('Account limit exceeded. Upgrade to a higher plan')
+  end
 end
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 252a041bc..6bc5603b0 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -421,6 +421,11 @@
       "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."
     },
+    "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",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
index 2b3fa413f..68f5bc5e3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/settingsPage/CollaboratorsPage.vue
@@ -48,20 +48,47 @@
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT_SUB_TEXT') }}
         </p>
       </label>
+
+      <!-- disabling this block temporarily -->
+      <div
+        v-if="enableAutoAssignment && isEnterprise && false"
+        class="max-assignment-container"
+      >
+        <woot-input
+          v-model.trim="maxAssignmentLimit"
+          type="number"
+          :class="{ error: $v.maxAssignmentLimit.$error }"
+          :error="maxAssignmentLimitErrors"
+          :label="$t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT')"
+          @blur="$v.maxAssignmentLimit.$touch"
+        />
+
+        <p class="help-text">
+          {{ $t('INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_SUB_TEXT') }}
+        </p>
+
+        <woot-submit-button
+          :button-text="$t('INBOX_MGMT.SETTINGS_POPUP.UPDATE')"
+          :disabled="$v.maxAssignmentLimit.$invalid"
+          @click="updateInbox"
+        />
+      </div>
     </settings-section>
   </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex';
+import { minValue } from 'vuelidate/lib/validators';
 import alertMixin from 'shared/mixins/alertMixin';
+import configMixin from 'shared/mixins/configMixin';
 import SettingsSection from '../../../../../components/SettingsSection';
 
 export default {
   components: {
     SettingsSection,
   },
-  mixins: [alertMixin],
+  mixins: [alertMixin, configMixin],
   props: {
     inbox: {
       type: Object,
@@ -73,12 +100,21 @@ export default {
       selectedAgents: [],
       isAgentListUpdating: false,
       enableAutoAssignment: false,
+      maxAssignmentLimit: null,
     };
   },
   computed: {
     ...mapGetters({
       agentList: 'agents/getAgents',
     }),
+    maxAssignmentLimitErrors() {
+      if (this.$v.maxAssignmentLimit.$error) {
+        return this.$t(
+          'INBOX_MGMT.AUTO_ASSIGNMENT.MAX_ASSIGNMENT_LIMIT_RANGE_ERROR'
+        );
+      }
+      return '';
+    },
   },
   watch: {
     inbox() {
@@ -91,6 +127,8 @@ export default {
   methods: {
     setDefaults() {
       this.enableAutoAssignment = this.inbox.enable_auto_assignment;
+      this.maxAssignmentLimit =
+        this.inbox.auto_assignment_config.max_assignment_limit || null;
       this.fetchAttachedAgents();
     },
     async fetchAttachedAgents() {
@@ -129,6 +167,9 @@ export default {
           id: this.inbox.id,
           formData: false,
           enable_auto_assignment: this.enableAutoAssignment,
+          auto_assignment_config: {
+            max_assignment_limit: this.maxAssignmentLimit,
+          },
         };
         await this.$store.dispatch('inboxes/updateInbox', payload);
         this.showAlert(this.$t('INBOX_MGMT.EDIT.API.SUCCESS_MESSAGE'));
@@ -143,6 +184,19 @@ export default {
         return !!this.selectedAgents.length;
       },
     },
+    maxAssignmentLimit: {
+      minValue: minValue(1),
+    },
   },
 };
 </script>
+
+<style scoped lang="scss">
+@import '~dashboard/assets/scss/variables';
+@import '~dashboard/assets/scss/mixins';
+
+.max-assignment-container {
+  padding-top: var(--space-slab);
+  padding-bottom: var(--space-slab);
+}
+</style>
diff --git a/app/javascript/shared/mixins/configMixin.js b/app/javascript/shared/mixins/configMixin.js
index acbe98511..7561f08df 100644
--- a/app/javascript/shared/mixins/configMixin.js
+++ b/app/javascript/shared/mixins/configMixin.js
@@ -9,5 +9,8 @@ export default {
     enabledLanguages() {
       return window.chatwootConfig.enabledLanguages;
     },
+    isEnterprise() {
+      return window.chatwootConfig.isEnterprise === 'true';
+    },
   },
 };
diff --git a/app/models/account.rb b/app/models/account.rb
index 7dd1cc229..62af85e86 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -20,7 +20,6 @@ class Account < ApplicationRecord
   include FlagShihTzu
   include Reportable
   include Featurable
-  prepend_mod_with('Account')
 
   DEFAULT_QUERY_SETTING = {
     flag_query_mode: :bit_operator,
@@ -146,3 +145,5 @@ class Account < ApplicationRecord
     ActiveRecord::Base.connection.exec_query("drop sequence IF EXISTS conv_dpid_seq_#{id}")
   end
 end
+
+Account.prepend_mod_with('Account')
diff --git a/app/models/concerns/round_robin_handler.rb b/app/models/concerns/round_robin_handler.rb
index 80865acd7..f543f8e65 100644
--- a/app/models/concerns/round_robin_handler.rb
+++ b/app/models/concerns/round_robin_handler.rb
@@ -14,7 +14,7 @@ module RoundRobinHandler
     return unless conversation_status_changed_to_open?
     return unless should_round_robin?
 
-    ::RoundRobin::AssignmentService.new(conversation: self).perform
+    ::RoundRobin::AssignmentService.new(conversation: self, allowed_member_ids: inbox.member_ids_with_assignment_capacity).perform
   end
 
   def should_round_robin?
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 2801fa834..b58e6870a 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -6,6 +6,7 @@
 #
 #  id                            :integer          not null, primary key
 #  allow_messages_after_resolved :boolean          default(TRUE)
+#  auto_assignment_config        :jsonb
 #  channel_type                  :string
 #  csat_survey_enabled           :boolean          default(FALSE)
 #  email_address                 :string
@@ -35,6 +36,7 @@ class Inbox < ApplicationRecord
   validates :name, presence: true
   validates :account_id, presence: true
   validates :timezone, inclusion: { in: TZInfo::Timezone.all_identifiers }
+  validate :ensure_valid_max_assignment_limit
 
   belongs_to :account
 
@@ -118,9 +120,19 @@ class Inbox < ApplicationRecord
     end
   end
 
+  def member_ids_with_assignment_capacity
+    members.ids
+  end
+
   private
 
+  def ensure_valid_max_assignment_limit
+    # overridden in enterprise/app/models/enterprise/inbox.rb
+  end
+
   def delete_round_robin_agents
     ::RoundRobin::ManageService.new(inbox: self).clear_queue
   end
 end
+
+Inbox.prepend_mod_with('Inbox')
diff --git a/app/services/round_robin/manage_service.rb b/app/services/round_robin/manage_service.rb
index 9b3a60b53..3b5fd1660 100644
--- a/app/services/round_robin/manage_service.rb
+++ b/app/services/round_robin/manage_service.rb
@@ -1,3 +1,6 @@
+# NOTE: available agent method now expect allowed_member_ids to be passed in always because of inbox limits feature
+# need to refactor this class and split the queue managment into a seperate class
+
 # If allowed_member_ids are supplied round robin service will only fetch a member from member id
 # This is used in case of team assignment
 class RoundRobin::ManageService
@@ -18,6 +21,13 @@ class RoundRobin::ManageService
     ::Redis::Alfred.lrem(round_robin_key, user_id)
   end
 
+  def reset_queue
+    clear_queue
+    add_agent_to_queue(inbox.inbox_members.map(&:user_id))
+  end
+
+  # end of queue management functions
+
   def available_agent(priority_list: [])
     reset_queue unless validate_queue?
     user_id = get_member_via_priority_list(priority_list)
@@ -26,29 +36,22 @@ class RoundRobin::ManageService
     inbox.inbox_members.find_by(user_id: user_id)&.user if user_id.present?
   end
 
-  def reset_queue
-    clear_queue
-    add_agent_to_queue(inbox.inbox_members.map(&:user_id))
-  end
-
   private
 
   def fetch_user_id
-    if allowed_member_ids_in_str.present?
-      user_id = queue.intersection(allowed_member_ids_in_str).pop
-      pop_push_to_queue(user_id)
-      user_id
-    else
-      ::Redis::Alfred.rpoplpush(round_robin_key, round_robin_key)
-    end
+    return nil if allowed_member_ids_in_str.blank?
+
+    user_id = queue.intersection(allowed_member_ids_in_str).pop
+    pop_push_to_queue(user_id)
+    user_id
   end
 
-  # priority list is usually the members who are online passed from assignmebt service
+  # priority list is usually the members who are online passed from assignment service
   def get_member_via_priority_list(priority_list)
     return if priority_list.blank?
 
-    # when allowed member ids is passed we will be looking to get members from that list alone
-    priority_list = priority_list.intersection(allowed_member_ids_in_str) if allowed_member_ids_in_str.present?
+    # When allowed member ids is passed we will be looking to get members from that list alone
+    priority_list = priority_list.intersection(allowed_member_ids_in_str)
     return if priority_list.blank?
 
     user_id = queue.intersection(priority_list.map(&:to_s)).pop
diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder
index 18b737da3..b91b04549 100644
--- a/app/views/api/v1/models/_inbox.json.jbuilder
+++ b/app/views/api/v1/models/_inbox.json.jbuilder
@@ -9,6 +9,7 @@ json.working_hours_enabled resource.working_hours_enabled
 json.enable_email_collect resource.enable_email_collect
 json.csat_survey_enabled resource.csat_survey_enabled
 json.enable_auto_assignment resource.enable_auto_assignment
+json.auto_assignment_config resource.auto_assignment_config
 json.out_of_office_message resource.out_of_office_message
 json.working_hours resource.weekly_schedule
 json.timezone resource.timezone
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index 3f91ac042..ae7393ee6 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -36,6 +36,7 @@
         fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>',
         fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>',
         signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>',
+        isEnterprise: '<%= @global_config['IS_ENTERPRISE'] %>',
         <% if @global_config['VAPID_PUBLIC_KEY'] %>
         vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>),
         <% end %>
diff --git a/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb b/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb
new file mode 100644
index 000000000..31e324ce9
--- /dev/null
+++ b/db/migrate/20220527040433_add_auto_assignment_configuration_to_inboxes.rb
@@ -0,0 +1,5 @@
+class AddAutoAssignmentConfigurationToInboxes < ActiveRecord::Migration[6.1]
+  def change
+    add_column :inboxes, :auto_assignment_config, :jsonb, default: {}
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6f1ffe408..6ab2179d3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -513,6 +513,7 @@ ActiveRecord::Schema.define(version: 2022_06_10_091206) do
     t.boolean "enable_email_collect", default: true
     t.boolean "csat_survey_enabled", default: false
     t.boolean "allow_messages_after_resolved", default: true
+    t.jsonb "auto_assignment_config", default: {}
     t.index ["account_id"], name: "index_inboxes_on_account_id"
   end
 
diff --git a/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
new file mode 100644
index 000000000..b39db609d
--- /dev/null
+++ b/enterprise/app/controllers/enterprise/api/v1/accounts/inboxes_controller.rb
@@ -0,0 +1,9 @@
+module Enterprise::Api::V1::Accounts::InboxesController
+  def inbox_attributes
+    super + ee_inbox_attributes
+  end
+
+  def ee_inbox_attributes
+    [auto_assignment_config: [:max_assignment_limit]]
+  end
+end
diff --git a/enterprise/app/models/enterprise/inbox.rb b/enterprise/app/models/enterprise/inbox.rb
new file mode 100644
index 000000000..6fe3ff2f2
--- /dev/null
+++ b/enterprise/app/models/enterprise/inbox.rb
@@ -0,0 +1,20 @@
+module Enterprise::Inbox
+  def member_ids_with_assignment_capacity
+    max_assignment_limit = auto_assignment_config['max_assignment_limit']
+    overloaded_agent_ids = max_assignment_limit.present? ? get_agent_ids_over_assignment_limit(max_assignment_limit) : []
+    super - overloaded_agent_ids
+  end
+
+  private
+
+  def get_agent_ids_over_assignment_limit(limit)
+    conversations.open.select(:assignee_id).group(:assignee_id).having("count(*) >= #{limit.to_i}").filter_map(&:assignee_id)
+  end
+
+  def ensure_valid_max_assignment_limit
+    return if auto_assignment_config['max_assignment_limit'].blank?
+    return if auto_assignment_config['max_assignment_limit'].to_i.positive?
+
+    errors.add(:auto_assignment_config, 'max_assignment_limit must be greater than 0')
+  end
+end
diff --git a/spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb b/spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb
new file mode 100644
index 000000000..724a7b0cb
--- /dev/null
+++ b/spec/enterprise/controllers/api/v1/accounts/inboxes_controller_spec.rb
@@ -0,0 +1,46 @@
+require 'rails_helper'
+
+RSpec.describe 'Enterprise Inboxes API', type: :request do
+  let(:account) { create(:account) }
+  let(:admin) { create(:user, account: account, role: :administrator) }
+
+  describe 'POST /api/v1/accounts/{account.id}/inboxes' do
+    let(:inbox) { create(:inbox, account: account) }
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+      let(:valid_params) do
+        { name: 'test', auto_assignment_config: { max_assignment_limit: 10 }, channel: { type: 'web_widget', website_url: 'test.com' } }
+      end
+
+      it 'creates a webwidget inbox with auto assignment config' do
+        post "/api/v1/accounts/#{account.id}/inboxes",
+             headers: admin.create_new_auth_token,
+             params: valid_params,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body)['auto_assignment_config']['max_assignment_limit']).to eq 10
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/inboxes/:id' do
+    let(:inbox) { create(:inbox, account: account, auto_assignment_config: { max_assignment_limit: 5 }) }
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+      let(:valid_params) { { name: 'new test inbox', auto_assignment_config: { max_assignment_limit: 10 } } }
+
+      it 'updates inbox with auto assignment config' do
+        patch "/api/v1/accounts/#{account.id}/inboxes/#{inbox.id}",
+              headers: admin.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(JSON.parse(response.body)['auto_assignment_config']['max_assignment_limit']).to eq 10
+      end
+    end
+  end
+end
diff --git a/spec/enterprise/models/inbox_spec.rb b/spec/enterprise/models/inbox_spec.rb
new file mode 100644
index 000000000..26dbcef16
--- /dev/null
+++ b/spec/enterprise/models/inbox_spec.rb
@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Inbox do
+  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) }
+    let!(:inbox_member_4) { create(:inbox_member, inbox: inbox) }
+
+    before do
+      create(:conversation, inbox: inbox, assignee: inbox_member_1.user)
+      # to test conversations in other inboxes won't impact
+      create_list(:conversation, 3, assignee: inbox_member_1.user)
+      create_list(:conversation, 2, inbox: inbox, assignee: inbox_member_2.user)
+      create_list(:conversation, 3, inbox: inbox, assignee: inbox_member_3.user)
+    end
+
+    it 'validated max_assignment_limit' do
+      account = create(:account)
+      expect(build(:inbox, account: account, auto_assignment_config: { max_assignment_limit: 0 })).not_to be_valid
+      expect(build(:inbox, account: account, auto_assignment_config: {})).to be_valid
+      expect(build(:inbox, account: account, auto_assignment_config: { max_assignment_limit: 1 })).to be_valid
+    end
+
+    it 'returns member ids with assignment capacity with inbox max_assignment_limit is configured' do
+      # agent 1 has 1 conversations, agent 2 has 2 conversations, agent 3 has 3 conversations and agent 4 with none
+      inbox.update(auto_assignment_config: { max_assignment_limit: 2 })
+      expect(inbox.member_ids_with_assignment_capacity).to contain_exactly(inbox_member_1.user_id, inbox_member_4.user_id)
+    end
+
+    it 'returns all member ids when inbox max_assignment_limit is not configured' do
+      expect(inbox.member_ids_with_assignment_capacity).to eq(inbox.members.ids)
+    end
+  end
+end
diff --git a/spec/services/round_robin/manage_service_spec.rb b/spec/services/round_robin/manage_service_spec.rb
index 75110d325..84cca45d1 100644
--- a/spec/services/round_robin/manage_service_spec.rb
+++ b/spec/services/round_robin/manage_service_spec.rb
@@ -8,10 +8,14 @@ describe RoundRobin::ManageService do
   let!(:inbox_members) { create_list(:inbox_member, 5, inbox: inbox) }
 
   describe '#available_agent' do
-    it 'gets the first available agent and move agent to end of the list' do
+    it 'returns nil if allowed_member_ids is empty' do
+      expect(described_class.new(inbox: inbox, allowed_member_ids: []).available_agent).to eq nil
+    end
+
+    it 'gets the first available agent in allowed_member_ids and move agent to end of the list' do
       expected_queue = [inbox_members[0].user_id, inbox_members[4].user_id, inbox_members[3].user_id, inbox_members[2].user_id,
                         inbox_members[1].user_id].map(&:to_s)
-      round_robin_manage_service.available_agent
+      described_class.new(inbox: inbox, allowed_member_ids: [inbox_members[0].user_id, inbox_members[4].user_id]).available_agent
       expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
     end
 
@@ -19,8 +23,8 @@ describe RoundRobin::ManageService do
       expected_queue = [inbox_members[2].user_id, inbox_members[4].user_id, inbox_members[3].user_id, inbox_members[1].user_id,
                         inbox_members[0].user_id].map(&:to_s)
       # prority list will be ids in string, since thats what redis supplies to us
-      expect(round_robin_manage_service.available_agent(priority_list: [inbox_members[3].user_id.to_s,
-                                                                        inbox_members[2].user_id.to_s])).to eq inbox_members[2].user
+      expect(described_class.new(inbox: inbox, allowed_member_ids: [inbox_members[2].user_id])
+        .available_agent(priority_list: [inbox_members[3].user_id.to_s, inbox_members[2].user_id.to_s])).to eq inbox_members[2].user
       expect(round_robin_manage_service.send(:queue)).to eq(expected_queue)
     end
 

From 37cb46238af99b78ba44093e0e41ff453d496cb9 Mon Sep 17 00:00:00 2001
From: Tejaswini Chile <tejaswini@chatwoot.com>
Date: Tue, 14 Jun 2022 10:35:56 +0530
Subject: [PATCH 164/177] chore: Add documentation for automation rule, fix
 conversation/inbox_members (#4852)

---
 swagger/definitions/index.yml                 |   6 +
 .../automation_rule/create_update_payload.yml |  41 ++
 .../definitions/resource/automation_rule.yml  |  45 ++
 swagger/definitions/resource/contact.yml      |   4 +
 swagger/definitions/resource/conversation.yml |   4 +
 swagger/index.yml                             |   1 +
 .../application/automation_rule/create.yml    |  20 +
 .../application/automation_rule/delete.yml    |  20 +
 .../application/automation_rule/index.yml     |  20 +
 .../application/automation_rule/show.yml      |  20 +
 .../application/automation_rule/update.yml    |  27 +
 .../paths/application/conversation/index.yml  |   6 +-
 .../application/custom_attributes/delete.yml  |   1 +
 .../application/custom_attributes/show.yml    |   7 +
 .../paths/application/team_members/index.yml  |   1 +
 swagger/paths/index.yml                       |  35 +-
 swagger/swagger.json                          | 506 +++++++++++++++---
 17 files changed, 695 insertions(+), 69 deletions(-)
 create mode 100644 swagger/definitions/request/automation_rule/create_update_payload.yml
 create mode 100644 swagger/definitions/resource/automation_rule.yml
 create mode 100644 swagger/paths/application/automation_rule/create.yml
 create mode 100644 swagger/paths/application/automation_rule/delete.yml
 create mode 100644 swagger/paths/application/automation_rule/index.yml
 create mode 100644 swagger/paths/application/automation_rule/show.yml
 create mode 100644 swagger/paths/application/automation_rule/update.yml

diff --git a/swagger/definitions/index.yml b/swagger/definitions/index.yml
index 5e22a7099..5e4e50b04 100644
--- a/swagger/definitions/index.yml
+++ b/swagger/definitions/index.yml
@@ -16,6 +16,8 @@ canned_response:
   $ref: ./resource/canned_response.yml
 custom_attribute:
   $ref: ./resource/custom_attribute.yml
+automation_rule:
+  $ref: ./resource/automation_rule.yml
 contact:
   $ref: ./resource/contact.yml
 conversation:
@@ -102,6 +104,10 @@ integrations_hook_create_payload:
 integrations_hook_update_payload:
   $ref: ./request/integrations/hook_update_payload.yml
 
+# Automation Rule
+automation_rule_create_update_payload:
+  $ref: ./request/automation_rule/create_update_payload.yml
+
 
 ## public requests
 public_contact_create_update_payload:
diff --git a/swagger/definitions/request/automation_rule/create_update_payload.yml b/swagger/definitions/request/automation_rule/create_update_payload.yml
new file mode 100644
index 000000000..20d362e48
--- /dev/null
+++ b/swagger/definitions/request/automation_rule/create_update_payload.yml
@@ -0,0 +1,41 @@
+type: object
+properties:
+  name:
+    type: string
+    description: Rule name
+    example: Add label on message create event
+  description:
+    type: string
+    description: The description about the automation and actions
+    example: Add label support and sales on message create event if incoming message content contains text help
+  event_name:
+    type: string
+    enum:
+      - conversation_created
+      - conversation_updated
+      - message_created
+    example: message_created
+    description: The event when you want to execute the automation actions
+  active:
+    type: boolean
+    description: Enable/disable automation rule
+  actions:
+    type: array
+    description: Array of actions which you want to perform when condition matches, e.g add label support if message contains content help.
+    items:
+      type: object
+      example:
+        action_name: add_label
+        action_params:
+          - support
+  conditions:
+    type: array
+    description: Array of conditions on which conversation filter would work, e.g message content contains text help.
+    items:
+      type: object
+      example:
+        attribute_key: content
+        filter_operator: contains
+        query_operator: nil
+        values:
+          - help
diff --git a/swagger/definitions/resource/automation_rule.yml b/swagger/definitions/resource/automation_rule.yml
new file mode 100644
index 000000000..4a3a03d01
--- /dev/null
+++ b/swagger/definitions/resource/automation_rule.yml
@@ -0,0 +1,45 @@
+type: object
+properties:
+  event_name:
+    type: string
+    description: Automation Rule event, on which we call the actions(conversation_created, conversation_updated, message_created)
+    enum:
+      - conversation_created
+      - conversation_updated
+      - message_created
+    example: message_created
+  name:
+    type: string
+    description: The name of the rule
+    example: Add label on message create event
+  description:
+    type: string
+    description: Description to give more context about the rule
+    example: Add label support and sales on message create event if incoming message content contains text help
+  active:
+    type: boolean
+    description: Enable/disable automation rule
+  actions:
+    type: array
+    description: Array of actions which we perform when condition matches
+    items:
+      type: object
+      example:
+        action_name: add_label
+        action_params:
+          - support
+          - sales
+  conditions:
+    type: array
+    description: Array of conditions on which conversation/message filter would work
+    items:
+      type: object
+      example:
+        attribute_key: content
+        filter_operator: contains
+        values:
+          - help
+        query_operator: nil
+  account_id:
+    type: integer
+    description: Account Id
diff --git a/swagger/definitions/resource/contact.yml b/swagger/definitions/resource/contact.yml
index e2462c08b..2e72a9834 100644
--- a/swagger/definitions/resource/contact.yml
+++ b/swagger/definitions/resource/contact.yml
@@ -15,6 +15,10 @@ properties:
   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:
diff --git a/swagger/definitions/resource/conversation.yml b/swagger/definitions/resource/conversation.yml
index 24c27f681..085d21879 100644
--- a/swagger/definitions/resource/conversation.yml
+++ b/swagger/definitions/resource/conversation.yml
@@ -30,3 +30,7 @@ properties:
   additional_attributes:
     type: object
     description: The object containing additional attributes related to the conversation
+  custom_attributes:
+    type: object
+    description: The object to save custom attributes for conversation, accepts custom attributes key and value
+    example: { attribute_key: attribute_value, priority_conversation_number: 3 }
diff --git a/swagger/index.yml b/swagger/index.yml
index f64a090e7..3dc245ddf 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -68,6 +68,7 @@ x-tagGroups:
       - Reports
       - Teams
       - Webhooks
+      - Automation Rule
   - name: Client
     tags:
       - Contacts API
diff --git a/swagger/paths/application/automation_rule/create.yml b/swagger/paths/application/automation_rule/create.yml
new file mode 100644
index 000000000..ac5de803a
--- /dev/null
+++ b/swagger/paths/application/automation_rule/create.yml
@@ -0,0 +1,20 @@
+tags:
+  - Automation Rule
+operationId: add-new-automation-rule-to-account
+summary: Add a new automation rule
+description: Add a new automation rule to account
+security:
+  - userApiKey: []
+parameters:
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/automation_rule_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/automation_rule'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/automation_rule/delete.yml b/swagger/paths/application/automation_rule/delete.yml
new file mode 100644
index 000000000..f82647d1d
--- /dev/null
+++ b/swagger/paths/application/automation_rule/delete.yml
@@ -0,0 +1,20 @@
+tags:
+  - Automation Rule
+operationId: delete-automation-rule-from-account
+summary: Remove a automation rule from account
+description: Remove a automation rule from account
+security:
+  - userApiKey: []
+parameters:
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the automation rule to be deleted
+responses:
+  '200':
+    description: Success
+  '403':
+    description: Access denied
+  '404':
+    description: automation rule not found
diff --git a/swagger/paths/application/automation_rule/index.yml b/swagger/paths/application/automation_rule/index.yml
new file mode 100644
index 000000000..031696aeb
--- /dev/null
+++ b/swagger/paths/application/automation_rule/index.yml
@@ -0,0 +1,20 @@
+tags:
+  - Automation Rule
+operationId: get-account-automation-rule
+summary: List all automation rules in an account
+parameters:
+  - $ref: '#/parameters/account_id'
+  - $ref: '#/parameters/page'
+description: Get details of automation rules in an Account
+security:
+  - userApiKey: []
+responses:
+  '200':
+    description: Success
+    schema:
+      type: array
+      description: Array of all automation rules
+      items:
+        $ref: '#/definitions/automation_rule'
+  '403':
+    description: Access denied
diff --git a/swagger/paths/application/automation_rule/show.yml b/swagger/paths/application/automation_rule/show.yml
new file mode 100644
index 000000000..d99f8170b
--- /dev/null
+++ b/swagger/paths/application/automation_rule/show.yml
@@ -0,0 +1,20 @@
+tags:
+  - Automation Rule
+operationId: get-details-of-a-single-automation-rule
+summary: Get a automation rule details
+description: Get the details of a automation rule in the account
+parameters:
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the automation rule to be updated.
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/automation_rule'
+  '401':
+    description: Unauthorized
+  '404':
+    description: The given rule ID does not exist in the account
diff --git a/swagger/paths/application/automation_rule/update.yml b/swagger/paths/application/automation_rule/update.yml
new file mode 100644
index 000000000..35a4cb67a
--- /dev/null
+++ b/swagger/paths/application/automation_rule/update.yml
@@ -0,0 +1,27 @@
+tags:
+  - Automation Rule
+operationId: update-automation-rule-in-account
+summary: Update automation rule in Account
+description: Update a automation rule in account
+security:
+  - userApiKey: []
+parameters:
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the automation rule to be updated.
+  - name: data
+    in: body
+    required: true
+    schema:
+      $ref: '#/definitions/automation_rule_create_update_payload'
+responses:
+  '200':
+    description: Success
+    schema:
+      $ref: '#/definitions/automation_rule'
+  '403':
+    description: Access denied
+  '404':
+    description: Rule not found
diff --git a/swagger/paths/application/conversation/index.yml b/swagger/paths/application/conversation/index.yml
index 54650f4d2..4c9241464 100644
--- a/swagger/paths/application/conversation/index.yml
+++ b/swagger/paths/application/conversation/index.yml
@@ -40,7 +40,7 @@ get:
       type: integer
       default: 1
       description: paginate through conversations
-   
+
   responses:
     200:
       description: Success
@@ -79,6 +79,10 @@ post:
           additional_attributes:
             type: object
             description: Lets you specify attributes like browser information
+          custom_attributes:
+            type: object
+            description: The object to save custom attributes for conversation, accepts custom attributes key and value
+            example: { attribute_key: attribute_value, priority_conversation_number: 3 }
           status:
             type: string
             enum: ['open', 'resolved', 'pending']
diff --git a/swagger/paths/application/custom_attributes/delete.yml b/swagger/paths/application/custom_attributes/delete.yml
index cfdb68adc..0c9aaedee 100644
--- a/swagger/paths/application/custom_attributes/delete.yml
+++ b/swagger/paths/application/custom_attributes/delete.yml
@@ -6,6 +6,7 @@ description: Remove a custom attribute from account
 security:
   - userApiKey: []
 parameters:
+  - $ref: '#/parameters/account_id'
   - in: path
     name: id
     type: integer
diff --git a/swagger/paths/application/custom_attributes/show.yml b/swagger/paths/application/custom_attributes/show.yml
index 4e6f61e49..8449ba9be 100644
--- a/swagger/paths/application/custom_attributes/show.yml
+++ b/swagger/paths/application/custom_attributes/show.yml
@@ -3,6 +3,13 @@ tags:
 operationId: get-details-of-a-single-custom-attribute
 summary: Get a custom attribute details
 description: Get the details of a custom attribute in the account
+parameters:
+  - $ref: '#/parameters/account_id'
+  - in: path
+    name: id
+    type: integer
+    required: true
+    description: The ID of the custom attribute to be updated.
 responses:
   200:
     description: Success
diff --git a/swagger/paths/application/team_members/index.yml b/swagger/paths/application/team_members/index.yml
index dc28f2e99..c57705223 100644
--- a/swagger/paths/application/team_members/index.yml
+++ b/swagger/paths/application/team_members/index.yml
@@ -6,6 +6,7 @@ description: Get Details of Agents in an Team
 security:
   - userApiKey: []
 parameters:
+  - $ref: '#/parameters/account_id'
   - $ref: '#/parameters/team_id'
 responses:
   200:
diff --git a/swagger/paths/index.yml b/swagger/paths/index.yml
index 084065a9a..a7b853cb8 100644
--- a/swagger/paths/index.yml
+++ b/swagger/paths/index.yml
@@ -181,6 +181,11 @@
 /api/v1/accounts/{account_id}/custom_attribute_definitions/{id}:
   parameters:
     - $ref: '#/parameters/account_id'
+    - name: id
+      in: path
+      type: number
+      description: ID of the custom attribute
+      required: true
   get:
     $ref: './application/custom_attributes/show.yml'
   patch:
@@ -208,6 +213,30 @@
   $ref: ./application/contactable_inboxes/get.yml
 
 
+# Automation Rule
+/api/v1/accounts/{account_id}/automation_rule_definitions:
+  parameters:
+    - $ref: '#/parameters/account_id'
+  get:
+    $ref: ./application/automation_rule/index.yml
+  post:
+    $ref: ./application/automation_rule/create.yml
+/api/v1/accounts/{account_id}/automation_rule_definitions/{id}:
+  parameters:
+    - $ref: '#/parameters/account_id'
+    - name: id
+      in: path
+      type: number
+      description: ID of the Automation Rule
+      required: true
+  get:
+    $ref: ./application/automation_rule/show.yml
+  patch:
+    $ref: ./application/automation_rule/update.yml
+  delete:
+    $ref: ./application/automation_rule/delete.yml
+
+
 # Conversations
 /api/v1/accounts/{account_id}/conversations/meta:
   $ref: ./application/conversation/meta.yml
@@ -273,8 +302,6 @@
     - $ref: '#/parameters/inbox_id'
   get:
     $ref: ./application/inboxes/inbox_members/show.yml
-  patch:
-    $ref: ./application/inboxes/inbox_members/update.yml
   delete:
     $ref: ./application/inboxes/inbox_members/delete.yml
 
@@ -283,6 +310,8 @@
     - $ref: '#/parameters/account_id'
   post:
     $ref: ./application/inboxes/inbox_members/create.yml
+  patch:
+    $ref: ./application/inboxes/inbox_members/update.yml
 
 
 
@@ -345,7 +374,7 @@
     $ref: ./application/teams/update.yml
   delete:
     $ref: ./application/teams/delete.yml
-/accounts/{account-id}/teams/{team_id}/team_members:
+/accounts/{account_id}/teams/{team_id}/team_members:
   parameters:
     - $ref: '#/parameters/account_id'
     - $ref: '#/parameters/team_id'
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 9103fe13e..483aa3402 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -1584,6 +1584,13 @@
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
+        },
+        {
+          "name": "id",
+          "in": "path",
+          "type": "number",
+          "description": "ID of the custom attribute",
+          "required": true
         }
       ],
       "get": {
@@ -1593,6 +1600,18 @@
         "operationId": "get-details-of-a-single-custom-attribute",
         "summary": "Get a custom attribute details",
         "description": "Get the details of a custom attribute in the account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the custom attribute to be updated."
+          }
+        ],
         "responses": {
           "200": {
             "description": "Success",
@@ -1669,6 +1688,9 @@
           }
         ],
         "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
           {
             "in": "path",
             "name": "id",
@@ -2135,6 +2157,213 @@
         }
       }
     },
+    "/api/v1/accounts/{account_id}/automation_rule_definitions": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        }
+      ],
+      "get": {
+        "tags": [
+          "Automation Rule"
+        ],
+        "operationId": "get-account-automation-rule",
+        "summary": "List all automation rules in an account",
+        "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
+          {
+            "$ref": "#/parameters/page"
+          }
+        ],
+        "description": "Get details of automation rules in an Account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all automation rules",
+              "items": {
+                "$ref": "#/definitions/automation_rule"
+              }
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "Automation Rule"
+        ],
+        "operationId": "add-new-automation-rule-to-account",
+        "summary": "Add a new automation rule",
+        "description": "Add a new automation rule to account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/automation_rule_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/automation_rule"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          }
+        }
+      }
+    },
+    "/api/v1/accounts/{account_id}/automation_rule_definitions/{id}": {
+      "parameters": [
+        {
+          "$ref": "#/parameters/account_id"
+        },
+        {
+          "name": "id",
+          "in": "path",
+          "type": "number",
+          "description": "ID of the Automation Rule",
+          "required": true
+        }
+      ],
+      "get": {
+        "tags": [
+          "Automation Rule"
+        ],
+        "operationId": "get-details-of-a-single-automation-rule",
+        "summary": "Get a automation rule details",
+        "description": "Get the details of a automation rule in the account",
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the automation rule to be updated."
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/automation_rule"
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "The given rule ID does not exist in the account"
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "Automation Rule"
+        ],
+        "operationId": "update-automation-rule-in-account",
+        "summary": "Update automation rule in Account",
+        "description": "Update a automation rule in account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the automation rule to be updated."
+          },
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/automation_rule_create_update_payload"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "$ref": "#/definitions/automation_rule"
+            }
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "404": {
+            "description": "Rule not found"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "Automation Rule"
+        ],
+        "operationId": "delete-automation-rule-from-account",
+        "summary": "Remove a automation rule from account",
+        "description": "Remove a automation rule from account",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "in": "path",
+            "name": "id",
+            "type": "integer",
+            "required": true,
+            "description": "The ID of the automation rule to be deleted"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "404": {
+            "description": "automation rule not found"
+          }
+        }
+      }
+    },
     "/api/v1/accounts/{account_id}/conversations/meta": {
       "parameters": [
         {
@@ -2352,6 +2581,14 @@
                   "type": "object",
                   "description": "Lets you specify attributes like browser information"
                 },
+                "custom_attributes": {
+                  "type": "object",
+                  "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
+                  "example": {
+                    "attribute_key": "attribute_value",
+                    "priority_conversation_number": 3
+                  }
+                },
                 "status": {
                   "type": "string",
                   "enum": [
@@ -3101,69 +3338,6 @@
           }
         }
       },
-      "patch": {
-        "tags": [
-          "Inboxes"
-        ],
-        "operationId": "update-agents-in-inbox",
-        "summary": "Update Agents in Inbox",
-        "description": "All agents except the one passed in params will be removed",
-        "security": [
-          {
-            "userApiKey": [
-
-            ]
-          }
-        ],
-        "parameters": [
-          {
-            "name": "data",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "required": [
-                "inbox_id",
-                "user_ids"
-              ],
-              "properties": {
-                "inbox_id": {
-                  "type": "string",
-                  "description": "The ID of the inbox"
-                },
-                "user_ids": {
-                  "type": "array",
-                  "items": {
-                    "type": "integer"
-                  },
-                  "description": "IDs of users to be added to the inbox"
-                }
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Success",
-            "schema": {
-              "type": "array",
-              "description": "Array of all active agents",
-              "items": {
-                "$ref": "#/definitions/agent"
-              }
-            }
-          },
-          "404": {
-            "description": "Inbox not found"
-          },
-          "403": {
-            "description": "Access denied"
-          },
-          "422": {
-            "description": "User must exist"
-          }
-        }
-      },
       "delete": {
         "tags": [
           "Inboxes"
@@ -3289,6 +3463,69 @@
             "description": "User must exist"
           }
         }
+      },
+      "patch": {
+        "tags": [
+          "Inboxes"
+        ],
+        "operationId": "update-agents-in-inbox",
+        "summary": "Update Agents in Inbox",
+        "description": "All agents except the one passed in params will be removed",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          }
+        ],
+        "parameters": [
+          {
+            "name": "data",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "type": "object",
+              "required": [
+                "inbox_id",
+                "user_ids"
+              ],
+              "properties": {
+                "inbox_id": {
+                  "type": "string",
+                  "description": "The ID of the inbox"
+                },
+                "user_ids": {
+                  "type": "array",
+                  "items": {
+                    "type": "integer"
+                  },
+                  "description": "IDs of users to be added to the inbox"
+                }
+              }
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Success",
+            "schema": {
+              "type": "array",
+              "description": "Array of all active agents",
+              "items": {
+                "$ref": "#/definitions/agent"
+              }
+            }
+          },
+          "404": {
+            "description": "Inbox not found"
+          },
+          "403": {
+            "description": "Access denied"
+          },
+          "422": {
+            "description": "User must exist"
+          }
+        }
       }
     },
     "/api/v1/accounts/{account_id}/conversations/{conversation_id}/messages": {
@@ -3711,7 +3948,7 @@
         }
       }
     },
-    "/accounts/{account-id}/teams/{team_id}/team_members": {
+    "/accounts/{account_id}/teams/{team_id}/team_members": {
       "parameters": [
         {
           "$ref": "#/parameters/account_id"
@@ -3735,6 +3972,9 @@
           }
         ],
         "parameters": [
+          {
+            "$ref": "#/parameters/account_id"
+          },
           {
             "$ref": "#/parameters/team_id"
           }
@@ -4520,6 +4760,68 @@
         }
       }
     },
+    "automation_rule": {
+      "type": "object",
+      "properties": {
+        "event_name": {
+          "type": "string",
+          "description": "Automation Rule event, on which we call the actions(conversation_created, conversation_updated, message_created)",
+          "enum": [
+            "conversation_created",
+            "conversation_updated",
+            "message_created"
+          ],
+          "example": "message_created"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the rule",
+          "example": "Add label on message create event"
+        },
+        "description": {
+          "type": "string",
+          "description": "Description to give more context about the rule",
+          "example": "Add label support and sales on message create event if incoming message content contains text help"
+        },
+        "active": {
+          "type": "boolean",
+          "description": "Enable/disable automation rule"
+        },
+        "actions": {
+          "type": "array",
+          "description": "Array of actions which we perform when condition matches",
+          "items": {
+            "type": "object",
+            "example": {
+              "action_name": "add_label",
+              "action_params": [
+                "support",
+                "sales"
+              ]
+            }
+          }
+        },
+        "conditions": {
+          "type": "array",
+          "description": "Array of conditions on which conversation/message filter would work",
+          "items": {
+            "type": "object",
+            "example": {
+              "attribute_key": "content",
+              "filter_operator": "contains",
+              "values": [
+                "help"
+              ],
+              "query_operator": "nil"
+            }
+          }
+        },
+        "account_id": {
+          "type": "integer",
+          "description": "Account Id"
+        }
+      }
+    },
     "contact": {
       "type": "object",
       "properties": {
@@ -4543,6 +4845,14 @@
           "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": {
@@ -4598,6 +4908,14 @@
         "additional_attributes": {
           "type": "object",
           "description": "The object containing additional attributes related to the conversation"
+        },
+        "custom_attributes": {
+          "type": "object",
+          "description": "The object to save custom attributes for conversation, accepts custom attributes key and value",
+          "example": {
+            "attribute_key": "attribute_value",
+            "priority_conversation_number": 3
+          }
         }
       }
     },
@@ -5428,6 +5746,63 @@
         }
       }
     },
+    "automation_rule_create_update_payload": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "Rule name",
+          "example": "Add label on message create event"
+        },
+        "description": {
+          "type": "string",
+          "description": "The description about the automation and actions",
+          "example": "Add label support and sales on message create event if incoming message content contains text help"
+        },
+        "event_name": {
+          "type": "string",
+          "enum": [
+            "conversation_created",
+            "conversation_updated",
+            "message_created"
+          ],
+          "example": "message_created",
+          "description": "The event when you want to execute the automation actions"
+        },
+        "active": {
+          "type": "boolean",
+          "description": "Enable/disable automation rule"
+        },
+        "actions": {
+          "type": "array",
+          "description": "Array of actions which you want to perform when condition matches, e.g add label support if message contains content help.",
+          "items": {
+            "type": "object",
+            "example": {
+              "action_name": "add_label",
+              "action_params": [
+                "support"
+              ]
+            }
+          }
+        },
+        "conditions": {
+          "type": "array",
+          "description": "Array of conditions on which conversation filter would work, e.g message content contains text help.",
+          "items": {
+            "type": "object",
+            "example": {
+              "attribute_key": "content",
+              "filter_operator": "contains",
+              "query_operator": "nil",
+              "values": [
+                "help"
+              ]
+            }
+          }
+        }
+      }
+    },
     "public_contact_create_update_payload": {
       "type": "object",
       "properties": {
@@ -6016,7 +6391,8 @@
         "Profile",
         "Reports",
         "Teams",
-        "Webhooks"
+        "Webhooks",
+        "Automation Rule"
       ]
     },
     {

From f0db8545cbd80f522ef7ba7f25ed9d29a63344f0 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 14 Jun 2022 10:55:16 +0530
Subject: [PATCH 165/177] fix: Update profile settings header title (#4856)

---
 .../routes/dashboard/settings/profile/profile.routes.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js b/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
index 032b13d6e..7a667f2ec 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/profile.routes.js
@@ -10,7 +10,7 @@ export default {
       roles: ['administrator', 'agent'],
       component: SettingsContent,
       props: {
-        headerTitle: 'GENERAL_SETTINGS.TITLE',
+        headerTitle: 'PROFILE_SETTINGS.TITLE',
         icon: 'edit',
         showNewButton: false,
       },

From 1bb0371c1d6b93ec3a33270c94b0e106cf27e206 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@chatwoot.com>
Date: Tue, 14 Jun 2022 18:05:37 +0530
Subject: [PATCH 166/177] feat: Add agent_reply_time_window in API channels
 (#4857)

---
 .../widgets/WootWriter/ReplyBottomPanel.vue   |  5 +-
 .../widgets/conversation/MessagesView.vue     | 58 +++++++++++++------
 app/models/channel/api.rb                     | 14 +++++
 app/models/channel/facebook_page.rb           |  2 +-
 app/models/channel/twilio_sms.rb              |  2 +-
 app/models/channel/whatsapp.rb                |  2 +-
 app/models/concerns/channelable.rb            |  2 +-
 app/models/conversation.rb                    | 15 ++---
 spec/models/channel/twilio_sms_spec.rb        |  4 +-
 spec/models/conversation_spec.rb              | 48 +++++++++++++++
 10 files changed, 116 insertions(+), 36 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
index e7a0b5995..636601dcb 100644
--- a/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
+++ b/app/javascript/dashboard/components/widgets/WootWriter/ReplyBottomPanel.vue
@@ -80,7 +80,7 @@
         @click="toggleMessageSignature"
       />
       <woot-button
-        v-if="showWhatsappTemplatesButton"
+        v-if="hasWhatsappTemplates"
         v-tooltip.top-end="'Whatsapp Templates'"
         icon="whatsapp"
         color-scheme="secondary"
@@ -275,9 +275,6 @@ export default {
     showMessageSignatureButton() {
       return !this.isPrivate && this.isAnEmailChannel;
     },
-    showWhatsappTemplatesButton() {
-      return !this.isOnPrivateNote && this.hasWhatsappTemplates;
-    },
     sendWithSignature() {
       const { send_with_signature: isEnabled } = this.uiSettings;
       return isEnabled;
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index e291ecffe..0b5aba1e2 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -1,19 +1,11 @@
 <template>
   <div class="view-box fill-height">
     <banner
-      v-if="!currentChat.can_reply && !isAWhatsappChannel"
+      v-if="!currentChat.can_reply"
       color-scheme="alert"
-      :banner-message="$t('CONVERSATION.CANNOT_REPLY')"
-      :href-link="facebookReplyPolicy"
-      :href-link-text="$t('CONVERSATION.24_HOURS_WINDOW')"
-    />
-
-    <banner
-      v-if="!currentChat.can_reply && isAWhatsappChannel"
-      color-scheme="alert"
-      :banner-message="$t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY')"
-      :href-link="twilioWhatsAppReplyPolicy"
-      :href-link-text="$t('CONVERSATION.TWILIO_WHATSAPP_24_HOURS_WINDOW')"
+      :banner-message="replyWindowBannerMessage"
+      :href-link="replyWindowLink"
+      :href-link-text="replyWindowLinkText"
     />
 
     <banner
@@ -159,7 +151,6 @@ export default {
     hasSelectedTweetId() {
       return !!this.selectedTweetId;
     },
-
     tweetBannerText() {
       return !this.selectedTweetId
         ? this.$t('CONVERSATION.SELECT_A_TWEET_TO_REPLY')
@@ -237,12 +228,6 @@ export default {
       }
       return '';
     },
-    facebookReplyPolicy() {
-      return REPLY_POLICY.FACEBOOK;
-    },
-    twilioWhatsAppReplyPolicy() {
-      return REPLY_POLICY.TWILIO_WHATSAPP;
-    },
     isRightOrLeftIcon() {
       if (this.isContactPanelOpen) {
         return 'arrow-chevron-right';
@@ -254,6 +239,41 @@ export default {
       const { contact_last_seen_at: contactLastSeenAt } = this.currentChat;
       return contactLastSeenAt;
     },
+
+    replyWindowBannerMessage() {
+      if (this.isAWhatsappChannel) {
+        return this.$t('CONVERSATION.TWILIO_WHATSAPP_CAN_REPLY');
+      }
+      if (this.isAPIInbox) {
+        const { additional_attributes: additionalAttributes = {} } = this.inbox;
+        if (additionalAttributes) {
+          const {
+            agent_reply_time_window_message: agentReplyTimeWindowMessage,
+          } = additionalAttributes;
+          return agentReplyTimeWindowMessage;
+        }
+        return '';
+      }
+      return this.$t('CONVERSATION.CANNOT_REPLY');
+    },
+    replyWindowLink() {
+      if (this.isAWhatsappChannel) {
+        return REPLY_POLICY.FACEBOOK;
+      }
+      if (!this.isAPIInbox) {
+        return REPLY_POLICY.TWILIO_WHATSAPP;
+      }
+      return '';
+    },
+    replyWindowLinkText() {
+      if (this.isAWhatsappChannel) {
+        return this.$t('CONVERSATION.24_HOURS_WINDOW');
+      }
+      if (!this.isAPIInbox) {
+        return this.$t('CONVERSATION.TWILIO_WHATSAPP_24_HOURS_WINDOW');
+      }
+      return '';
+    },
   },
 
   watch: {
diff --git a/app/models/channel/api.rb b/app/models/channel/api.rb
index 0902fb5dd..eb28d7b03 100644
--- a/app/models/channel/api.rb
+++ b/app/models/channel/api.rb
@@ -26,8 +26,22 @@ class Channel::Api < ApplicationRecord
 
   has_secure_token :identifier
   has_secure_token :hmac_token
+  validate :ensure_valid_agent_reply_time_window
 
   def name
     'API'
   end
+
+  def messaging_window_enabled?
+    additional_attributes.present? && additional_attributes['agent_reply_time_window'].present?
+  end
+
+  private
+
+  def ensure_valid_agent_reply_time_window
+    return if additional_attributes['agent_reply_time_window'].blank?
+    return if additional_attributes['agent_reply_time_window'].to_i.positive?
+
+    errors.add(:agent_reply_time_window, 'agent_reply_time_window must be greater than 0')
+  end
 end
diff --git a/app/models/channel/facebook_page.rb b/app/models/channel/facebook_page.rb
index ed599e6e2..3737279f8 100644
--- a/app/models/channel/facebook_page.rb
+++ b/app/models/channel/facebook_page.rb
@@ -32,7 +32,7 @@ class Channel::FacebookPage < ApplicationRecord
     'Facebook'
   end
 
-  def has_24_hour_messaging_window?
+  def messaging_window_enabled?
     false
   end
 
diff --git a/app/models/channel/twilio_sms.rb b/app/models/channel/twilio_sms.rb
index 5f4f26048..aae67ed47 100644
--- a/app/models/channel/twilio_sms.rb
+++ b/app/models/channel/twilio_sms.rb
@@ -34,7 +34,7 @@ class Channel::TwilioSms < ApplicationRecord
     medium == 'sms' ? 'Twilio SMS' : 'Whatsapp'
   end
 
-  def has_24_hour_messaging_window?
+  def messaging_window_enabled?
     medium == 'whatsapp'
   end
 end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index 149fd7144..a97dcc930 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -57,7 +57,7 @@ class Channel::Whatsapp < ApplicationRecord
     { 'D360-API-KEY' => provider_config['api_key'], 'Content-Type' => 'application/json' }
   end
 
-  def has_24_hour_messaging_window?
+  def messaging_window_enabled?
     true
   end
 
diff --git a/app/models/concerns/channelable.rb b/app/models/concerns/channelable.rb
index e60066d5f..e54d5f3a6 100644
--- a/app/models/concerns/channelable.rb
+++ b/app/models/concerns/channelable.rb
@@ -6,7 +6,7 @@ module Channelable
     has_one :inbox, as: :channel, dependent: :destroy_async
   end
 
-  def has_24_hour_messaging_window?
+  def messaging_window_enabled?
     false
   end
 end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index cd45adf7b..4791ba924 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -93,23 +93,24 @@ class Conversation < ApplicationRecord
   delegate :auto_resolve_duration, to: :account
 
   def can_reply?
+    channel = inbox&.channel
+
     return can_reply_on_instagram? if additional_attributes['type'] == 'instagram_direct_message'
 
-    return true unless inbox&.channel&.has_24_hour_messaging_window?
+    return true unless channel&.messaging_window_enabled?
 
-    return false if last_incoming_message.nil?
-
-    last_message_less_than_24_hrs?
+    messaging_window = inbox.api? ? channel.additional_attributes['agent_reply_time_window'].to_i : 24
+    last_message_in_messaging_window?(messaging_window)
   end
 
   def last_incoming_message
     messages&.incoming&.last
   end
 
-  def last_message_less_than_24_hrs?
+  def last_message_in_messaging_window?(time)
     return false if last_incoming_message.nil?
 
-    Time.current < last_incoming_message.created_at + 24.hours
+    Time.current < last_incoming_message.created_at + time.hours
   end
 
   def can_reply_on_instagram?
@@ -120,7 +121,7 @@ class Conversation < ApplicationRecord
     if global_config['ENABLE_MESSENGER_CHANNEL_HUMAN_AGENT']
       Time.current < last_incoming_message.created_at + 7.days
     else
-      last_message_less_than_24_hrs?
+      last_message_in_messaging_window?(24)
     end
   end
 
diff --git a/spec/models/channel/twilio_sms_spec.rb b/spec/models/channel/twilio_sms_spec.rb
index 8aab34a7a..493c644ac 100644
--- a/spec/models/channel/twilio_sms_spec.rb
+++ b/spec/models/channel/twilio_sms_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Channel::TwilioSms do
     let!(:whatsapp_channel) { create(:channel_twilio_sms, medium: :whatsapp) }
 
     it 'returns true' do
-      expect(whatsapp_channel.has_24_hour_messaging_window?).to eq true
+      expect(whatsapp_channel.messaging_window_enabled?).to eq true
       expect(whatsapp_channel.name).to eq 'Whatsapp'
       expect(whatsapp_channel.medium).to eq 'whatsapp'
     end
@@ -17,7 +17,7 @@ RSpec.describe Channel::TwilioSms do
     let!(:sms_channel) { create(:channel_twilio_sms, medium: :sms) }
 
     it 'returns false' do
-      expect(sms_channel.has_24_hour_messaging_window?).to eq false
+      expect(sms_channel.messaging_window_enabled?).to eq false
       expect(sms_channel.name).to eq 'Twilio SMS'
       expect(sms_channel.medium).to eq 'sms'
     end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index e83ee5195..1b1e84ea5 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -545,6 +545,54 @@ RSpec.describe Conversation, type: :model do
         end
       end
     end
+
+    describe 'on API channels' do
+      let!(:api_channel) { create(:channel_api, additional_attributes: {}) }
+      let!(:api_channel_with_limit) { create(:channel_api, additional_attributes: { agent_reply_time_window: '12' }) }
+
+      context 'when agent_reply_time_window is not configured' do
+        it 'return true irrespective of the last message time' do
+          conversation = create(:conversation, inbox: api_channel.inbox)
+          create(
+            :message,
+            account: conversation.account,
+            inbox: api_channel.inbox,
+            conversation: conversation,
+            created_at: Time.now - 13.hours
+          )
+
+          expect(api_channel.additional_attributes['agent_reply_time_window']).to eq nil
+          expect(conversation.can_reply?).to eq true
+        end
+      end
+
+      context 'when agent_reply_time_window is configured' do
+        it 'return false if it is outside of agent_reply_time_window' do
+          conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
+          create(
+            :message,
+            account: conversation.account,
+            inbox: api_channel_with_limit.inbox,
+            conversation: conversation,
+            created_at: Time.now - 13.hours
+          )
+
+          expect(api_channel_with_limit.additional_attributes['agent_reply_time_window']).to eq '12'
+          expect(conversation.can_reply?).to eq false
+        end
+
+        it 'return true if it is inside of agent_reply_time_window' do
+          conversation = create(:conversation, inbox: api_channel_with_limit.inbox)
+          create(
+            :message,
+            account: conversation.account,
+            inbox: api_channel_with_limit.inbox,
+            conversation: conversation
+          )
+          expect(conversation.can_reply?).to eq true
+        end
+      end
+    end
   end
 
   describe '#delete conversation' do

From fdcaed75f654eb247769160acbb05012298bc6bd Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 14 Jun 2022 23:46:36 +0530
Subject: [PATCH 167/177] chore: Move Whatsapp template sync to cron (#4858)

syncing WhatsApp templates job is moved to a cron job for a better user experience. The Templates are synced at 15-minute intervals now.
---
 .../channels/whatsapp/templates_sync_job.rb   |  7 +++++
 .../whatsapp/templates_sync_scheduler_job.rb  | 12 +++++++++
 app/jobs/trigger_scheduled_items_job.rb       |  3 +++
 app/models/channel/whatsapp.rb                |  5 +---
 .../whatsapp/send_on_whatsapp_service.rb      |  1 -
 spec/factories/channel/channel_whatsapp.rb    |  9 +++++++
 .../whatsapp/templates_sync_job_spec.rb       | 20 ++++++++++++++
 .../templates_sync_scheduler_job_spec.rb      | 27 +++++++++++++++++++
 spec/jobs/send_reply_job_spec.rb              |  4 +--
 spec/jobs/trigger_scheduled_items_job_spec.rb |  5 ++++
 .../whatsapp/incoming_message_service_spec.rb |  2 +-
 .../whatsapp/send_on_whatsapp_service_spec.rb |  2 +-
 12 files changed, 88 insertions(+), 9 deletions(-)
 create mode 100644 app/jobs/channels/whatsapp/templates_sync_job.rb
 create mode 100644 app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
 create mode 100644 spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
 create mode 100644 spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb

diff --git a/app/jobs/channels/whatsapp/templates_sync_job.rb b/app/jobs/channels/whatsapp/templates_sync_job.rb
new file mode 100644
index 000000000..a9ea4616c
--- /dev/null
+++ b/app/jobs/channels/whatsapp/templates_sync_job.rb
@@ -0,0 +1,7 @@
+class Channels::Whatsapp::TemplatesSyncJob < ApplicationJob
+  queue_as :low
+
+  def perform(whatsapp_channel)
+    whatsapp_channel.sync_templates
+  end
+end
diff --git a/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
new file mode 100644
index 000000000..1b11c32c4
--- /dev/null
+++ b/app/jobs/channels/whatsapp/templates_sync_scheduler_job.rb
@@ -0,0 +1,12 @@
+class Channels::Whatsapp::TemplatesSyncSchedulerJob < ApplicationJob
+  queue_as :low
+
+  def perform
+    Channel::Whatsapp.where('message_templates_last_updated <= ? OR message_templates_last_updated IS NULL',
+                            15.minutes.ago).find_in_batches do |channels_batch|
+      channels_batch.each do |channel|
+        Channels::Whatsapp::TemplatesSyncJob.perform_later(channel)
+      end
+    end
+  end
+end
diff --git a/app/jobs/trigger_scheduled_items_job.rb b/app/jobs/trigger_scheduled_items_job.rb
index 5d1b89727..a3a502ec0 100644
--- a/app/jobs/trigger_scheduled_items_job.rb
+++ b/app/jobs/trigger_scheduled_items_job.rb
@@ -12,5 +12,8 @@ class TriggerScheduledItemsJob < ApplicationJob
 
     # Job to auto-resolve conversations
     Account::ConversationsResolutionSchedulerJob.perform_later
+
+    # Job to sync whatsapp templates
+    Channels::Whatsapp::TemplatesSyncSchedulerJob.perform_later
   end
 end
diff --git a/app/models/channel/whatsapp.rb b/app/models/channel/whatsapp.rb
index a97dcc930..1f7a14c39 100644
--- a/app/models/channel/whatsapp.rb
+++ b/app/models/channel/whatsapp.rb
@@ -25,6 +25,7 @@ class Channel::Whatsapp < ApplicationRecord
 
   validates :phone_number, presence: true, uniqueness: true
   before_save :validate_provider_config
+  after_create :sync_templates
 
   def name
     'Whatsapp'
@@ -62,10 +63,6 @@ class Channel::Whatsapp < ApplicationRecord
   end
 
   def sync_templates
-    # to prevent too many api calls
-    last_updated = message_templates_last_updated || 1.day.ago
-    return if Time.current < (last_updated + 12.hours)
-
     response = HTTParty.get("#{api_base_path}/configs/templates", headers: api_headers)
     update(message_templates: response['waba_templates'], message_templates_last_updated: Time.now.utc) if response.success?
   end
diff --git a/app/services/whatsapp/send_on_whatsapp_service.rb b/app/services/whatsapp/send_on_whatsapp_service.rb
index be81c332b..efba78f7e 100644
--- a/app/services/whatsapp/send_on_whatsapp_service.rb
+++ b/app/services/whatsapp/send_on_whatsapp_service.rb
@@ -15,7 +15,6 @@ class Whatsapp::SendOnWhatsappService < Base::SendOnChannelService
   end
 
   def send_template_message
-    channel.sync_templates
     name, namespace, lang_code, processed_parameters = processable_channel_message_template
 
     return if name.blank?
diff --git a/spec/factories/channel/channel_whatsapp.rb b/spec/factories/channel/channel_whatsapp.rb
index 0c60cc78f..3db99b47a 100644
--- a/spec/factories/channel/channel_whatsapp.rb
+++ b/spec/factories/channel/channel_whatsapp.rb
@@ -34,6 +34,15 @@ FactoryBot.define do
     end
     message_templates_last_updated { Time.now.utc }
 
+    transient do
+      sync_templates { true }
+    end
+
+    before(:create) do |channel_whatsapp, options|
+      # since factory already has the required message templates, we just need to bypass it getting updated
+      channel_whatsapp.define_singleton_method(:sync_templates) { return } unless options.sync_templates
+    end
+
     after(:create) do |channel_whatsapp|
       create(:inbox, channel: channel_whatsapp, account: channel_whatsapp.account)
     end
diff --git a/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
new file mode 100644
index 000000000..335e4d6f7
--- /dev/null
+++ b/spec/jobs/channels/whatsapp/templates_sync_job_spec.rb
@@ -0,0 +1,20 @@
+require 'rails_helper'
+
+RSpec.describe Channels::Whatsapp::TemplatesSyncJob, type: :job do
+  let(:channel_whatsapp) { create(:channel_whatsapp, sync_templates: false) }
+
+  it 'enqueues the job' do
+    stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
+    expect { described_class.perform_later(channel_whatsapp) }.to have_enqueued_job(described_class)
+      .on_queue('low')
+  end
+
+  context 'when called' do
+    it 'calls sync_templates' do
+      whatsapp_channel = double
+      allow(whatsapp_channel).to receive(:sync_templates).and_return(true)
+      expect(whatsapp_channel).to receive(:sync_templates)
+      described_class.perform_now(whatsapp_channel)
+    end
+  end
+end
diff --git a/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
new file mode 100644
index 000000000..6d345584d
--- /dev/null
+++ b/spec/jobs/channels/whatsapp/templates_sync_scheduler_job_spec.rb
@@ -0,0 +1,27 @@
+require 'rails_helper'
+
+RSpec.describe Channels::Whatsapp::TemplatesSyncSchedulerJob, type: :job do
+  it 'enqueues the job' do
+    expect { described_class.perform_later }.to have_enqueued_job(described_class)
+      .on_queue('low')
+  end
+
+  context 'when called' do
+    it 'schedules templates_sync_jobs for channels where templates need to be updated' do
+      stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
+      non_synced = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: nil)
+      synced_recently = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: Time.zone.now)
+      synced_old = create(:channel_whatsapp, sync_templates: false, message_templates_last_updated: 16.minutes.ago)
+      described_class.perform_now
+      expect(Channels::Whatsapp::TemplatesSyncJob).not_to(
+        have_been_enqueued.with(synced_recently).on_queue('low')
+      )
+      expect(Channels::Whatsapp::TemplatesSyncJob).to(
+        have_been_enqueued.with(synced_old).on_queue('low')
+      )
+      expect(Channels::Whatsapp::TemplatesSyncJob).to(
+        have_been_enqueued.with(non_synced).on_queue('low')
+      )
+    end
+  end
+end
diff --git a/spec/jobs/send_reply_job_spec.rb b/spec/jobs/send_reply_job_spec.rb
index 03b249368..304653b41 100644
--- a/spec/jobs/send_reply_job_spec.rb
+++ b/spec/jobs/send_reply_job_spec.rb
@@ -66,9 +66,9 @@ RSpec.describe SendReplyJob, type: :job do
       described_class.perform_now(message.id)
     end
 
-    it 'calls ::Whatsapp:SendOnWhatsappService when its line message' do
+    it 'calls ::Whatsapp:SendOnWhatsappService when its whatsapp message' do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
-      whatsapp_channel = create(:channel_whatsapp)
+      whatsapp_channel = create(:channel_whatsapp, sync_templates: false)
       message = create(:message, conversation: create(:conversation, inbox: whatsapp_channel.inbox))
       allow(::Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message).and_return(process_service)
       expect(::Whatsapp::SendOnWhatsappService).to receive(:new).with(message: message)
diff --git a/spec/jobs/trigger_scheduled_items_job_spec.rb b/spec/jobs/trigger_scheduled_items_job_spec.rb
index f94371e8b..e7b5fe597 100644
--- a/spec/jobs/trigger_scheduled_items_job_spec.rb
+++ b/spec/jobs/trigger_scheduled_items_job_spec.rb
@@ -30,5 +30,10 @@ RSpec.describe TriggerScheduledItemsJob, type: :job do
       expect(Account::ConversationsResolutionSchedulerJob).to receive(:perform_later).once
       described_class.perform_now
     end
+
+    it 'triggers Channels::Whatsapp::TemplatesSyncSchedulerJob' do
+      expect(Channels::Whatsapp::TemplatesSyncSchedulerJob).to receive(:perform_later).once
+      described_class.perform_now
+    end
   end
 end
diff --git a/spec/services/whatsapp/incoming_message_service_spec.rb b/spec/services/whatsapp/incoming_message_service_spec.rb
index 0144dd169..efe9949f5 100644
--- a/spec/services/whatsapp/incoming_message_service_spec.rb
+++ b/spec/services/whatsapp/incoming_message_service_spec.rb
@@ -6,7 +6,7 @@ describe Whatsapp::IncomingMessageService do
       stub_request(:post, 'https://waba.360dialog.io/v1/configs/webhook')
     end
 
-    let!(:whatsapp_channel) { create(:channel_whatsapp) }
+    let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false) }
 
     context 'when valid text message params' do
       it 'creates appropriate conversations, message and contacts' do
diff --git a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
index b08f25931..1dc405abd 100644
--- a/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
+++ b/spec/services/whatsapp/send_on_whatsapp_service_spec.rb
@@ -15,7 +15,7 @@ describe Whatsapp::SendOnWhatsappService do
 
     context 'when a valid message' do
       let(:whatsapp_request) { double }
-      let!(:whatsapp_channel) { create(:channel_whatsapp) }
+      let!(:whatsapp_channel) { create(:channel_whatsapp, sync_templates: false) }
       let!(:contact_inbox) { create(:contact_inbox, inbox: whatsapp_channel.inbox, source_id: '123456789') }
       let!(:conversation) { create(:conversation, contact_inbox: contact_inbox, inbox: whatsapp_channel.inbox) }
 

From 067c9053297defe54328af8967e8ee2b95e98cb5 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Wed, 15 Jun 2022 14:18:05 +0530
Subject: [PATCH 168/177] feat: Allow agents to bulk assign labels to
 conversations (#4854)

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../dashboard/components/ChatList.vue         |  16 +
 .../conversationBulkActions/AgentSelector.vue |   2 +-
 .../conversationBulkActions/Index.vue         |  31 +-
 .../conversationBulkActions/LabelActions.vue  | 282 ++++++++++++++++++
 .../dashboard/i18n/locale/en/bulkActions.json |   7 +
 5 files changed, 334 insertions(+), 4 deletions(-)
 create mode 100644 app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue

diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 6f6b1961c..d1ac4945f 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -95,6 +95,7 @@
       @select-all-conversations="selectAllConversations"
       @assign-agent="onAssignAgent"
       @update-conversations="onUpdateConversations"
+      @assign-labels="onAssignLabels"
     />
     <div ref="activeConversation" class="conversations-list">
       <conversation-card
@@ -598,6 +599,21 @@ export default {
         this.showAlert(this.$t('BULK_ACTION.ASSIGN_FAILED'));
       }
     },
+    async onAssignLabels(labels) {
+      try {
+        await this.$store.dispatch('bulkActions/process', {
+          type: 'Conversation',
+          ids: this.selectedConversations,
+          labels: {
+            add: labels,
+          },
+        });
+        this.selectedConversations = [];
+        this.showAlert(this.$t('BULK_ACTION.LABELS.ASSIGN_SUCCESFUL'));
+      } catch (err) {
+        this.showAlert(this.$t('BULK_ACTION.LABELS.ASSIGN_FAILED'));
+      }
+    },
     async onUpdateConversations(status) {
       try {
         await this.$store.dispatch('bulkActions/process', {
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index 70a314f5b..acf23d716 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -182,7 +182,7 @@ export default {
   }
 
   .container {
-    height: 24rem;
+    max-height: 24rem;
     overflow-y: auto;
     .agent__list-container {
       height: 100%;
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
index 5f1aa37e0..70b0464cc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/Index.vue
@@ -19,11 +19,20 @@
         </span>
       </label>
       <div class="bulk-action__actions flex-between">
+        <woot-button
+          v-tooltip="$t('BULK_ACTION.LABELS.ASSIGN_LABELS')"
+          size="tiny"
+          variant="smooth"
+          color-scheme="secondary"
+          icon="tag"
+          class="margin-right-smaller"
+          @click="toggleLabelActions"
+        />
         <woot-button
           v-tooltip="$t('BULK_ACTION.UPDATE.CHANGE_STATUS')"
           size="tiny"
-          variant="flat"
-          color-scheme="success"
+          variant="smooth"
+          color-scheme="secondary"
           icon="repeat"
           class="margin-right-smaller"
           @click="toggleUpdateActions"
@@ -31,12 +40,19 @@
         <woot-button
           v-tooltip="$t('BULK_ACTION.ASSIGN_AGENT_TOOLTIP')"
           size="tiny"
-          variant="flat"
+          variant="smooth"
           color-scheme="secondary"
           icon="person-assign"
           @click="toggleAgentList"
         />
       </div>
+      <transition name="popover-animation">
+        <label-actions
+          v-if="showLabelActions"
+          @assign="assignLabels"
+          @close="showLabelActions = false"
+        />
+      </transition>
       <transition name="popover-animation">
         <agent-selector
           v-if="showAgentsList"
@@ -68,10 +84,12 @@
 <script>
 import AgentSelector from './AgentSelector.vue';
 import UpdateActions from './UpdateActions.vue';
+import LabelActions from './LabelActions.vue';
 export default {
   components: {
     AgentSelector,
     UpdateActions,
+    LabelActions,
   },
   props: {
     conversations: {
@@ -103,6 +121,7 @@ export default {
     return {
       showAgentsList: false,
       showUpdateActions: false,
+      showLabelActions: false,
     };
   },
   methods: {
@@ -115,12 +134,18 @@ export default {
     updateConversations(status) {
       this.$emit('update-conversations', status);
     },
+    assignLabels(labels) {
+      this.$emit('assign-labels', labels);
+    },
     resolveConversations() {
       this.$emit('resolve-conversations');
     },
     toggleUpdateActions() {
       this.showUpdateActions = !this.showUpdateActions;
     },
+    toggleLabelActions() {
+      this.showLabelActions = !this.showLabelActions;
+    },
     toggleAgentList() {
       this.showAgentsList = !this.showAgentsList;
     },
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
new file mode 100644
index 000000000..eb93586e3
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -0,0 +1,282 @@
+<template>
+  <div v-on-clickaway="onClose" class="labels-container">
+    <div class="triangle">
+      <svg height="12" viewBox="0 0 24 12" width="24">
+        <path
+          d="M20 12l-8-8-12 12"
+          fill="var(--white)"
+          fill-rule="evenodd"
+          stroke="var(--s-50)"
+          stroke-width="1px"
+        />
+      </svg>
+    </div>
+    <div class="header flex-between">
+      <span>{{ $t('BULK_ACTION.LABELS.ASSIGN_LABELS') }}</span>
+      <woot-button
+        size="tiny"
+        variant="clear"
+        color-scheme="secondary"
+        icon="dismiss"
+        @click="onClose"
+      />
+    </div>
+    <div class="labels-list">
+      <header class="labels-list__header">
+        <div class="label-list-search flex-between">
+          <fluent-icon icon="search" class="search-icon" size="16" />
+          <input
+            ref="search"
+            v-model="query"
+            type="search"
+            placeholder="Search"
+            class="label--search_input"
+          />
+        </div>
+      </header>
+      <ul class="labels-list__body">
+        <li
+          v-for="label in filteredLabels"
+          :key="label.id"
+          class="label__list-item"
+        >
+          <label
+            class="item"
+            :class="{ 'label-selected': isLabelSelected(label.title) }"
+          >
+            <input
+              v-model="selectedLabels"
+              type="checkbox"
+              :value="label.title"
+              class="label-checkbox"
+            />
+            <span class="label-title">{{ label.title }}</span>
+            <span
+              class="label-pill"
+              :style="{ backgroundColor: label.color }"
+            />
+          </label>
+        </li>
+      </ul>
+      <footer class="labels-list__footer">
+        <woot-button
+          size="small"
+          color-scheme="primary"
+          :disabled="!selectedLabels.length"
+          @click="$emit('assign', selectedLabels)"
+        >
+          <span>{{ $t('BULK_ACTION.LABELS.ASSIGN_SELECTED_LABELS') }}</span>
+        </woot-button>
+      </footer>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixin as clickaway } from 'vue-clickaway';
+import { mapGetters } from 'vuex';
+
+export default {
+  mixins: [clickaway],
+  data() {
+    return {
+      query: '',
+      selectedLabels: [],
+    };
+  },
+  computed: {
+    ...mapGetters({ labels: 'labels/getLabels' }),
+    filteredLabels() {
+      return this.labels.filter(label =>
+        label.title.toLowerCase().includes(this.query.toLowerCase())
+      );
+    },
+  },
+  methods: {
+    isLabelSelected(label) {
+      return this.selectedLabels.includes(label);
+    },
+    assignLabels(key) {
+      this.$emit('update', key);
+    },
+    onClose() {
+      this.$emit('close');
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.labels-list {
+  display: flex;
+  flex-direction: column;
+  max-height: 24rem;
+  min-height: auto;
+
+  .labels-list__header {
+    background-color: var(--white);
+    padding: 0 var(--space-one);
+  }
+
+  .labels-list__body {
+    flex: 1;
+    overflow-y: auto;
+    padding: var(--space-one) 0;
+  }
+
+  .labels-list__footer {
+    padding: var(--space-small);
+
+    button {
+      width: 100%;
+    }
+  }
+}
+
+.label-list-search {
+  background-color: var(--s-50);
+  border-radius: var(--border-radius-medium);
+  border: 1px solid var(--s-100);
+  padding: 0 var(--space-one);
+
+  .search-icon {
+    color: var(--s-400);
+  }
+
+  .label--search_input {
+    background-color: transparent;
+    border: 0;
+    font-size: var(--font-size-mini);
+    height: unset;
+    margin: 0;
+  }
+}
+
+.labels-container {
+  background-color: var(--white);
+  border-radius: var(--border-radius-large);
+  border: 1px solid var(--s-50);
+  box-shadow: var(--shadow-dropdown-pane);
+  max-width: 24rem;
+  min-width: 24rem;
+  position: absolute;
+  right: 4.5rem;
+  top: var(--space-larger);
+  transform-origin: top right;
+  width: auto;
+  z-index: var(--z-index-twenty);
+
+  .header {
+    padding: var(--space-one);
+
+    span {
+      font-size: var(--font-size-small);
+      font-weight: var(--font-weight-medium);
+    }
+  }
+
+  .container {
+    max-height: 24rem;
+    overflow-y: auto;
+
+    .label__list-container {
+      height: 100%;
+    }
+    .label-list-search {
+      padding: 0 var(--space-one);
+      border: 1px solid var(--s-100);
+      border-radius: var(--border-radius-medium);
+      background-color: var(--s-50);
+      .search-icon {
+        color: var(--s-400);
+      }
+
+      .label--search_input {
+        border: 0;
+        font-size: var(--font-size-mini);
+        margin: 0;
+        background-color: transparent;
+        height: unset;
+      }
+    }
+  }
+
+  .triangle {
+    display: block;
+    position: absolute;
+    right: 2rem;
+    text-align: left;
+    top: calc(var(--space-slab) * -1);
+    z-index: var(--z-index-one);
+  }
+}
+
+ul {
+  margin: 0;
+  list-style: none;
+}
+
+.labels-placeholder {
+  padding: var(--space-small);
+}
+
+.label__list-item {
+  margin: var(--space-smaller) 0;
+  padding: 0 var(--space-one);
+
+  .item {
+    align-items: center;
+    border-radius: var(--border-radius-medium);
+    cursor: pointer;
+    display: flex;
+    padding: var(--space-smaller) var(--space-one);
+
+    &:hover {
+      background-color: var(--s-50);
+    }
+
+    &.label-selected {
+      background-color: var(--s-50);
+    }
+
+    span {
+      font-size: var(--font-size-small);
+    }
+
+    .label-checkbox {
+      margin: 0 var(--space-one) 0 0;
+    }
+
+    .label-title {
+      flex-grow: 1;
+    }
+
+    .label-pill {
+      background-color: var(--s-50);
+      border-radius: var(--border-radius-medium);
+      height: var(--space-slab);
+      width: var(--space-slab);
+    }
+  }
+}
+
+.search-container {
+  background-color: var(--white);
+  padding: 0 var(--space-one);
+  position: sticky;
+  top: 0;
+  z-index: var(--z-index-twenty);
+}
+
+.actions-container {
+  background-color: var(--white);
+  bottom: 0;
+  padding: var(--space-small);
+  position: sticky;
+  z-index: var(--z-index-twenty);
+
+  button {
+    width: 100%;
+  }
+}
+</style>
diff --git a/app/javascript/dashboard/i18n/locale/en/bulkActions.json b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
index f9e084cd7..7061e5e70 100644
--- a/app/javascript/dashboard/i18n/locale/en/bulkActions.json
+++ b/app/javascript/dashboard/i18n/locale/en/bulkActions.json
@@ -17,6 +17,13 @@
       "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"
     }
   }
 }

From 9015d83679aef81395c5ec829008a8e70febc02f Mon Sep 17 00:00:00 2001
From: "Aswin Dev P.S" <aswindevps@gmail.com>
Date: Wed, 15 Jun 2022 16:20:19 +0530
Subject: [PATCH 169/177] chore: Fix sentry issues (#4863)

Fix sentry issues.

Fixes #4815, #4814, #4811, #4809
---
 .../api/v1/accounts/inboxes_controller.rb     | 18 ++++++------
 app/helpers/api/v1/inboxes_helper.rb          | 28 +++++++++++++++++--
 .../dashboard/settings/inbox/ImapSettings.vue |  2 +-
 .../dashboard/store/modules/inboxes.js        |  6 +++-
 app/mailboxes/mailbox_helper.rb               |  2 ++
 config/locales/en.yml                         |  7 +++++
 6 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index ded4db598..95662e29b 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -43,14 +43,18 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
 
   def update
     @inbox.update!(permitted_params.except(:channel))
-    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
+    update_inbox_working_hours
     channel_attributes = get_channel_attributes(@inbox.channel_type)
 
     # Inbox update doesn't necessarily need channel attributes
     return if permitted_params(channel_attributes)[:channel].blank?
 
     if @inbox.inbox_type == 'Email'
-      validate_email_channel(channel_attributes)
+      begin
+        validate_email_channel(channel_attributes)
+      rescue StandardError => e
+        render json: { message: e }, status: :unprocessable_entity and return
+      end
       @inbox.channel.reauthorized!
     end
 
@@ -58,6 +62,10 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     update_channel_feature_flags
   end
 
+  def update_inbox_working_hours
+    @inbox.update_working_hours(params.permit(working_hours: Inbox::OFFISABLE_ATTRS)[:working_hours]) if params[:working_hours]
+  end
+
   def agent_bot
     @agent_bot = @inbox.agent_bot
   end
@@ -89,12 +97,6 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
     @agent_bot = AgentBot.find(params[:agent_bot]) if params[:agent_bot]
   end
 
-  def inbox_name(channel)
-    return channel.try(:bot_name) if channel.is_a?(Channel::Telegram)
-
-    permitted_params[:name]
-  end
-
   def create_channel
     return unless %w[web_widget api email line telegram whatsapp sms].include?(permitted_params[:channel][:type])
 
diff --git a/app/helpers/api/v1/inboxes_helper.rb b/app/helpers/api/v1/inboxes_helper.rb
index 82644e62f..aa28e4ccc 100644
--- a/app/helpers/api/v1/inboxes_helper.rb
+++ b/app/helpers/api/v1/inboxes_helper.rb
@@ -1,4 +1,10 @@
 module Api::V1::InboxesHelper
+  def inbox_name(channel)
+    return channel.try(:bot_name) if channel.is_a?(Channel::Telegram)
+
+    permitted_params[:name]
+  end
+
   def validate_email_channel(attributes)
     channel_data = permitted_params(attributes)[:channel]
 
@@ -19,8 +25,7 @@ module Api::V1::InboxesHelper
                                 enable_ssl: channel_data[:imap_enable_ssl] }
     end
 
-    Mail.connection do # rubocop:disable:block
-    end
+    check_imap_connection(channel_data)
   end
 
   def validate_smtp(channel_data)
@@ -32,6 +37,25 @@ module Api::V1::InboxesHelper
     check_smtp_connection(channel_data, smtp)
   end
 
+  def check_imap_connection(channel_data)
+    Mail.connection {} # rubocop:disable:block
+  rescue SocketError => e
+    raise StandardError, I18n.t('errors.inboxes.imap.socket_error')
+  rescue Net::IMAP::NoResponseError => e
+    raise StandardError, I18n.t('errors.inboxes.imap.no_response_error')
+  rescue Errno::EHOSTUNREACH => e
+    raise StandardError, I18n.t('errors.inboxes.imap.host_unreachable_error')
+  rescue Net::OpenTimeout => e
+    raise StandardError,
+          I18n.t('errors.inboxes.imap.connection_timed_out_error', address: channel_data[:imap_address], port: channel_data[:imap_port])
+  rescue Net::IMAP::Error => e
+    raise StandardError, I18n.t('errors.inboxes.imap.connection_closed_error')
+  rescue StandardError => e
+    raise StandardError, e.message
+  ensure
+    Rails.logger.error e if e.present?
+  end
+
   def check_smtp_connection(channel_data, smtp)
     smtp.start(channel_data[:smtp_domain], channel_data[:smtp_login], channel_data[:smtp_password],
                channel_data[:smtp_authentication]&.to_sym || :login)
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
index af2d5dd5c..072fc20f3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ImapSettings.vue
@@ -156,7 +156,7 @@ export default {
         await this.$store.dispatch('inboxes/updateInboxIMAP', payload);
         this.showAlert(this.$t('INBOX_MGMT.IMAP.EDIT.SUCCESS_MESSAGE'));
       } catch (error) {
-        this.showAlert(this.$t('INBOX_MGMT.IMAP.EDIT.ERROR_MESSAGE'));
+        this.showAlert(error.message);
       }
     },
   },
diff --git a/app/javascript/dashboard/store/modules/inboxes.js b/app/javascript/dashboard/store/modules/inboxes.js
index b16ed4799..668107ef7 100644
--- a/app/javascript/dashboard/store/modules/inboxes.js
+++ b/app/javascript/dashboard/store/modules/inboxes.js
@@ -216,7 +216,11 @@ export const actions = {
       commit(types.default.SET_INBOXES_UI_FLAG, {
         isUpdatingIMAP: false,
       });
-      throw new Error(error);
+      if (error.response?.data?.message) {
+        throw new Error(error.response?.data?.message);
+      } else {
+        throw new Error(error);
+      }
     }
   },
   updateInboxSMTP: async (
diff --git a/app/mailboxes/mailbox_helper.rb b/app/mailboxes/mailbox_helper.rb
index 927ab5eb5..6aaf4fde3 100644
--- a/app/mailboxes/mailbox_helper.rb
+++ b/app/mailboxes/mailbox_helper.rb
@@ -21,6 +21,8 @@ module MailboxHelper
   end
 
   def add_attachments_to_message
+    return if @message.blank?
+
     processed_mail.attachments.each do |mail_attachment|
       attachment = @message.attachments.new(
         account_id: @conversation.account_id,
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b986ef1c1..d7bf7c4e7 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -46,6 +46,13 @@ en:
     contacts:
       import:
         failed: File is blank
+    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.
 
   reports:
     period: Reporting period %{since} to %{until}

From c2114e468e0110aef8d662ca87af6283fbfb2fbc Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 15 Jun 2022 12:06:15 +0000
Subject: [PATCH 170/177] Bump version to 2.6.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 1ea45235d..8db207537 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '2.5.0'
+  version: '2.6.0'
 
 development:
   <<: *shared
diff --git a/package.json b/package.json
index a33a9045d..703f364fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@chatwoot/chatwoot",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "license": "MIT",
   "scripts": {
     "eslint": "eslint app/**/*.{js,vue}",

From 644f07a23d97726d9c80cfab4fd656cd9f53d282 Mon Sep 17 00:00:00 2001
From: Prithvi Tharun <ptrithu8@gmail.com>
Date: Wed, 15 Jun 2022 18:34:24 +0530
Subject: [PATCH 171/177] chore: Copy change for automatic greeting message
 (#4727)

fixes: #4726
---
 app/javascript/dashboard/i18n/locale/en/inboxMgmt.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 6bc5603b0..54e69c304 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -82,7 +82,7 @@
         },
         "CHANNEL_GREETING_TOGGLE": {
           "LABEL": "Enable channel greeting",
-          "HELP_TEXT": "Send a greeting message to the users when they starts the conversation.",
+          "HELP_TEXT": "Automatically send a greeting message when a new conversation is created.",
           "ENABLED": "Enabled",
           "DISABLED": "Disabled"
         },

From 205d42e978f38362decd75e4d661f090bfdadcbd Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Thu, 16 Jun 2022 11:02:32 +0530
Subject: [PATCH 172/177] fix: Bulk actions agent loading (#4874)

---
 .../conversationBulkActions/AgentSelector.vue          | 10 +++++++---
 .../conversationBulkActions/LabelActions.vue           | 10 +++++-----
 app/javascript/shared/assets/stylesheets/spacing.scss  |  3 ++-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index acf23d716..f7777e357 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -22,7 +22,10 @@
       />
     </div>
     <div class="container">
-      <div v-if="uiFlags.isUpdating" class="agent__list-loading">
+      <div
+        v-if="assignableAgentsUiFlags.isFetching"
+        class="agent__list-loading"
+      >
         <spinner />
         <p>{{ $t('BULK_ACTION.AGENT_LIST_LOADING') }}</p>
       </div>
@@ -171,7 +174,7 @@ export default {
   transform-origin: top right;
   width: auto;
   z-index: var(--z-index-twenty);
-
+  min-width: var(--space-giga);
   .header {
     padding: var(--space-one);
 
@@ -182,7 +185,7 @@ export default {
   }
 
   .container {
-    max-height: 24rem;
+    max-height: var(--space-giga);
     overflow-y: auto;
     .agent__list-container {
       height: 100%;
@@ -264,5 +267,6 @@ ul {
   align-items: center;
   justify-content: center;
   flex-direction: column;
+  padding: var(--space-two);
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
index eb93586e3..70f74199b 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/LabelActions.vue
@@ -110,7 +110,7 @@ export default {
 .labels-list {
   display: flex;
   flex-direction: column;
-  max-height: 24rem;
+  max-height: var(--space-giga);
   min-height: auto;
 
   .labels-list__header {
@@ -157,8 +157,8 @@ export default {
   border-radius: var(--border-radius-large);
   border: 1px solid var(--s-50);
   box-shadow: var(--shadow-dropdown-pane);
-  max-width: 24rem;
-  min-width: 24rem;
+  max-width: var(--space-giga);
+  min-width: var(--space-giga);
   position: absolute;
   right: 4.5rem;
   top: var(--space-larger);
@@ -176,7 +176,7 @@ export default {
   }
 
   .container {
-    max-height: 24rem;
+    max-height: var(--space-giga);
     overflow-y: auto;
 
     .label__list-container {
@@ -204,7 +204,7 @@ export default {
   .triangle {
     display: block;
     position: absolute;
-    right: 2rem;
+    right: var(--space-two);
     text-align: left;
     top: calc(var(--space-slab) * -1);
     z-index: var(--z-index-one);
diff --git a/app/javascript/shared/assets/stylesheets/spacing.scss b/app/javascript/shared/assets/stylesheets/spacing.scss
index 9ce5fecb0..c556c65b8 100644
--- a/app/javascript/shared/assets/stylesheets/spacing.scss
+++ b/app/javascript/shared/assets/stylesheets/spacing.scss
@@ -15,7 +15,8 @@
   --space-larger: 4.8rem;
   --space-jumbo: 6.4rem;
   --space-mega: 10rem;
-
+  --space-giga: 24rem;
+  
   --space-minus-micro: -0.2rem;
   --space-minus-smaller: -0.4rem;
   --space-minus-small: -0.8rem;

From db8626335368b915667ece05201e2205552c90be Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Jun 2022 03:07:07 +0530
Subject: [PATCH 173/177] chore: Codespace Improvements (#4867)

- switch to ubuntu base image
- use rbenv to manage ruby
- add gh to base image
---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/Dockerfile.base   | 47 ++++++++++++++++++++++++++-------
 .devcontainer/devcontainer.json |  9 ++++---
 .devcontainer/scripts/setup.sh  |  5 ++++
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index e3eb2fd01..2418bd621 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,4 +5,4 @@ FROM ghcr.io/chatwoot/chatwoot_codespace:latest
 # Do the set up required for chatwoot app 
 WORKDIR /workspace
 COPY . /workspace
-RUN yarn && gem install bundler && bundle install 
+RUN yarn && gem install bundler && bundle install
diff --git a/.devcontainer/Dockerfile.base b/.devcontainer/Dockerfile.base
index de007e202..769be24f8 100644
--- a/.devcontainer/Dockerfile.base
+++ b/.devcontainer/Dockerfile.base
@@ -1,6 +1,6 @@
-# pre-build stage
-ARG VARIANT=3
-FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}
+
+ARG VARIANT=ubuntu-20.04
+FROM mcr.microsoft.com/vscode/devcontainers/base:${VARIANT}
 
 # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user.
 ARG USER_UID=1000
@@ -11,23 +11,36 @@ RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
         && chmod -R $USER_UID:$USER_GID /home/vscode; \
     fi
 
-# [Option] Install Node.js
-ARG INSTALL_NODE="true"
-ARG NODE_VERSION="lts/*"
-RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
   && apt-get -y install --no-install-recommends \
+    build-essential \
     libssl-dev \
+    zlib1g-dev \
+    gnupg2 \
     tar \
     tzdata \
     postgresql-client \
+    libpq-dev \
     yarn \
     git \
     imagemagick \
     tmux \
-    zsh
+    zsh \
+    git-flow \
+    npm
 
+# Install rbenv and ruby
+ARG RUBY_VERSION="3.0.4"
+RUN git clone https://github.com/rbenv/rbenv.git ~/.rbenv \
+    &&  echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc \
+    &&  echo 'eval "$(rbenv init -)"' >> ~/.bashrc
+ENV PATH "/root/.rbenv/bin/:/root/.rbenv/shims/:$PATH"
+RUN git clone https://github.com/rbenv/ruby-build.git && \
+    PREFIX=/usr/local ./ruby-build/install.sh
+
+RUN rbenv install $RUBY_VERSION && \
+    rbenv global $RUBY_VERSION && \
+    rbenv versions
 
 # Install overmind
 RUN curl -L https://github.com/DarthSim/overmind/releases/download/v2.1.0/overmind-v2.1.0-linux-amd64.gz > overmind.gz \
@@ -35,11 +48,25 @@ RUN curl -L https://github.com/DarthSim/overmind/releases/download/v2.1.0/overmi
   && sudo mv overmind /usr/local/bin \
   && chmod +x /usr/local/bin/overmind 
 
+
+# Install gh
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg \
+   && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
+   && sudo apt update \
+   && sudo apt install gh
+
+
 # Do the set up required for chatwoot app 
 WORKDIR /workspace
 COPY . /workspace
-RUN yarn
 
+# set up ruby
 COPY Gemfile Gemfile.lock ./
 RUN gem install bundler && bundle install
 
+# set up node js
+RUN npm install npm@latest -g && \
+    npm install n -g && \
+    n latest
+RUN npm install --global yarn
+RUN yarn
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c0301d87b..a70ba3788 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -23,17 +23,18 @@
   // 5432 postgres
   // 6379 redis
   // 1025,8025 mailhog
-  "forwardPorts": [8025],
-  //your application may need to listen on all interfaces (0.0.0.0) not just localhost for it to be available externally. Defaults to []
-  "appPort": [3000, 3035],
+  "forwardPorts": [8025, 3000, 3035],
 
   "postCreateCommand": ".devcontainer/scripts/setup.sh && bundle exec rake db:chatwoot_prepare && yarn",
   "portsAttributes": {
     "3000": {
       "label": "Rails Server"
     },
+    "3035": {
+      "label": "Webpack Dev Server"
+    },
     "8025": {
       "label": "Mailhog UI"
     }
-  },
+  }
 }
diff --git a/.devcontainer/scripts/setup.sh b/.devcontainer/scripts/setup.sh
index 1b5842603..32ba272a8 100755
--- a/.devcontainer/scripts/setup.sh
+++ b/.devcontainer/scripts/setup.sh
@@ -6,3 +6,8 @@ sed -i -e "/FRONTEND_URL/ s/=.*/=https:\/\/$CODESPACE_NAME-3000.githubpreview.de
 sed -i -e "/WEBPACKER_DEV_SERVER_PUBLIC/ s/=.*/=https:\/\/$CODESPACE_NAME-3035.githubpreview.dev/" .env
 # uncomment the webpacker env variable
 sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
+# fix the error with webpacker
+echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.bashrc
+
+# codespaces make the ports public
+gh codespace ports visibility 3000:public 3035:public 8025:public -c $CODESPACE_NAME

From 6c6df8661b2b3bf6e4908465065469aa6fa898a7 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 17 Jun 2022 19:12:56 +0530
Subject: [PATCH 174/177] chore: Codespace webpacker fix (#4887)

- fixes the webpacker error when running overmind start -f Procfile.dev
---
 .devcontainer/scripts/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/scripts/setup.sh b/.devcontainer/scripts/setup.sh
index 32ba272a8..4ffee2d3a 100755
--- a/.devcontainer/scripts/setup.sh
+++ b/.devcontainer/scripts/setup.sh
@@ -7,7 +7,7 @@ sed -i -e "/WEBPACKER_DEV_SERVER_PUBLIC/ s/=.*/=https:\/\/$CODESPACE_NAME-3035.g
 # uncomment the webpacker env variable
 sed -i -e '/WEBPACKER_DEV_SERVER_PUBLIC/s/^# //' .env
 # fix the error with webpacker
-echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.bashrc
+echo 'export NODE_OPTIONS=--openssl-legacy-provider' >> ~/.zshrc
 
 # codespaces make the ports public
 gh codespace ports visibility 3000:public 3035:public 8025:public -c $CODESPACE_NAME

From a8c6cd729b51dfee644da9a8bc1516c53d6f9ea1 Mon Sep 17 00:00:00 2001
From: Muhsin Keloth <muhsinkeramam@gmail.com>
Date: Mon, 20 Jun 2022 14:16:49 +0530
Subject: [PATCH 175/177] chore: Sync pre-chat fields after custom attribute
 update (#4692)

---
 ...pdate_widget_pre_chat_custom_fields_job.rb | 21 +++++++++++++
 app/models/custom_attribute_definition.rb     |  5 ++++
 ..._widget_pre_chat_custom_fields_job_spec.rb |  2 +-
 ..._widget_pre_chat_custom_fields_job_spec.rb | 30 +++++++++++++++++++
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 app/jobs/inboxes/update_widget_pre_chat_custom_fields_job.rb
 create mode 100644 spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb

diff --git a/app/jobs/inboxes/update_widget_pre_chat_custom_fields_job.rb b/app/jobs/inboxes/update_widget_pre_chat_custom_fields_job.rb
new file mode 100644
index 000000000..b17ecdf55
--- /dev/null
+++ b/app/jobs/inboxes/update_widget_pre_chat_custom_fields_job.rb
@@ -0,0 +1,21 @@
+class Inboxes::UpdateWidgetPreChatCustomFieldsJob < ApplicationJob
+  queue_as :default
+
+  def perform(account, custom_attribute)
+    attribute_key = custom_attribute['attribute_key']
+    account.web_widgets.all.find_each do |web_widget|
+      pre_chat_fields = web_widget.pre_chat_form_options['pre_chat_fields']
+      pre_chat_fields.each_with_index do |pre_chat_field, index|
+        next unless pre_chat_field['name'] == attribute_key
+
+        web_widget.pre_chat_form_options['pre_chat_fields'][index] =
+          pre_chat_field.deep_merge({
+                                      'label' => custom_attribute['attribute_display_name'],
+                                      'placeholder' => custom_attribute['attribute_display_name'],
+                                      'values' => custom_attribute['attribute_values']
+                                    })
+      end
+      web_widget.save!
+    end
+  end
+end
diff --git a/app/models/custom_attribute_definition.rb b/app/models/custom_attribute_definition.rb
index fa0370375..59a314da6 100644
--- a/app/models/custom_attribute_definition.rb
+++ b/app/models/custom_attribute_definition.rb
@@ -34,6 +34,7 @@ class CustomAttributeDefinition < ApplicationRecord
   enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
 
   belongs_to :account
+  after_update :update_widget_pre_chat_custom_fields
   after_destroy :sync_widget_pre_chat_custom_fields
 
   private
@@ -41,4 +42,8 @@ class CustomAttributeDefinition < ApplicationRecord
   def sync_widget_pre_chat_custom_fields
     ::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_now(account, attribute_key)
   end
+
+  def update_widget_pre_chat_custom_fields
+    ::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_now(account, self)
+  end
 end
diff --git a/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
index e6b23dccc..9348754d1 100644
--- a/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
+++ b/spec/jobs/inboxes/sync_widget_pre_chat_custom_fields_job_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe Inboxes::SyncWidgetPreChatCustomFieldsJob, type: :job do
   end
 
   context 'when called' do
-    it 'reopens snoozed conversations whose snooze until has passed' do
+    it 'sync pre chat fields if custom attribute deleted' do
       described_class.perform_now(account, 'developer_id')
       expect(web_widget.reload.pre_chat_form_options['pre_chat_fields']).to eq [{
         'label' => 'Full Name',
diff --git a/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb b/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb
new file mode 100644
index 000000000..80a32be34
--- /dev/null
+++ b/spec/jobs/inboxes/update_widget_pre_chat_custom_fields_job_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+RSpec.describe Inboxes::UpdateWidgetPreChatCustomFieldsJob, type: :job do
+  pre_chat_fields = [{
+    'label' => 'Developer Id',
+    'name' => 'developer_id'
+  }, {
+    'label' => 'Full Name',
+    'name' => 'full_name'
+  }]
+  pre_chat_message = 'Share your queries here.'
+  custom_attribute = {
+    'attribute_key' => 'developer_id',
+    'attribute_display_name' => 'Developer Number'
+  }
+  let!(:account) { create(:account) }
+  let!(:web_widget) do
+    create(:channel_widget, account: account, pre_chat_form_options: { pre_chat_message: pre_chat_message, pre_chat_fields: pre_chat_fields })
+  end
+
+  context 'when called' do
+    it 'sync pre chat fields if custom attribute updated' do
+      described_class.perform_now(account, custom_attribute)
+      expect(web_widget.reload.pre_chat_form_options['pre_chat_fields']).to eq [
+        { 'label' => 'Developer Number', 'name' => 'developer_id', 'placeholder' => 'Developer Number',
+          'values' => nil }, { 'label' => 'Full Name', 'name' => 'full_name' }
+      ]
+    end
+  end
+end

From f31c6d5de285665aff508d15c6121653b274e09d Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
Date: Mon, 20 Jun 2022 15:09:22 +0530
Subject: [PATCH 176/177] feat: Update the design of labels to use a `smooth`
 theme (#4325)

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
---
 .../assets/scss/_foundation-settings.scss     |  4 +-
 .../dashboard/components/ui/Label.vue         | 59 ++++++++++++++++---
 .../components/widgets/LabelSelector.vue      |  3 +-
 .../conversation/labels/LabelBox.vue          |  3 +-
 .../shared/assets/stylesheets/colors.scss     | 10 ++--
 .../components/ui/dropdown/AddLabel.vue       | 26 ++++----
 6 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index c6b7f6fd3..d13dcbe5e 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -383,8 +383,8 @@ $form-button-radius: var(--border-radius-normal);
 // 20. Label
 // ---------
 
-$label-background: $primary-color;
-$label-color: $white;
+$label-background: $white;
+$label-color: $black;
 $label-color-alt: $black;
 $label-palette: $foundation-palette;
 $label-font-size: $font-size-mini;
diff --git a/app/javascript/dashboard/components/ui/Label.vue b/app/javascript/dashboard/components/ui/Label.vue
index 504f6fc9e..d4059d21c 100644
--- a/app/javascript/dashboard/components/ui/Label.vue
+++ b/app/javascript/dashboard/components/ui/Label.vue
@@ -1,13 +1,18 @@
 <template>
   <div :class="labelClass" :style="labelStyle" :title="description">
-    <button v-if="icon" class="label-action--button" @click="onClick">
+    <span v-if="icon" class="label-action--button">
       <fluent-icon :icon="icon" size="12" class="label--icon" />
-    </button>
+    </span>
+    <span
+      v-if="variant === 'smooth'"
+      :style="{ background: color }"
+      class="label-color-dot"
+    />
     <span v-if="!href">{{ title }}</span>
     <a v-else :href="href" :style="anchorStyle">{{ title }}</a>
     <button
       v-if="showClose"
-      class="label-action--button"
+      class="label-close--button "
       :style="{ color: textColor }"
       @click="onClick"
     >
@@ -48,14 +53,23 @@ export default {
       type: String,
       default: '',
     },
+    color: {
+      type: String,
+      default: '',
+    },
     colorScheme: {
       type: String,
       default: '',
     },
+    variant: {
+      type: String,
+      default: '',
+    },
   },
   computed: {
     textColor() {
-      return getContrastingTextColor(this.bgColor);
+      if (this.variant === 'smooth') return '';
+      return this.color || getContrastingTextColor(this.bgColor);
     },
     labelClass() {
       return `label ${this.colorScheme} ${this.small ? 'small' : ''}`;
@@ -94,9 +108,17 @@ export default {
   font-weight: var(--font-weight-medium);
   margin-right: var(--space-smaller);
   margin-bottom: var(--space-smaller);
+  padding: var(--space-smaller);
+  background: var(--s-50);
+  color: var(--s-800);
+  border: 1px solid var(--s-75);
+  height: var(--space-medium);
 
   &.small {
     font-size: var(--font-size-micro);
+    padding: var(--space-micro) var(--space-smaller);
+    line-height: 1.2;
+    letter-spacing: 0.15px;
   }
 
   .label--icon {
@@ -104,11 +126,6 @@ export default {
     margin-right: var(--space-smaller);
   }
 
-  .close--icon {
-    cursor: pointer;
-    margin-left: var(--space-smaller);
-  }
-
   &.small .label--icon,
   &.small .close--icon {
     font-size: var(--font-size-nano);
@@ -164,7 +181,31 @@ 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;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  &:hover {
+    background: var(--s-100);
+  }
+}
+
 .label-action--button {
   margin-bottom: var(--space-minus-micro);
 }
+
+.label-color-dot {
+  display: inline-block;
+  width: var(--space-one);
+  height: var(--space-one);
+  border-radius: var(--border-radius-small);
+  margin-right: var(--space-smaller);
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/LabelSelector.vue b/app/javascript/dashboard/components/widgets/LabelSelector.vue
index c99647b30..a7ab63609 100644
--- a/app/javascript/dashboard/components/widgets/LabelSelector.vue
+++ b/app/javascript/dashboard/components/widgets/LabelSelector.vue
@@ -7,7 +7,8 @@
       :title="label.title"
       :description="label.description"
       :show-close="true"
-      :bg-color="label.color"
+      :color="label.color"
+      variant="smooth"
       @click="removeItem"
     />
     <div class="dropdown-wrap">
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
index 57c6d211c..8f8b1e17b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -16,7 +16,8 @@
           :title="label.title"
           :description="label.description"
           :show-close="true"
-          :bg-color="label.color"
+          :color="label.color"
+          variant="smooth"
           @click="removeLabelFromConversation"
         />
 
diff --git a/app/javascript/shared/assets/stylesheets/colors.scss b/app/javascript/shared/assets/stylesheets/colors.scss
index 82a700929..7c13fc39c 100644
--- a/app/javascript/shared/assets/stylesheets/colors.scss
+++ b/app/javascript/shared/assets/stylesheets/colors.scss
@@ -50,11 +50,11 @@
   --s-800: #293F51;
   --s-900: #1B2836;
 
-  --b-50: #F8F9FE;
-  --b-100: #F2F3F7;
-  --b-200: #E9EAEF;
-  --b-300: #DADBDF;
-  --b-400: #B6B7BB;
+  --b-50: #f7f7f7;
+  --b-100: #ececed;
+  --b-200: #dddde0;
+  --b-300: #c6c7ca;
+  --b-400: #abacaf;
   --b-500: #96979C;
   --b-600: #6E6F73;
   --b-700: #5A5B5F;
diff --git a/app/javascript/shared/components/ui/dropdown/AddLabel.vue b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
index 8d5b0785d..759287994 100644
--- a/app/javascript/shared/components/ui/dropdown/AddLabel.vue
+++ b/app/javascript/shared/components/ui/dropdown/AddLabel.vue
@@ -1,10 +1,12 @@
 <template>
-  <woot-button variant="link" class="label--add" @click="addLabel">
-    <woot-label
-      color-scheme="secondary"
-      :title="$t('CONTACT_PANEL.LABELS.CONVERSATION.ADD_BUTTON')"
-      icon="add-circle"
-    />
+  <woot-button
+    variant="smooth"
+    class="label--add"
+    icon="add"
+    size="tiny"
+    @click="addLabel"
+  >
+    {{ $t('CONTACT_PANEL.LABELS.CONVERSATION.ADD_BUTTON') }}
   </woot-button>
 </template>
 
@@ -20,15 +22,7 @@ export default {
 
 <style lang="scss" scoped>
 .label--add {
-  &::v-deep .label {
-    cursor: pointer;
-    background: transparent;
-    border-color: var(--s-600);
-    margin: 0;
-
-    &:hover {
-      background: var(--s-50);
-    }
-  }
+  margin-bottom: var(--space-micro);
+  margin-right: var(--space-micro);
 }
 </style>

From 3fa34991d04a964c035c0acdbe648559433f22b8 Mon Sep 17 00:00:00 2001
From: Fayaz Ahmed <15716057+fayazara@users.noreply.github.com>
Date: Mon, 20 Jun 2022 16:04:26 +0530
Subject: [PATCH 177/177] fix: Display missing agent avatar in bulk actions and
 reports (#4893)

---
 .../conversation/conversationBulkActions/AgentSelector.vue  | 3 ++-
 .../dashboard/settings/reports/components/ReportFilters.vue | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
index f7777e357..caee88392 100644
--- a/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/conversationBulkActions/AgentSelector.vue
@@ -46,7 +46,8 @@
           <li v-for="agent in filteredAgents" :key="agent.id">
             <div class="agent-list-item" @click="assignAgent(agent)">
               <thumbnail
-                src="agent.thumbnail"
+                :src="agent.thumbnail"
+                :status="agent.availability_status"
                 :username="agent.name"
                 size="22px"
                 class="margin-right-small"
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 0ad8fb710..d1f729132 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/reports/components/ReportFilters.vue
@@ -17,7 +17,8 @@
         <template slot="singleLabel" slot-scope="props">
           <div class="reports-option__wrap">
             <thumbnail
-              src="props.option.thumbnail"
+              :src="props.option.thumbnail"
+              :status="props.option.availability_status"
               :username="props.option.name"
               size="22px"
               class="margin-right-small"
@@ -30,7 +31,8 @@
         <template slot="option" slot-scope="props">
           <div class="reports-option__wrap">
             <thumbnail
-              src="props.option.thumbnail"
+              :src="props.option.thumbnail"
+              :status="props.option.availability_status"
               :username="props.option.name"
               size="22px"
               class="margin-right-small"