From a13a474c239c77d523cf95ec5b6404396bdcf940 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Fri, 5 Jun 2020 00:15:50 +0530
Subject: [PATCH 01/50] Chore: Firebase Cloud Messaging Support (#858)

---
 .env.example                                  |  3 ++
 Gemfile                                       |  1 +
 Gemfile.lock                                  |  3 ++
 .../notification_subscription_builder.rb      |  2 ++
 app/models/notification_subscription.rb       |  2 +-
 .../notification/push_notification_service.rb | 18 ++++++++++-
 .../push_notification_service_spec.rb         | 32 +++++++++++++++++++
 7 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 spec/services/notification/push_notification_service_spec.rb

diff --git a/.env.example b/.env.example
index d4fb1ea12..e8ec635f0 100644
--- a/.env.example
+++ b/.env.example
@@ -102,6 +102,9 @@ CHARGEBEE_WEBHOOK_PASSWORD=
 ## generate a new key value here : https://d3v.one/vapid-key-generator/
 # VAPID_PUBLIC_KEY=
 # VAPID_PRIVATE_KEY=
+#
+# for mobile apps 
+# FCM_SERVER_KEY=
 
 ## Bot Customizations
 USE_INBOX_AVATAR_FOR_BOT=true
diff --git a/Gemfile b/Gemfile
index 50e3e2ce8..6d16179ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -84,6 +84,7 @@ gem 'sidekiq'
 gem 'flag_shih_tzu'
 
 ##-- Push notification service --##
+gem 'fcm'
 gem 'webpush'
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 48e4e12a8..d8979b903 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -189,6 +189,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
+    fcm (1.0.1)
+      faraday (~> 1.0.0)
     ffi (1.12.2)
     flag_shih_tzu (0.3.23)
     foreman (0.87.1)
@@ -547,6 +549,7 @@ DEPENDENCIES
   facebook-messenger
   factory_bot_rails
   faker
+  fcm
   flag_shih_tzu
   foreman
   google-cloud-storage
diff --git a/app/builders/notification_subscription_builder.rb b/app/builders/notification_subscription_builder.rb
index 05b0bf984..3326b5cde 100644
--- a/app/builders/notification_subscription_builder.rb
+++ b/app/builders/notification_subscription_builder.rb
@@ -12,6 +12,8 @@ class NotificationSubscriptionBuilder
 
   def identifier
     @identifier ||= params[:subscription_attributes][:endpoint] if params[:subscription_type] == 'browser_push'
+    @identifier ||= params[:device_id] if params[:subscription_type] == 'fcm'
+    @identifier
   end
 
   def identifier_subscription
diff --git a/app/models/notification_subscription.rb b/app/models/notification_subscription.rb
index 534bced01..dbe148f71 100644
--- a/app/models/notification_subscription.rb
+++ b/app/models/notification_subscription.rb
@@ -22,7 +22,7 @@ class NotificationSubscription < ApplicationRecord
 
   SUBSCRIPTION_TYPES = {
     browser_push: 1,
-    gcm: 2
+    fcm: 2
   }.freeze
 
   enum subscription_type: SUBSCRIPTION_TYPES
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index e01d19679..c29796d64 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -7,7 +7,8 @@ class Notification::PushNotificationService
     return unless user_subscribed_to_notification?
 
     notification_subscriptions.each do |subscription|
-      send_browser_push(subscription) if subscription.browser_push?
+      send_browser_push(subscription)
+      send_fcm_push(subscription)
     end
   end
 
@@ -53,6 +54,8 @@ class Notification::PushNotificationService
   end
 
   def send_browser_push(subscription)
+    return unless subscription.browser_push?
+
     Webpush.payload_send(
       message: JSON.generate(push_message),
       endpoint: subscription.subscription_attributes['endpoint'],
@@ -70,4 +73,17 @@ class Notification::PushNotificationService
   rescue Webpush::ExpiredSubscription
     subscription.destroy!
   end
+
+  def send_fcm_push(subscription)
+    return unless subscription.fcm?
+
+    fcm = FCM.new(ENV['FCM_SERVER_KEY'])
+    options = { "notification": {
+      "title": notification.notification_type.titleize,
+      "body": push_message_title,
+      "notification": notification.to_json
+    } }
+    response = fcm.send([subscription.subscription_attributes['push_token']], options)
+    subscription.destroy! if JSON.parse(response[:body])['results']&.first&.keys&.include?('error')
+  end
 end
diff --git a/spec/services/notification/push_notification_service_spec.rb b/spec/services/notification/push_notification_service_spec.rb
new file mode 100644
index 000000000..67fc9f999
--- /dev/null
+++ b/spec/services/notification/push_notification_service_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+
+describe Notification::PushNotificationService do
+  let!(:account) { create(:account) }
+  let!(:user) { create(:user, account: account) }
+  let!(:notification) { create(:notification, user: user, account: user.accounts.first) }
+  let(:fcm_double) { double }
+
+  before do
+    allow(Webpush).to receive(:payload_send).and_return(true)
+    allow(FCM).to receive(:new).and_return(fcm_double)
+    allow(fcm_double).to receive(:send).and_return({ body: { 'results': [] }.to_json })
+  end
+
+  describe '#perform' do
+    it 'sends webpush notifications for webpush subscription' do
+      create(:notification_subscription, user: notification.user)
+
+      described_class.new(notification: notification).perform
+      expect(Webpush).to have_received(:payload_send)
+      expect(FCM).not_to have_received(:new)
+    end
+
+    it 'sends a fcm notification for firebase subscription' do
+      create(:notification_subscription, user: notification.user, subscription_type: 'fcm')
+
+      described_class.new(notification: notification).perform
+      expect(FCM).to have_received(:new)
+      expect(Webpush).not_to have_received(:payload_send)
+    end
+  end
+end

From b7f7b54f9be055173ebe56c543dd245f740ed7be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 15:56:54 +0530
Subject: [PATCH 02/50] Chore: Bump websocket-extensions from 0.1.4 to 0.1.5
 (#928)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

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 d8979b903..dffbfb1f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -521,7 +521,7 @@ GEM
       jwt (~> 2.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
     wisper (2.0.0)
     zeitwerk (2.3.0)
 

From ede4dd9cb00b23c3107811ef3744db36ce2f4ed0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2020 18:56:58 +0530
Subject: [PATCH 03/50] Chore: Bump websocket-extensions from 0.1.3 to 0.1.4
 (#929)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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 60dfd4fec..d78e760f4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10555,9 +10555,9 @@ websocket-driver@>=0.5.1:
     websocket-extensions ">=0.1.1"
 
 websocket-extensions@>=0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
-  integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
   version "1.0.5"

From 915eefdc366937e7e74ba1b014861b97516ccd92 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 6 Jun 2020 20:53:30 +0530
Subject: [PATCH 04/50] Bugfix: FCM push subscription builder fix (#930)

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

diff --git a/app/builders/notification_subscription_builder.rb b/app/builders/notification_subscription_builder.rb
index 3326b5cde..c1574bfc1 100644
--- a/app/builders/notification_subscription_builder.rb
+++ b/app/builders/notification_subscription_builder.rb
@@ -12,7 +12,7 @@ class NotificationSubscriptionBuilder
 
   def identifier
     @identifier ||= params[:subscription_attributes][:endpoint] if params[:subscription_type] == 'browser_push'
-    @identifier ||= params[:device_id] if params[:subscription_type] == 'fcm'
+    @identifier ||= params[:subscription_attributes][:device_id] if params[:subscription_type] == 'fcm'
     @identifier
   end
 

From 3d84568a37ddecf8236018b8a67ffbe20c27f936 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sun, 7 Jun 2020 11:17:13 +0530
Subject: [PATCH 05/50] Feature: Label APIs (#931)

---
 .../api/v1/accounts/labels_controller.rb      | 36 ++++++++-
 app/models/account.rb                         |  1 +
 app/models/label.rb                           | 20 +++++
 app/policies/label_policy.rb                  | 17 ++++
 .../v1/accounts/labels/create.json.jbuilder   |  5 ++
 .../v1/accounts/labels/index.json.jbuilder    | 13 +--
 .../accounts/labels/most_used.json.jbuilder   |  3 -
 .../api/v1/accounts/labels/show.json.jbuilder |  5 ++
 .../v1/accounts/labels/update.json.jbuilder   |  5 ++
 config/routes.rb                              |  6 +-
 db/migrate/20200606132552_create_labels.rb    | 13 +++
 db/schema.rb                                  | 13 ++-
 .../api/v1/accounts/labels_controller_spec.rb | 81 ++++++++++++++-----
 spec/factories/labels.rb                      |  8 ++
 spec/models/label_spec.rb                     |  7 ++
 15 files changed, 196 insertions(+), 37 deletions(-)
 create mode 100644 app/models/label.rb
 create mode 100644 app/policies/label_policy.rb
 create mode 100644 app/views/api/v1/accounts/labels/create.json.jbuilder
 delete mode 100644 app/views/api/v1/accounts/labels/most_used.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/labels/show.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/labels/update.json.jbuilder
 create mode 100644 db/migrate/20200606132552_create_labels.rb
 create mode 100644 spec/factories/labels.rb
 create mode 100644 spec/models/label_spec.rb

diff --git a/app/controllers/api/v1/accounts/labels_controller.rb b/app/controllers/api/v1/accounts/labels_controller.rb
index c9f15bdae..5db0fb87b 100644
--- a/app/controllers/api/v1/accounts/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/labels_controller.rb
@@ -1,10 +1,38 @@
 class Api::V1::Accounts::LabelsController < Api::BaseController
-  # list all labels in account
+  before_action :current_account
+  before_action :fetch_label, except: [:index, :create]
+  before_action :check_authorization
+
   def index
-    @labels = current_account.all_conversation_tags
+    @labels = policy_scope(current_account.labels)
   end
 
-  def most_used
-    @labels = ActsAsTaggableOn::Tag.most_used(params[:count] || 10)
+  def show; end
+
+  def create
+    @label = current_account.labels.create!(permitted_params)
+  end
+
+  def update
+    @label.update(permitted_params)
+  end
+
+  def destroy
+    @label.destroy
+    head :ok
+  end
+
+  private
+
+  def fetch_label
+    @label = current_account.labels.find(params[:id])
+  end
+
+  def check_authorization
+    authorize(Label)
+  end
+
+  def permitted_params
+    params.require(:label).permit(:title, :description, :color, :show_on_sidebar)
   end
 end
diff --git a/app/models/account.rb b/app/models/account.rb
index 42dcf75ae..dbae201d3 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -45,6 +45,7 @@ class Account < ApplicationRecord
   has_many :web_widgets, dependent: :destroy, class_name: '::Channel::WebWidget'
   has_many :canned_responses, dependent: :destroy
   has_many :webhooks, dependent: :destroy
+  has_many :labels, dependent: :destroy
   has_one :subscription, dependent: :destroy
   has_many :notification_settings, dependent: :destroy
   has_flags ACCOUNT_SETTINGS_FLAGS.merge(column: 'settings_flags').merge(DEFAULT_QUERY_SETTING)
diff --git a/app/models/label.rb b/app/models/label.rb
new file mode 100644
index 000000000..087e07637
--- /dev/null
+++ b/app/models/label.rb
@@ -0,0 +1,20 @@
+# == Schema Information
+#
+# Table name: labels
+#
+#  id              :bigint           not null, primary key
+#  color           :string
+#  description     :text
+#  show_on_sidebar :boolean
+#  title           :string
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :bigint
+#
+# Indexes
+#
+#  index_labels_on_account_id  (account_id)
+#
+class Label < ApplicationRecord
+  belongs_to :account
+end
diff --git a/app/policies/label_policy.rb b/app/policies/label_policy.rb
new file mode 100644
index 000000000..986044ce6
--- /dev/null
+++ b/app/policies/label_policy.rb
@@ -0,0 +1,17 @@
+class LabelPolicy < ApplicationPolicy
+  def index?
+    @account_user.administrator?
+  end
+
+  def update?
+    @account_user.administrator?
+  end
+
+  def show?
+    @account_user.administrator?
+  end
+
+  def create?
+    @account_user.administrator?
+  end
+end
diff --git a/app/views/api/v1/accounts/labels/create.json.jbuilder b/app/views/api/v1/accounts/labels/create.json.jbuilder
new file mode 100644
index 000000000..edeff661f
--- /dev/null
+++ b/app/views/api/v1/accounts/labels/create.json.jbuilder
@@ -0,0 +1,5 @@
+json.id @label.id
+json.title @label.title
+json.description @label.description
+json.color @label.color
+json.show_on_sidebar @label.show_on_sidebar
diff --git a/app/views/api/v1/accounts/labels/index.json.jbuilder b/app/views/api/v1/accounts/labels/index.json.jbuilder
index 13f99090d..ddff73eec 100644
--- a/app/views/api/v1/accounts/labels/index.json.jbuilder
+++ b/app/views/api/v1/accounts/labels/index.json.jbuilder
@@ -1,8 +1,9 @@
-json.data do
-  json.meta do
-  end
-
-  json.payload do
-    json.labels @labels
+json.payload do
+  json.array! @labels do |label|
+    json.id label.id
+    json.title label.title
+    json.description label.description
+    json.color label.color
+    json.show_on_sidebar label.show_on_sidebar
   end
 end
diff --git a/app/views/api/v1/accounts/labels/most_used.json.jbuilder b/app/views/api/v1/accounts/labels/most_used.json.jbuilder
deleted file mode 100644
index c411b47ed..000000000
--- a/app/views/api/v1/accounts/labels/most_used.json.jbuilder
+++ /dev/null
@@ -1,3 +0,0 @@
-json.payload do
-  json.labels @labels
-end
diff --git a/app/views/api/v1/accounts/labels/show.json.jbuilder b/app/views/api/v1/accounts/labels/show.json.jbuilder
new file mode 100644
index 000000000..edeff661f
--- /dev/null
+++ b/app/views/api/v1/accounts/labels/show.json.jbuilder
@@ -0,0 +1,5 @@
+json.id @label.id
+json.title @label.title
+json.description @label.description
+json.color @label.color
+json.show_on_sidebar @label.show_on_sidebar
diff --git a/app/views/api/v1/accounts/labels/update.json.jbuilder b/app/views/api/v1/accounts/labels/update.json.jbuilder
new file mode 100644
index 000000000..edeff661f
--- /dev/null
+++ b/app/views/api/v1/accounts/labels/update.json.jbuilder
@@ -0,0 +1,5 @@
+json.id @label.id
+json.title @label.title
+json.description @label.description
+json.color @label.color
+json.show_on_sidebar @label.show_on_sidebar
diff --git a/config/routes.rb b/config/routes.rb
index 60b5c9736..dc1172660 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -76,12 +76,8 @@ Rails.application.routes.draw do
           post :set_agent_bot, on: :member
         end
         resources :inbox_members, only: [:create, :show], param: :inbox_id
-        resources :labels, only: [:index] do
-          collection do
-            get :most_used
-          end
-        end
 
+        resources :labels, only: [:index, :show, :create, :update, :destroy]
         resources :notifications, only: [:index, :update]
         resource :notification_settings, only: [:show, :update]
 
diff --git a/db/migrate/20200606132552_create_labels.rb b/db/migrate/20200606132552_create_labels.rb
new file mode 100644
index 000000000..81ac698e9
--- /dev/null
+++ b/db/migrate/20200606132552_create_labels.rb
@@ -0,0 +1,13 @@
+class CreateLabels < ActiveRecord::Migration[6.0]
+  def change
+    create_table :labels do |t|
+      t.string :title
+      t.text :description
+      t.string :color
+      t.boolean :show_on_sidebar
+      t.references :account, index: true
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1509a912a..1ef9c48e1 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: 2020_05_22_115645) do
+ActiveRecord::Schema.define(version: 2020_06_06_132552) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -256,6 +256,17 @@ ActiveRecord::Schema.define(version: 2020_05_22_115645) do
     t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
   end
 
+  create_table "labels", force: :cascade do |t|
+    t.string "title"
+    t.text "description"
+    t.string "color"
+    t.boolean "show_on_sidebar"
+    t.bigint "account_id"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+    t.index ["account_id"], name: "index_labels_on_account_id"
+  end
+
   create_table "messages", id: :serial, force: :cascade do |t|
     t.text "content"
     t.integer "account_id", null: false
diff --git a/spec/controllers/api/v1/accounts/labels_controller_spec.rb b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
index a3d6fb347..3958390ab 100644
--- a/spec/controllers/api/v1/accounts/labels_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
@@ -1,12 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Label API', type: :request do
-  let(:account) { create(:account) }
-  let(:conversation) { create(:conversation, account: account) }
-
-  before do
-    conversation.update_labels('label1, label2')
-  end
+  let!(:account) { create(:account) }
+  let!(:label) { create(:label, account: account) }
 
   describe 'GET /api/v1/accounts/{account.id}/labels' do
     context 'when it is an unauthenticated user' do
@@ -18,7 +14,7 @@ RSpec.describe 'Label API', type: :request do
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:agent) { create(:user, account: account, role: :administrator) }
 
       it 'returns all the labels in account' do
         get "/api/v1/accounts/#{account.id}/labels",
@@ -26,33 +22,82 @@ RSpec.describe 'Label API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(response.body).to include('label1')
-        expect(response.body).to include('label2')
+        expect(response.body).to include(label.title)
       end
     end
   end
 
-  describe 'GET /api/v1/accounts/{account.id}/labels/most_used' do
+  describe 'GET /api/v1/accounts/{account.id}/labels/:id' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get "/api/v1/accounts/#{account.id}/labels"
+        get "/api/v1/accounts/#{account.id}/labels/#{label.id}"
 
         expect(response).to have_http_status(:unauthorized)
       end
     end
 
     context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
+      let(:admin) { create(:user, account: account, role: :administrator) }
 
-      it 'returns most used labels' do
-        get "/api/v1/accounts/#{account.id}/labels/most_used",
-            headers: agent.create_new_auth_token,
-            params: { count: 1 },
+      it 'shows the contact' do
+        get "/api/v1/accounts/#{account.id}/labels/#{label.id}",
+            headers: admin.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(response.body).to include('label1')
-        expect(response.body).not_to include('label2')
+        expect(response.body).to include(label.title)
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/labels' do
+    let(:valid_params) { { label: { title: 'test' } } }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        expect { post "/api/v1/accounts/#{account.id}/labels", params: valid_params }.to change(Label, :count).by(0)
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'creates the contact' do
+        expect do
+          post "/api/v1/accounts/#{account.id}/labels", headers: admin.create_new_auth_token,
+                                                        params: valid_params
+        end.to change(Label, :count).by(1)
+
+        expect(response).to have_http_status(:success)
+      end
+    end
+  end
+
+  describe 'PATCH /api/v1/accounts/{account.id}/labels/:id' do
+    let(:valid_params) { { title: 'Test 2' }  }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        put "/api/v1/accounts/#{account.id}/labels/#{label.id}",
+            params: valid_params
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'updates the label' do
+        patch "/api/v1/accounts/#{account.id}/labels/#{label.id}",
+              headers: admin.create_new_auth_token,
+              params: valid_params,
+              as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(label.reload.title).to eq('Test 2')
       end
     end
   end
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
new file mode 100644
index 000000000..4602a8d1d
--- /dev/null
+++ b/spec/factories/labels.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :label do
+    account
+    sequence(:title) { |n| "Label #{n}" }
+  end
+end
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
new file mode 100644
index 000000000..f44b4e07e
--- /dev/null
+++ b/spec/models/label_spec.rb
@@ -0,0 +1,7 @@
+require 'rails_helper'
+
+RSpec.describe Label, type: :model do
+  describe 'associations' do
+    it { is_expected.to belong_to(:account) }
+  end
+end

From 051871a3cdf2b460a825c38339bebe74186b4b6b Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sun, 7 Jun 2020 13:58:05 +0530
Subject: [PATCH 06/50] Chore: Code Cleanup in API controllers (#932)

* Chore: Code Cleanup in API controllers

* Remove unnecessary scoping for accounts controller
---
 app/controllers/api/base_controller.rb        |   4 -
 .../actions/contact_merges_controller.rb      |   6 +-
 .../api/v1/accounts/agents_controller.rb      |   6 +-
 .../api/v1/accounts/base_controller.rb        |  31 +++++
 .../api/v1/accounts/callbacks_controller.rb   |  14 +--
 .../accounts/canned_responses_controller.rb   |  10 +-
 .../channels/twilio_channels_controller.rb    |   7 +-
 .../contacts/conversations_controller.rb      |   6 +-
 .../api/v1/accounts/contacts_controller.rb    |  10 +-
 .../conversations/assignments_controller.rb   |   6 +-
 .../accounts/conversations/base_controller.rb |   9 ++
 .../conversations/labels_controller.rb        |   4 +-
 .../conversations/messages_controller.rb      |   4 +-
 .../v1/accounts/conversations_controller.rb   |   7 +-
 .../facebook_indicators_controller.rb         |   4 +-
 .../v1/accounts/inbox_members_controller.rb   |   6 +-
 .../api/v1/accounts/inboxes_controller.rb     |  11 +-
 .../api/v1/accounts/labels_controller.rb      |   8 +-
 .../notification_settings_controller.rb       |   4 +-
 .../v1/accounts/notifications_controller.rb   |   4 +-
 .../v1/accounts/subscriptions_controller.rb   |   6 +-
 .../api/v1/accounts/webhooks_controller.rb    |   9 +-
 .../v1/{accounts => }/accounts_controller.rb  |   2 +-
 .../api/v1/widget/base_controller.rb          |   3 +
 .../api/v1/widget/contacts_controller.rb      |   3 -
 .../api/v1/widget/conversations_controller.rb |   2 -
 .../api/v1/widget/events_controller.rb        |   2 -
 .../api/v1/widget/inbox_members_controller.rb |   2 +-
 .../api/v1/widget/labels_controller.rb        |   3 -
 .../api/v1/widget/messages_controller.rb      |   2 -
 .../api/v2/accounts/reports_controller.rb     |   6 +-
 app/controllers/application_controller.rb     |  44 ++-----
 config/routes.rb                              | 111 +++++++++---------
 .../v1/accounts/contacts_controller_spec.rb   |   2 +-
 .../accounts_controller_spec.rb               |   0
 35 files changed, 176 insertions(+), 182 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/base_controller.rb
 create mode 100644 app/controllers/api/v1/accounts/conversations/base_controller.rb
 rename app/controllers/api/v1/{accounts => }/accounts_controller.rb (96%)
 rename spec/controllers/api/v1/{accounts => }/accounts_controller_spec.rb (100%)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 8db37ced7..9be255080 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -11,10 +11,6 @@ class Api::BaseController < ApplicationController
     request.headers[:api_access_token].present? || request.headers[:HTTP_API_ACCESS_TOKEN].present?
   end
 
-  def set_conversation
-    @conversation ||= current_account.conversations.find_by(display_id: params[:conversation_id])
-  end
-
   def check_billing_enabled
     raise ActionController::RoutingError, 'Not Found' unless ENV['BILLING_ENABLED']
   end
diff --git a/app/controllers/api/v1/accounts/actions/contact_merges_controller.rb b/app/controllers/api/v1/accounts/actions/contact_merges_controller.rb
index 1296b6a55..9daee7b04 100644
--- a/app/controllers/api/v1/accounts/actions/contact_merges_controller.rb
+++ b/app/controllers/api/v1/accounts/actions/contact_merges_controller.rb
@@ -1,10 +1,10 @@
-class Api::V1::Accounts::Actions::ContactMergesController < Api::BaseController
+class Api::V1::Accounts::Actions::ContactMergesController < Api::V1::Accounts::BaseController
   before_action :set_base_contact, only: [:create]
   before_action :set_mergee_contact, only: [:create]
 
   def create
     contact_merge_action = ContactMergeAction.new(
-      account: current_account,
+      account: Current.account,
       base_contact: @base_contact,
       mergee_contact: @mergee_contact
     )
@@ -23,6 +23,6 @@ class Api::V1::Accounts::Actions::ContactMergesController < Api::BaseController
   end
 
   def contacts
-    @contacts ||= current_account.contacts
+    @contacts ||= Current.account.contacts
   end
 end
diff --git a/app/controllers/api/v1/accounts/agents_controller.rb b/app/controllers/api/v1/accounts/agents_controller.rb
index 85a05fbc1..030c08045 100644
--- a/app/controllers/api/v1/accounts/agents_controller.rb
+++ b/app/controllers/api/v1/accounts/agents_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::AgentsController < Api::BaseController
+class Api::V1::Accounts::AgentsController < Api::V1::Accounts::BaseController
   before_action :fetch_agent, except: [:create, :index]
   before_action :check_authorization
   before_action :find_user, only: [:create]
@@ -46,7 +46,7 @@ class Api::V1::Accounts::AgentsController < Api::BaseController
 
   def save_account_user
     AccountUser.create!(
-      account_id: current_account.id,
+      account_id: Current.account.id,
       user_id: @user.id,
       role: new_agent_params[:role],
       inviter_id: current_user.id
@@ -64,6 +64,6 @@ class Api::V1::Accounts::AgentsController < Api::BaseController
   end
 
   def agents
-    @agents ||= current_account.users
+    @agents ||= Current.account.users
   end
 end
diff --git a/app/controllers/api/v1/accounts/base_controller.rb b/app/controllers/api/v1/accounts/base_controller.rb
new file mode 100644
index 000000000..01a0746b7
--- /dev/null
+++ b/app/controllers/api/v1/accounts/base_controller.rb
@@ -0,0 +1,31 @@
+class Api::V1::Accounts::BaseController < Api::BaseController
+  before_action :current_account
+
+  private
+
+  def current_account
+    @current_account ||= ensure_current_account
+    Current.account = @current_account
+  end
+
+  def ensure_current_account
+    account = Account.find(params[:account_id])
+    if current_user
+      account_accessible_for_user?(account)
+    elsif @resource&.is_a?(AgentBot)
+      account_accessible_for_bot?(account)
+    end
+    switch_locale account
+    account
+  end
+
+  def account_accessible_for_user?(account)
+    @current_account_user = account.account_users.find_by(user_id: current_user.id)
+    Current.account_user = @current_account_user
+    render_unauthorized('You are not authorized to access this account') unless @current_account_user
+  end
+
+  def account_accessible_for_bot?(account)
+    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
+  end
+end
diff --git a/app/controllers/api/v1/accounts/callbacks_controller.rb b/app/controllers/api/v1/accounts/callbacks_controller.rb
index 54c7bace4..77e46d669 100644
--- a/app/controllers/api/v1/accounts/callbacks_controller.rb
+++ b/app/controllers/api/v1/accounts/callbacks_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::CallbacksController < Api::BaseController
+class Api::V1::Accounts::CallbacksController < Api::V1::Accounts::BaseController
   before_action :inbox, only: [:reauthorize_page]
 
   def register_facebook_page
@@ -7,11 +7,11 @@ class Api::V1::Accounts::CallbacksController < Api::BaseController
     page_id = params[:page_id]
     inbox_name = params[:inbox_name]
     ActiveRecord::Base.transaction do
-      facebook_channel = current_account.facebook_pages.create!(
+      facebook_channel = Current.account.facebook_pages.create!(
         page_id: page_id, user_access_token: user_access_token,
         page_access_token: page_access_token
       )
-      @facebook_inbox = current_account.inboxes.create!(name: inbox_name, channel: facebook_channel)
+      @facebook_inbox = Current.account.inboxes.create!(name: inbox_name, channel: facebook_channel)
       set_avatar(@facebook_inbox, page_id)
     rescue StandardError => e
       Rails.logger.info e
@@ -22,7 +22,7 @@ class Api::V1::Accounts::CallbacksController < Api::BaseController
     @page_details = mark_already_existing_facebook_pages(fb_object.get_connections('me', 'accounts'))
   end
 
-  # get params[:inbox_id], current_account, params[:omniauth_token]
+  # get params[:inbox_id], current_account. params[:omniauth_token]
   def reauthorize_page
     if @inbox&.facebook?
       fb_page_id = @inbox.channel.page_id
@@ -40,7 +40,7 @@ class Api::V1::Accounts::CallbacksController < Api::BaseController
   private
 
   def inbox
-    @inbox = current_account.inboxes.find_by(id: params[:inbox_id])
+    @inbox = Current.account.inboxes.find_by(id: params[:inbox_id])
   end
 
   def update_fb_page(fb_page_id, access_token)
@@ -50,7 +50,7 @@ class Api::V1::Accounts::CallbacksController < Api::BaseController
   end
 
   def get_fb_page(fb_page_id)
-    current_account.facebook_pages.find_by(page_id: fb_page_id)
+    Current.account.facebook_pages.find_by(page_id: fb_page_id)
   end
 
   def fb_object
@@ -69,7 +69,7 @@ class Api::V1::Accounts::CallbacksController < Api::BaseController
     return [] if data.empty?
 
     data.inject([]) do |result, page_detail|
-      page_detail[:exists] = current_account.facebook_pages.exists?(page_id: page_detail['id']) ? true : false
+      page_detail[:exists] = Current.account.facebook_pages.exists?(page_id: page_detail['id']) ? true : false
       result << page_detail
     end
   end
diff --git a/app/controllers/api/v1/accounts/canned_responses_controller.rb b/app/controllers/api/v1/accounts/canned_responses_controller.rb
index b76da5f8c..16e16e4a6 100644
--- a/app/controllers/api/v1/accounts/canned_responses_controller.rb
+++ b/app/controllers/api/v1/accounts/canned_responses_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::CannedResponsesController < Api::BaseController
+class Api::V1::Accounts::CannedResponsesController < Api::V1::Accounts::BaseController
   before_action :fetch_canned_response, only: [:update, :destroy]
 
   def index
@@ -6,7 +6,7 @@ class Api::V1::Accounts::CannedResponsesController < Api::BaseController
   end
 
   def create
-    @canned_response = current_account.canned_responses.new(canned_response_params)
+    @canned_response = Current.account.canned_responses.new(canned_response_params)
     @canned_response.save!
     render json: @canned_response
   end
@@ -24,7 +24,7 @@ class Api::V1::Accounts::CannedResponsesController < Api::BaseController
   private
 
   def fetch_canned_response
-    @canned_response = current_account.canned_responses.find(params[:id])
+    @canned_response = Current.account.canned_responses.find(params[:id])
   end
 
   def canned_response_params
@@ -33,9 +33,9 @@ class Api::V1::Accounts::CannedResponsesController < Api::BaseController
 
   def canned_responses
     if params[:search]
-      current_account.canned_responses.where('short_code ILIKE ?', "#{params[:search]}%")
+      Current.account.canned_responses.where('short_code ILIKE ?', "#{params[:search]}%")
     else
-      current_account.canned_responses
+      Current.account.canned_responses
     end
   end
 end
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 8011d3891..ffbc78eb5 100644
--- a/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb
+++ b/app/controllers/api/v1/accounts/channels/twilio_channels_controller.rb
@@ -1,5 +1,4 @@
-class Api::V1::Accounts::Channels::TwilioChannelsController < Api::BaseController
-  before_action :current_account
+class Api::V1::Accounts::Channels::TwilioChannelsController < Api::V1::Accounts::BaseController
   before_action :authorize_request
 
   def create
@@ -38,13 +37,13 @@ class Api::V1::Accounts::Channels::TwilioChannelsController < Api::BaseControlle
   end
 
   def build_inbox
-    @twilio_channel = current_account.twilio_sms.create!(
+    @twilio_channel = Current.account.twilio_sms.create!(
       account_sid: permitted_params[:account_sid],
       auth_token: permitted_params[:auth_token],
       phone_number: phone_number,
       medium: medium
     )
-    @inbox = current_account.inboxes.create(
+    @inbox = Current.account.inboxes.create(
       name: permitted_params[:name],
       channel: @twilio_channel
     )
diff --git a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
index 8fcb4df13..5c7bf77d7 100644
--- a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
@@ -1,6 +1,6 @@
-class Api::V1::Accounts::Contacts::ConversationsController < Api::BaseController
+class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::BaseController
   def index
-    @conversations = current_account.conversations.includes(
+    @conversations = Current.account.conversations.includes(
       :assignee, :contact, :inbox
     ).where(inbox_id: inbox_ids, contact_id: permitted_params[:contact_id])
   end
@@ -9,7 +9,7 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::BaseController
 
   def inbox_ids
     if current_user.administrator?
-      current_account.inboxes.pluck(:id)
+      Current.account.inboxes.pluck(:id)
     elsif current_user.agent?
       current_user.assigned_inboxes.pluck(:id)
     else
diff --git a/app/controllers/api/v1/accounts/contacts_controller.rb b/app/controllers/api/v1/accounts/contacts_controller.rb
index a3713660b..2208a2cf6 100644
--- a/app/controllers/api/v1/accounts/contacts_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts_controller.rb
@@ -1,17 +1,17 @@
-class Api::V1::Accounts::ContactsController < Api::BaseController
+class Api::V1::Accounts::ContactsController < Api::V1::Accounts::BaseController
   protect_from_forgery with: :null_session
 
   before_action :check_authorization
   before_action :fetch_contact, only: [:show, :update]
 
   def index
-    @contacts = current_account.contacts
+    @contacts = Current.account.contacts
   end
 
   def show; end
 
   def create
-    @contact = Contact.new(contact_create_params)
+    @contact = Current.account.contacts.new(contact_create_params)
     @contact.save!
     render json: @contact
   end
@@ -31,10 +31,10 @@ class Api::V1::Accounts::ContactsController < Api::BaseController
   end
 
   def fetch_contact
-    @contact = current_account.contacts.find(params[:id])
+    @contact = Current.account.contacts.find(params[:id])
   end
 
   def contact_create_params
-    params.require(:contact).permit(:account_id, :inbox_id).merge!(name: SecureRandom.hex)
+    params.require(:contact).permit(:name, :email, :phone_number)
   end
 end
diff --git a/app/controllers/api/v1/accounts/conversations/assignments_controller.rb b/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
index 6da3c05da..58fbc5b4e 100644
--- a/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/assignments_controller.rb
@@ -1,10 +1,8 @@
-class Api::V1::Accounts::Conversations::AssignmentsController < Api::BaseController
-  before_action :set_conversation, only: [:create]
-
+class Api::V1::Accounts::Conversations::AssignmentsController < Api::V1::Accounts::Conversations::BaseController
   # assign agent to a conversation
   def create
     # if params[:assignee_id] is not a valid id, it will set to nil, hence unassigning the conversation
-    assignee = current_account.users.find_by(id: params[:assignee_id])
+    assignee = Current.account.users.find_by(id: params[:assignee_id])
     @conversation.update_assignee(assignee)
     render json: assignee
   end
diff --git a/app/controllers/api/v1/accounts/conversations/base_controller.rb b/app/controllers/api/v1/accounts/conversations/base_controller.rb
new file mode 100644
index 000000000..2dae59abd
--- /dev/null
+++ b/app/controllers/api/v1/accounts/conversations/base_controller.rb
@@ -0,0 +1,9 @@
+class Api::V1::Accounts::Conversations::BaseController < Api::V1::Accounts::BaseController
+  before_action :conversation
+
+  private
+
+  def conversation
+    @conversation ||= Current.account.conversations.find_by(display_id: params[:conversation_id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/conversations/labels_controller.rb b/app/controllers/api/v1/accounts/conversations/labels_controller.rb
index 3e80e2825..306544200 100644
--- a/app/controllers/api/v1/accounts/conversations/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/labels_controller.rb
@@ -1,6 +1,4 @@
-class Api::V1::Accounts::Conversations::LabelsController < Api::BaseController
-  before_action :set_conversation, only: [:create, :index]
-
+class Api::V1::Accounts::Conversations::LabelsController < Api::V1::Accounts::Conversations::BaseController
   def create
     @conversation.update_labels(params[:labels])
     @labels = @conversation.label_list
diff --git a/app/controllers/api/v1/accounts/conversations/messages_controller.rb b/app/controllers/api/v1/accounts/conversations/messages_controller.rb
index d0ed39edb..601db872f 100644
--- a/app/controllers/api/v1/accounts/conversations/messages_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/messages_controller.rb
@@ -1,6 +1,4 @@
-class Api::V1::Accounts::Conversations::MessagesController < Api::BaseController
-  before_action :set_conversation, only: [:index, :create]
-
+class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::Conversations::BaseController
   def index
     @messages = message_finder.perform
   end
diff --git a/app/controllers/api/v1/accounts/conversations_controller.rb b/app/controllers/api/v1/accounts/conversations_controller.rb
index fcda432a5..8d8099fdc 100644
--- a/app/controllers/api/v1/accounts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations_controller.rb
@@ -1,6 +1,5 @@
-class Api::V1::Accounts::ConversationsController < Api::BaseController
+class Api::V1::Accounts::ConversationsController < Api::V1::Accounts::BaseController
   include Events::Types
-  before_action :current_account
   before_action :conversation, except: [:index]
   before_action :contact_inbox, only: [:create]
 
@@ -62,7 +61,7 @@ class Api::V1::Accounts::ConversationsController < Api::BaseController
   end
 
   def conversation
-    @conversation ||= current_account.conversations.find_by(display_id: params[:id])
+    @conversation ||= Current.account.conversations.find_by(display_id: params[:id])
   end
 
   def contact_inbox
@@ -71,7 +70,7 @@ class Api::V1::Accounts::ConversationsController < Api::BaseController
 
   def conversation_params
     {
-      account_id: current_account.id,
+      account_id: Current.account.id,
       inbox_id: @contact_inbox.inbox_id,
       contact_id: @contact_inbox.contact_id,
       contact_inbox_id: @contact_inbox.id
diff --git a/app/controllers/api/v1/accounts/facebook_indicators_controller.rb b/app/controllers/api/v1/accounts/facebook_indicators_controller.rb
index 7cea774cf..a0e42c040 100644
--- a/app/controllers/api/v1/accounts/facebook_indicators_controller.rb
+++ b/app/controllers/api/v1/accounts/facebook_indicators_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::FacebookIndicatorsController < Api::BaseController
+class Api::V1::Accounts::FacebookIndicatorsController < Api::V1::Accounts::BaseController
   before_action :set_access_token
   around_action :handle_with_exception
 
@@ -38,7 +38,7 @@ class Api::V1::Accounts::FacebookIndicatorsController < Api::BaseController
   end
 
   def inbox
-    @inbox ||= current_account.inboxes.find(permitted_params[:inbox_id])
+    @inbox ||= Current.account.inboxes.find(permitted_params[:inbox_id])
   end
 
   def set_access_token
diff --git a/app/controllers/api/v1/accounts/inbox_members_controller.rb b/app/controllers/api/v1/accounts/inbox_members_controller.rb
index f71b3869d..9ad2ef93d 100644
--- a/app/controllers/api/v1/accounts/inbox_members_controller.rb
+++ b/app/controllers/api/v1/accounts/inbox_members_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::InboxMembersController < Api::BaseController
+class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseController
   before_action :fetch_inbox, only: [:create, :show]
   before_action :current_agents_ids, only: [:create]
 
@@ -12,7 +12,7 @@ class Api::V1::Accounts::InboxMembersController < Api::BaseController
   end
 
   def show
-    @agents = current_account.users.where(id: @inbox.members.pluck(:user_id))
+    @agents = Current.account.users.where(id: @inbox.members.pluck(:user_id))
   end
 
   private
@@ -40,6 +40,6 @@ class Api::V1::Accounts::InboxMembersController < Api::BaseController
   end
 
   def fetch_inbox
-    @inbox = current_account.inboxes.find(params[:inbox_id])
+    @inbox = Current.account.inboxes.find(params[:inbox_id])
   end
 end
diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index 8fdde8cc0..fe19400c3 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -1,17 +1,16 @@
-class Api::V1::Accounts::InboxesController < Api::BaseController
-  before_action :current_account
+class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   before_action :fetch_inbox, except: [:index, :create]
   before_action :fetch_agent_bot, only: [:set_agent_bot]
   before_action :check_authorization
 
   def index
-    @inboxes = policy_scope(current_account.inboxes)
+    @inboxes = policy_scope(Current.account.inboxes)
   end
 
   def create
     ActiveRecord::Base.transaction do
       channel = web_widgets.create!(permitted_params[:channel].except(:type)) if permitted_params[:channel][:type] == 'web_widget'
-      @inbox = current_account.inboxes.build(name: permitted_params[:name], channel: channel)
+      @inbox = Current.account.inboxes.build(name: permitted_params[:name], channel: channel)
       @inbox.avatar.attach(permitted_params[:avatar])
       @inbox.save!
     end
@@ -41,7 +40,7 @@ class Api::V1::Accounts::InboxesController < Api::BaseController
   private
 
   def fetch_inbox
-    @inbox = current_account.inboxes.find(params[:id])
+    @inbox = Current.account.inboxes.find(params[:id])
   end
 
   def fetch_agent_bot
@@ -49,7 +48,7 @@ class Api::V1::Accounts::InboxesController < Api::BaseController
   end
 
   def web_widgets
-    current_account.web_widgets
+    Current.account.web_widgets
   end
 
   def check_authorization
diff --git a/app/controllers/api/v1/accounts/labels_controller.rb b/app/controllers/api/v1/accounts/labels_controller.rb
index 5db0fb87b..12f0d404a 100644
--- a/app/controllers/api/v1/accounts/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/labels_controller.rb
@@ -1,16 +1,16 @@
-class Api::V1::Accounts::LabelsController < Api::BaseController
+class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
   before_action :current_account
   before_action :fetch_label, except: [:index, :create]
   before_action :check_authorization
 
   def index
-    @labels = policy_scope(current_account.labels)
+    @labels = policy_scope(Current.account.labels)
   end
 
   def show; end
 
   def create
-    @label = current_account.labels.create!(permitted_params)
+    @label = Current.account.labels.create!(permitted_params)
   end
 
   def update
@@ -25,7 +25,7 @@ class Api::V1::Accounts::LabelsController < Api::BaseController
   private
 
   def fetch_label
-    @label = current_account.labels.find(params[:id])
+    @label = Current.account.labels.find(params[:id])
   end
 
   def check_authorization
diff --git a/app/controllers/api/v1/accounts/notification_settings_controller.rb b/app/controllers/api/v1/accounts/notification_settings_controller.rb
index 14496969d..febad1a98 100644
--- a/app/controllers/api/v1/accounts/notification_settings_controller.rb
+++ b/app/controllers/api/v1/accounts/notification_settings_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::NotificationSettingsController < Api::BaseController
+class Api::V1::Accounts::NotificationSettingsController < Api::V1::Accounts::BaseController
   before_action :set_user, :load_notification_setting
 
   def show; end
@@ -16,7 +16,7 @@ class Api::V1::Accounts::NotificationSettingsController < Api::BaseController
   end
 
   def load_notification_setting
-    @notification_setting = @user.notification_settings.find_by(account_id: current_account.id)
+    @notification_setting = @user.notification_settings.find_by(account_id: Current.account.id)
   end
 
   def notification_setting_params
diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 5d9a5ea54..0f82d0013 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -1,10 +1,10 @@
-class Api::V1::Accounts::NotificationsController < Api::BaseController
+class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseController
   protect_from_forgery with: :null_session
 
   before_action :fetch_notification, only: [:update]
 
   def index
-    @notifications = current_user.notifications.where(account_id: current_account.id)
+    @notifications = current_user.notifications.where(account_id: Current.account.id)
     render json: @notifications
   end
 
diff --git a/app/controllers/api/v1/accounts/subscriptions_controller.rb b/app/controllers/api/v1/accounts/subscriptions_controller.rb
index f9b3141d6..4c4f6de01 100644
--- a/app/controllers/api/v1/accounts/subscriptions_controller.rb
+++ b/app/controllers/api/v1/accounts/subscriptions_controller.rb
@@ -1,13 +1,13 @@
-class Api::V1::Accounts::SubscriptionsController < Api::BaseController
+class Api::V1::Accounts::SubscriptionsController < Api::V1::Accounts::BaseController
   skip_before_action :check_subscription
 
   before_action :check_billing_enabled
 
   def index
-    render json: current_account.subscription_data
+    render json: Current.account.subscription_data
   end
 
   def status
-    render json: current_account.subscription.summary
+    render json: Current.account.subscription.summary
   end
 end
diff --git a/app/controllers/api/v1/accounts/webhooks_controller.rb b/app/controllers/api/v1/accounts/webhooks_controller.rb
index d3afba2af..9e61904d6 100644
--- a/app/controllers/api/v1/accounts/webhooks_controller.rb
+++ b/app/controllers/api/v1/accounts/webhooks_controller.rb
@@ -1,14 +1,13 @@
-class Api::V1::Accounts::WebhooksController < Api::BaseController
-  before_action :current_account
+class Api::V1::Accounts::WebhooksController < Api::V1::Accounts::BaseController
   before_action :check_authorization
   before_action :fetch_webhook, only: [:update, :destroy]
 
   def index
-    @webhooks = current_account.webhooks
+    @webhooks = Current.account.webhooks
   end
 
   def create
-    @webhook = current_account.webhooks.new(webhook_params)
+    @webhook = Current.account.webhooks.new(webhook_params)
     @webhook.save!
   end
 
@@ -28,7 +27,7 @@ class Api::V1::Accounts::WebhooksController < Api::BaseController
   end
 
   def fetch_webhook
-    @webhook = current_account.webhooks.find(params[:id])
+    @webhook = Current.account.webhooks.find(params[:id])
   end
 
   def check_authorization
diff --git a/app/controllers/api/v1/accounts/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
similarity index 96%
rename from app/controllers/api/v1/accounts/accounts_controller.rb
rename to app/controllers/api/v1/accounts_controller.rb
index adb8bf11c..d23f535a5 100644
--- a/app/controllers/api/v1/accounts/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -1,4 +1,4 @@
-class Api::V1::Accounts::AccountsController < Api::BaseController
+class Api::V1::AccountsController < Api::BaseController
   include AuthHelper
 
   skip_before_action :verify_authenticity_token, only: [:create]
diff --git a/app/controllers/api/v1/widget/base_controller.rb b/app/controllers/api/v1/widget/base_controller.rb
index 86bffb710..45cf3fc4f 100644
--- a/app/controllers/api/v1/widget/base_controller.rb
+++ b/app/controllers/api/v1/widget/base_controller.rb
@@ -1,4 +1,7 @@
 class Api::V1::Widget::BaseController < ApplicationController
+  before_action :set_web_widget
+  before_action :set_contact
+
   private
 
   def conversation
diff --git a/app/controllers/api/v1/widget/contacts_controller.rb b/app/controllers/api/v1/widget/contacts_controller.rb
index b7ac793e7..2a2b184fb 100644
--- a/app/controllers/api/v1/widget/contacts_controller.rb
+++ b/app/controllers/api/v1/widget/contacts_controller.rb
@@ -1,7 +1,4 @@
 class Api::V1::Widget::ContactsController < Api::V1::Widget::BaseController
-  before_action :set_web_widget
-  before_action :set_contact
-
   def update
     contact_identify_action = ContactIdentifyAction.new(
       contact: @contact,
diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index cdfbd9d4a..e346b6367 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -1,7 +1,5 @@
 class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
   include Events::Types
-  before_action :set_web_widget
-  before_action :set_contact
 
   def index
     @conversation = conversation
diff --git a/app/controllers/api/v1/widget/events_controller.rb b/app/controllers/api/v1/widget/events_controller.rb
index faa44994c..b32b0f78d 100644
--- a/app/controllers/api/v1/widget/events_controller.rb
+++ b/app/controllers/api/v1/widget/events_controller.rb
@@ -1,7 +1,5 @@
 class Api::V1::Widget::EventsController < Api::V1::Widget::BaseController
   include Events::Types
-  before_action :set_web_widget
-  before_action :set_contact
 
   def create
     Rails.configuration.dispatcher.dispatch(permitted_params[:name], Time.zone.now, contact_inbox: @contact_inbox)
diff --git a/app/controllers/api/v1/widget/inbox_members_controller.rb b/app/controllers/api/v1/widget/inbox_members_controller.rb
index d978a9b6e..da7d6256b 100644
--- a/app/controllers/api/v1/widget/inbox_members_controller.rb
+++ b/app/controllers/api/v1/widget/inbox_members_controller.rb
@@ -1,5 +1,5 @@
 class Api::V1::Widget::InboxMembersController < Api::V1::Widget::BaseController
-  before_action :set_web_widget
+  skip_before_action :set_contact
 
   def index
     @inbox_members = @web_widget.inbox.inbox_members.includes(:user)
diff --git a/app/controllers/api/v1/widget/labels_controller.rb b/app/controllers/api/v1/widget/labels_controller.rb
index efe84f5e3..e8e409244 100644
--- a/app/controllers/api/v1/widget/labels_controller.rb
+++ b/app/controllers/api/v1/widget/labels_controller.rb
@@ -1,7 +1,4 @@
 class Api::V1::Widget::LabelsController < Api::V1::Widget::BaseController
-  before_action :set_web_widget
-  before_action :set_contact
-
   def create
     conversation.label_list.add(permitted_params[:label])
     conversation.save!
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index a65e01f9c..366aa3912 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -1,6 +1,4 @@
 class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
-  before_action :set_web_widget
-  before_action :set_contact
   before_action :set_conversation, only: [:create]
   before_action :set_message, only: [:update]
 
diff --git a/app/controllers/api/v2/accounts/reports_controller.rb b/app/controllers/api/v2/accounts/reports_controller.rb
index 6aa0355a4..c4f563d5d 100644
--- a/app/controllers/api/v2/accounts/reports_controller.rb
+++ b/app/controllers/api/v2/accounts/reports_controller.rb
@@ -1,6 +1,6 @@
-class Api::V2::Accounts::ReportsController < Api::BaseController
+class Api::V2::Accounts::ReportsController < Api::V1::Accounts::BaseController
   def account
-    builder = V2::ReportBuilder.new(current_account, account_report_params)
+    builder = V2::ReportBuilder.new(Current.account, account_report_params)
     data = builder.build
     render json: data
   end
@@ -29,7 +29,7 @@ class Api::V2::Accounts::ReportsController < Api::BaseController
   end
 
   def account_summary_metrics
-    builder = V2::ReportBuilder.new(current_account, account_summary_params)
+    builder = V2::ReportBuilder.new(Current.account, account_summary_params)
     builder.summary
   end
 end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ae3e5e857..ab1be9b9b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -13,40 +13,6 @@ class ApplicationController < ActionController::Base
 
   private
 
-  def current_account
-    @current_account ||= find_current_account
-    Current.account = @current_account
-  end
-
-  def find_current_account
-    account = Account.find(params[:account_id])
-    if current_user
-      account_accessible_for_user?(account)
-    elsif @resource&.is_a?(AgentBot)
-      account_accessible_for_bot?(account)
-    end
-    switch_locale account
-    account
-  end
-
-  def switch_locale(account)
-    # priority is for locale set in query string (mostly for widget/from js sdk)
-    locale ||= (I18n.available_locales.map(&:to_s).include?(params[:locale]) ? params[:locale] : nil)
-    # if local is not set in param, lets try account
-    locale ||= (I18n.available_locales.map(&:to_s).include?(account.locale) ? account.locale : nil)
-    I18n.locale = locale || I18n.default_locale
-  end
-
-  def account_accessible_for_user?(account)
-    @current_account_user = account.account_users.find_by(user_id: current_user.id)
-    Current.account_user = @current_account_user
-    render_unauthorized('You are not authorized to access this account') unless @current_account_user
-  end
-
-  def account_accessible_for_bot?(account)
-    render_unauthorized('You are not authorized to access this account') unless @resource.agent_bot_inboxes.find_by(account_id: account.id)
-  end
-
   def handle_with_exception
     yield
   rescue ActiveRecord::RecordNotFound => e
@@ -65,7 +31,7 @@ class ApplicationController < ActionController::Base
   end
 
   def current_subscription
-    @subscription ||= current_account.subscription
+    @subscription ||= Current.account.subscription
   end
 
   def render_unauthorized(message)
@@ -94,6 +60,14 @@ class ApplicationController < ActionController::Base
     render json: exception.to_hash, status: exception.http_status
   end
 
+  def switch_locale(account)
+    # priority is for locale set in query string (mostly for widget/from js sdk)
+    locale ||= (I18n.available_locales.map(&:to_s).include?(params[:locale]) ? params[:locale] : nil)
+    # if local is not set in param, lets try account
+    locale ||= (I18n.available_locales.map(&:to_s).include?(account.locale) ? account.locale : nil)
+    I18n.locale = locale || I18n.default_locale
+  end
+
   def check_subscription
     # This block is left over from the initial version of chatwoot
     # We might reuse this later in the hosted version of chatwoot.
diff --git a/config/routes.rb b/config/routes.rb
index dc1172660..b0a9b9388 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -22,73 +22,76 @@ Rails.application.routes.draw do
     namespace :v1 do
       # ----------------------------------
       # start of account scoped api routes
-      resources :accounts, only: [:create, :show, :update], module: :accounts do
+      resources :accounts, only: [:create, :show, :update] do
         member do
           post :update_active_at
         end
-        namespace :actions do
-          resource :contact_merge, only: [:create]
-        end
 
-        resources :agents, except: [:show, :edit, :new]
-        resources :callbacks, only: [] do
-          collection do
-            post :register_facebook_page
-            get :register_facebook_page
-            post :facebook_pages
-            post :reauthorize_page
+        scope module: :accounts do
+          namespace :actions do
+            resource :contact_merge, only: [:create]
           end
-        end
-        resources :canned_responses, except: [:show, :edit, :new]
-        namespace :channels do
-          resource :twilio_channel, only: [:create]
-        end
-        resources :conversations, only: [:index, :create, :show] do
-          get 'meta', on: :collection
-          scope module: :conversations do
-            resources :messages, only: [:index, :create]
-            resources :assignments, only: [:create]
-            resources :labels, only: [:create, :index]
+
+          resources :agents, except: [:show, :edit, :new]
+          resources :callbacks, only: [] do
+            collection do
+              post :register_facebook_page
+              get :register_facebook_page
+              post :facebook_pages
+              post :reauthorize_page
+            end
           end
-          member do
-            post :mute
-            post :toggle_status
-            post :toggle_typing_status
-            post :update_last_seen
+          resources :canned_responses, except: [:show, :edit, :new]
+          namespace :channels do
+            resource :twilio_channel, only: [:create]
           end
-        end
-
-        resources :contacts, only: [:index, :show, :update, :create] do
-          scope module: :contacts do
-            resources :conversations, only: [:index]
+          resources :conversations, only: [:index, :create, :show] do
+            get 'meta', on: :collection
+            scope module: :conversations do
+              resources :messages, only: [:index, :create]
+              resources :assignments, only: [:create]
+              resources :labels, only: [:create, :index]
+            end
+            member do
+              post :mute
+              post :toggle_status
+              post :toggle_typing_status
+              post :update_last_seen
+            end
           end
-        end
 
-        resources :facebook_indicators, only: [] do
-          collection do
-            post :mark_seen
-            post :typing_on
-            post :typing_off
+          resources :contacts, only: [:index, :show, :update, :create] do
+            scope module: :contacts do
+              resources :conversations, only: [:index]
+            end
           end
-        end
 
-        resources :inboxes, only: [:index, :create, :update, :destroy] do
-          post :set_agent_bot, on: :member
-        end
-        resources :inbox_members, only: [:create, :show], param: :inbox_id
-
-        resources :labels, only: [:index, :show, :create, :update, :destroy]
-        resources :notifications, only: [:index, :update]
-        resource :notification_settings, only: [:show, :update]
-
-        # this block is only required if subscription via chargebee is enabled
-        resources :subscriptions, only: [:index] do
-          collection do
-            get :summary
+          resources :facebook_indicators, only: [] do
+            collection do
+              post :mark_seen
+              post :typing_on
+              post :typing_off
+            end
           end
-        end
 
-        resources :webhooks, except: [:show]
+          resources :inboxes, only: [:index, :create, :update, :destroy] do
+            post :set_agent_bot, on: :member
+          end
+          resources :inbox_members, only: [:create, :show], param: :inbox_id
+          resources :labels, only: [:index, :show, :create, :update, :destroy]
+
+          resources :notifications, only: [:index, :update]
+          resource :notification_settings, only: [:show, :update]
+
+          # this block is only required if subscription via chargebee is enabled
+          resources :subscriptions, only: [:index] do
+            collection do
+              get :summary
+            end
+          end
+
+          resources :webhooks, except: [:show]
+        end
       end
 
       # end of account scoped api routes
diff --git a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
index 27e5dfd37..1a1b82442 100644
--- a/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/contacts_controller_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'Contacts API', type: :request do
   end
 
   describe 'POST /api/v1/accounts/{account.id}/contacts' do
-    let(:valid_params) { { contact: { account_id: account.id } } }
+    let(:valid_params) { { contact: { name: 'test' } } }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
diff --git a/spec/controllers/api/v1/accounts/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb
similarity index 100%
rename from spec/controllers/api/v1/accounts/accounts_controller_spec.rb
rename to spec/controllers/api/v1/accounts_controller_spec.rb

From 52d28105e4a95259714c49ed80d900b54199a3e2 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sun, 7 Jun 2020 20:31:48 +0530
Subject: [PATCH 07/50] Chore: Remove dead code related to billing (#935)

- remove subscription model
- remove billing-related code
---
 .env.example                                  |   9 --
 .rubocop.yml                                  |   1 -
 .rubocop_todo.yml                             |   3 -
 Gemfile                                       |   3 -
 Gemfile.lock                                  |   5 -
 app/controllers/api/base_controller.rb        |   4 -
 .../v1/accounts/subscriptions_controller.rb   |  13 --
 app/controllers/api/v1/accounts_controller.rb |   2 +-
 .../api/v1/agent_bots_controller.rb           |   1 -
 app/controllers/api/v1/webhooks_controller.rb |  22 ----
 app/controllers/api_controller.rb             |   1 -
 app/controllers/application_controller.rb     |  13 --
 app/dispatchers/async_dispatcher.rb           |   1 -
 app/helpers/api/v1/subscriptions_helper.rb    |   2 -
 app/javascript/dashboard/api/billing.js       |  20 ---
 app/javascript/dashboard/api/endPoints.js     |   8 --
 .../dashboard/assets/scss/_woot.scss          |   1 -
 .../assets/scss/widgets/_billing.scss         |  75 -----------
 .../dashboard/components/layout/Sidebar.vue   |  43 ------
 .../components/widgets/StatusBar.vue          |  24 ----
 app/javascript/dashboard/helper/APIHelper.js  |   7 -
 .../dashboard/i18n/default-sidebar.js         |   9 --
 .../dashboard/i18n/locale/ca/billing.json     |  19 ---
 .../dashboard/i18n/locale/ca/index.js         |   2 -
 .../dashboard/i18n/locale/ca/settings.json    |   1 -
 .../dashboard/i18n/locale/cs/billing.json     |  19 ---
 .../dashboard/i18n/locale/de/billing.json     |  19 ---
 .../dashboard/i18n/locale/de/index.js         |   2 -
 .../dashboard/i18n/locale/de/settings.json    |   1 -
 .../dashboard/i18n/locale/el/billing.json     |  19 ---
 .../dashboard/i18n/locale/el/index.js         |   2 -
 .../dashboard/i18n/locale/el/settings.json    |   1 -
 .../dashboard/i18n/locale/en/agentMgmt.json   |   2 +-
 .../dashboard/i18n/locale/en/billing.json     |  19 ---
 .../dashboard/i18n/locale/en/index.js         |   2 -
 .../dashboard/i18n/locale/en/settings.json    |   1 -
 .../dashboard/i18n/locale/es/billing.json     |  19 ---
 .../dashboard/i18n/locale/es/index.js         |   2 -
 .../dashboard/i18n/locale/es/settings.json    |   1 -
 .../dashboard/i18n/locale/fr/billing.json     |  19 ---
 .../dashboard/i18n/locale/fr/index.js         |   2 -
 .../dashboard/i18n/locale/fr/settings.json    |   1 -
 .../dashboard/i18n/locale/it/billing.json     |  19 ---
 .../dashboard/i18n/locale/ml/billing.json     |  19 ---
 .../dashboard/i18n/locale/ml/index.js         |   2 -
 .../dashboard/i18n/locale/ml/settings.json    |   1 -
 .../dashboard/i18n/locale/nl/billing.json     |  19 ---
 .../dashboard/i18n/locale/nl/index.js         |   2 -
 .../dashboard/i18n/locale/nl/settings.json    |   1 -
 .../dashboard/i18n/locale/pl/billing.json     |  19 ---
 .../dashboard/i18n/locale/pt/billing.json     |  19 ---
 .../dashboard/i18n/locale/pt/index.js         |   2 -
 .../dashboard/i18n/locale/pt/settings.json    |   1 -
 .../dashboard/i18n/locale/pt_BR/billing.json  |  19 ---
 .../dashboard/i18n/locale/pt_BR/index.js      |   2 -
 .../dashboard/i18n/locale/pt_BR/settings.json |   1 -
 .../dashboard/i18n/locale/ro/billing.json     |  19 ---
 .../dashboard/i18n/locale/ro/index.js         |   2 -
 .../dashboard/i18n/locale/ro/settings.json    |   1 -
 .../dashboard/i18n/locale/sv/billing.json     |  19 ---
 .../dashboard/i18n/locale/uk/billing.json     |  19 ---
 .../settings/billing/AccountLocked.vue        |  22 ----
 .../dashboard/settings/billing/Index.vue      | 124 ------------------
 .../settings/billing/billing.routes.js        |  32 -----
 .../dashboard/settings/settings.routes.js     |   2 -
 app/javascript/dashboard/store/index.js       |   2 -
 .../dashboard/store/modules/billing.js        |  60 ---------
 .../dashboard/store/mutation-types.js         |   4 -
 app/listeners/subscription_listener.rb        |  35 -----
 app/models/account.rb                         |  23 ----
 app/models/channel/web_widget.rb              |  19 ++-
 app/models/subscription.rb                    |  57 --------
 app/models/user.rb                            |   1 -
 .../subscription/chargebee_service.rb         |  70 ----------
 app/views/layouts/vueapp.html.erb             |   1 -
 config/initializers/00_init.rb                |   2 -
 config/plans.yml                              |  17 ---
 config/routes.rb                              |  13 --
 .../20200607140737_remove_subscriptions.rb    |  15 +++
 db/schema.rb                                  |  14 +-
 lib/webhooks/chargebee.rb                     |  86 ------------
 .../accounts/subscriptions_controller_spec.rb |  46 -------
 spec/fixtures/subscriptions.yml               |  15 ---
 spec/models/account_spec.rb                   |   1 -
 84 files changed, 27 insertions(+), 1240 deletions(-)
 delete mode 100644 app/controllers/api/v1/accounts/subscriptions_controller.rb
 delete mode 100644 app/helpers/api/v1/subscriptions_helper.rb
 delete mode 100644 app/javascript/dashboard/api/billing.js
 delete mode 100644 app/javascript/dashboard/assets/scss/widgets/_billing.scss
 delete mode 100644 app/javascript/dashboard/components/widgets/StatusBar.vue
 delete mode 100644 app/javascript/dashboard/i18n/locale/ca/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/cs/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/de/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/el/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/en/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/es/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/fr/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/it/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/ml/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/nl/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/pl/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/pt/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/ro/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/sv/billing.json
 delete mode 100644 app/javascript/dashboard/i18n/locale/uk/billing.json
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/billing/AccountLocked.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
 delete mode 100644 app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js
 delete mode 100644 app/javascript/dashboard/store/modules/billing.js
 delete mode 100644 app/listeners/subscription_listener.rb
 delete mode 100644 app/models/subscription.rb
 delete mode 100644 app/services/subscription/chargebee_service.rb
 delete mode 100644 config/initializers/00_init.rb
 delete mode 100644 config/plans.yml
 create mode 100644 db/migrate/20200607140737_remove_subscriptions.rb
 delete mode 100644 lib/webhooks/chargebee.rb
 delete mode 100644 spec/controllers/api/v1/accounts/subscriptions_controller_spec.rb
 delete mode 100644 spec/fixtures/subscriptions.yml

diff --git a/.env.example b/.env.example
index e8ec635f0..7dcbe5e62 100644
--- a/.env.example
+++ b/.env.example
@@ -89,15 +89,6 @@ TWITTER_ENVIRONMENT=
 ## Mobile app env variables
 IOS_APP_ID=6C953F3RX2.com.chatwoot.app
 
-####  This environment variables are only required in hosted version which has billing
-ENABLE_BILLING=
-
-## chargebee settings
-CHARGEBEE_API_KEY=
-CHARGEBEE_SITE=
-CHARGEBEE_WEBHOOK_USERNAME=
-CHARGEBEE_WEBHOOK_PASSWORD=
-
 ## Push Notification
 ## generate a new key value here : https://d3v.one/vapid-key-generator/
 # VAPID_PUBLIC_KEY=
diff --git a/.rubocop.yml b/.rubocop.yml
index fac44c67a..af3e3f831 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -65,7 +65,6 @@ Style/GuardClause:
     - 'app/builders/account_builder.rb'
     - 'app/models/attachment.rb'
     - 'app/models/message.rb'
-    - 'lib/webhooks/chargebee.rb'
     - 'db/migrate/20190819005836_add_missing_indexes_on_taggings.acts_as_taggable_on_engine.rb'
 Metrics/AbcSize:
   Exclude: 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 06a287ae1..2569a6d66 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -88,7 +88,6 @@ Naming/MemoizedInstanceVariableName:
     - 'app/controllers/application_controller.rb'
     - 'app/models/message.rb'
     - 'lib/integrations/widget/outgoing_message_builder.rb'
-    - 'lib/webhooks/chargebee.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -187,7 +186,6 @@ Rails/EnumHash:
     - 'app/models/attachment.rb'
     - 'app/models/conversation.rb'
     - 'app/models/message.rb'
-    - 'app/models/subscription.rb'
     - 'app/models/user.rb'
 
 # Offense count: 1
@@ -226,7 +224,6 @@ Rails/Output:
 Rails/TimeZone:
   Exclude:
     - 'app/builders/report_builder.rb'
-    - 'app/models/subscription.rb'
     - 'lib/reports/update_account_identity.rb'
     - 'lib/reports/update_agent_identity.rb'
     - 'lib/reports/update_identity.rb'
diff --git a/Gemfile b/Gemfile
index 6d16179ea..5397d5130 100644
--- a/Gemfile
+++ b/Gemfile
@@ -56,9 +56,6 @@ gem 'administrate'
 # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/
 gem 'wisper', '2.0.0'
 
-##--- gems for billing ---##
-gem 'chargebee'
-
 ##--- gems for channels ---##
 gem 'facebook-messenger'
 gem 'telegram-bot-ruby'
diff --git a/Gemfile.lock b/Gemfile.lock
index dffbfb1f3..3f8ff49e7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -138,9 +138,6 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 0.18)
     byebug (11.1.3)
-    chargebee (2.7.5)
-      json_pure (~> 2.1)
-      rest-client (>= 1.8, < 3.0)
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -249,7 +246,6 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.3.0)
-    json_pure (2.3.0)
     jwt (2.2.1)
     kaminari (1.2.1)
       activesupport (>= 4.1.0)
@@ -542,7 +538,6 @@ DEPENDENCIES
   bullet
   bundle-audit
   byebug
-  chargebee
   devise
   devise_token_auth
   dotenv-rails
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 9be255080..1b9fa24cc 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -10,8 +10,4 @@ class Api::BaseController < ApplicationController
   def authenticate_by_access_token?
     request.headers[:api_access_token].present? || request.headers[:HTTP_API_ACCESS_TOKEN].present?
   end
-
-  def check_billing_enabled
-    raise ActionController::RoutingError, 'Not Found' unless ENV['BILLING_ENABLED']
-  end
 end
diff --git a/app/controllers/api/v1/accounts/subscriptions_controller.rb b/app/controllers/api/v1/accounts/subscriptions_controller.rb
deleted file mode 100644
index 4c4f6de01..000000000
--- a/app/controllers/api/v1/accounts/subscriptions_controller.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class Api::V1::Accounts::SubscriptionsController < Api::V1::Accounts::BaseController
-  skip_before_action :check_subscription
-
-  before_action :check_billing_enabled
-
-  def index
-    render json: Current.account.subscription_data
-  end
-
-  def status
-    render json: Current.account.subscription.summary
-  end
-end
diff --git a/app/controllers/api/v1/accounts_controller.rb b/app/controllers/api/v1/accounts_controller.rb
index d23f535a5..3fb0509e3 100644
--- a/app/controllers/api/v1/accounts_controller.rb
+++ b/app/controllers/api/v1/accounts_controller.rb
@@ -2,7 +2,7 @@ class Api::V1::AccountsController < Api::BaseController
   include AuthHelper
 
   skip_before_action :verify_authenticity_token, only: [:create]
-  skip_before_action :authenticate_user!, :set_current_user, :check_subscription, :handle_with_exception,
+  skip_before_action :authenticate_user!, :set_current_user, :handle_with_exception,
                      only: [:create], raise: false
   before_action :check_signup_enabled, only: [:create]
   before_action :fetch_account, except: [:create]
diff --git a/app/controllers/api/v1/agent_bots_controller.rb b/app/controllers/api/v1/agent_bots_controller.rb
index 4c17fd4f4..a82f71bb9 100644
--- a/app/controllers/api/v1/agent_bots_controller.rb
+++ b/app/controllers/api/v1/agent_bots_controller.rb
@@ -1,6 +1,5 @@
 class Api::V1::AgentBotsController < Api::BaseController
   skip_before_action :authenticate_user!
-  skip_before_action :check_subscription
 
   def index
     render json: AgentBot.all
diff --git a/app/controllers/api/v1/webhooks_controller.rb b/app/controllers/api/v1/webhooks_controller.rb
index 5db576000..b2c4949df 100644
--- a/app/controllers/api/v1/webhooks_controller.rb
+++ b/app/controllers/api/v1/webhooks_controller.rb
@@ -1,18 +1,6 @@
 class Api::V1::WebhooksController < ApplicationController
   skip_before_action :authenticate_user!, raise: false
   skip_before_action :set_current_user
-  skip_before_action :check_subscription
-
-  before_action :login_from_basic_auth, only: [:chargebee]
-  before_action :check_billing_enabled, only: [:chargebee]
-
-  def chargebee
-    chargebee_consumer.consume
-    head :ok
-  rescue StandardError => e
-    Raven.capture_exception(e)
-    head :ok
-  end
 
   def twitter_crc
     render json: { response_token: "sha256=#{twitter_client.generate_crc(params[:crc_token])}" }
@@ -34,16 +22,6 @@ class Api::V1::WebhooksController < ApplicationController
     end
   end
 
-  def login_from_basic_auth
-    authenticate_or_request_with_http_basic do |username, password|
-      username == ENV['CHARGEBEE_WEBHOOK_USERNAME'] && password == ENV['CHARGEBEE_WEBHOOK_PASSWORD']
-    end
-  end
-
-  def chargebee_consumer
-    @chargebee_consumer ||= ::Webhooks::Chargebee.new(params)
-  end
-
   def twitter_consumer
     @twitter_consumer ||= ::Webhooks::Twitter.new(params)
   end
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 3d7f59f0c..a7764cbc9 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -1,6 +1,5 @@
 class ApiController < ApplicationController
   skip_before_action :set_current_user, only: [:index]
-  skip_before_action :check_subscription, only: [:index]
 
   def index
     render json: { version: Chatwoot.config[:version], timestamp: Time.now.utc.to_formatted_s(:db) }
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ab1be9b9b..4b22c8d32 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -5,7 +5,6 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :null_session
 
   before_action :set_current_user, unless: :devise_controller?
-  before_action :check_subscription, unless: :devise_controller?
   around_action :handle_with_exception, unless: :devise_controller?
 
   # after_action :verify_authorized
@@ -68,18 +67,6 @@ class ApplicationController < ActionController::Base
     I18n.locale = locale || I18n.default_locale
   end
 
-  def check_subscription
-    # This block is left over from the initial version of chatwoot
-    # We might reuse this later in the hosted version of chatwoot.
-    return if !ENV['BILLING_ENABLED'] || !current_user
-
-    if current_subscription.trial? && current_subscription.expiry < Date.current
-      render json: { error: 'Trial Expired' }, status: :trial_expired
-    elsif current_subscription.cancelled?
-      render json: { error: 'Account Suspended' }, status: :account_suspended
-    end
-  end
-
   def pundit_user
     {
       user: Current.user,
diff --git a/app/dispatchers/async_dispatcher.rb b/app/dispatchers/async_dispatcher.rb
index 64ea55be3..8ddc963b5 100644
--- a/app/dispatchers/async_dispatcher.rb
+++ b/app/dispatchers/async_dispatcher.rb
@@ -10,7 +10,6 @@ class AsyncDispatcher < BaseDispatcher
 
   def listeners
     listeners = [EventListener.instance, WebhookListener.instance]
-    listeners << SubscriptionListener.instance if ENV['BILLING_ENABLED']
     listeners
   end
 end
diff --git a/app/helpers/api/v1/subscriptions_helper.rb b/app/helpers/api/v1/subscriptions_helper.rb
deleted file mode 100644
index 2e7177559..000000000
--- a/app/helpers/api/v1/subscriptions_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-module Api::V1::SubscriptionsHelper
-end
diff --git a/app/javascript/dashboard/api/billing.js b/app/javascript/dashboard/api/billing.js
deleted file mode 100644
index 6bc076640..000000000
--- a/app/javascript/dashboard/api/billing.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* global axios */
-
-import endPoints from './endPoints';
-
-export default {
-  getSubscription() {
-    const urlData = endPoints('subscriptions').get();
-    const fetchPromise = new Promise((resolve, reject) => {
-      axios
-        .get(urlData.url)
-        .then(response => {
-          resolve(response);
-        })
-        .catch(error => {
-          reject(error);
-        });
-    });
-    return fetchPromise;
-  },
-};
diff --git a/app/javascript/dashboard/api/endPoints.js b/app/javascript/dashboard/api/endPoints.js
index 53c669eb6..8df609f70 100644
--- a/app/javascript/dashboard/api/endPoints.js
+++ b/app/javascript/dashboard/api/endPoints.js
@@ -33,14 +33,6 @@ const endPoints = {
     },
     params: { omniauth_token: '' },
   },
-
-  subscriptions: {
-    get() {
-      return {
-        url: '/api/v1/subscriptions',
-      };
-    },
-  },
 };
 
 export default page => {
diff --git a/app/javascript/dashboard/assets/scss/_woot.scss b/app/javascript/dashboard/assets/scss/_woot.scss
index 947204ca6..7f5ef39c9 100644
--- a/app/javascript/dashboard/assets/scss/_woot.scss
+++ b/app/javascript/dashboard/assets/scss/_woot.scss
@@ -3,7 +3,6 @@
 @import 'animations';
 
 @import 'foundation-custom';
-@import 'widgets/billing';
 @import 'widgets/buttons';
 @import 'widgets/conv-header';
 @import 'widgets/conversation-card';
diff --git a/app/javascript/dashboard/assets/scss/widgets/_billing.scss b/app/javascript/dashboard/assets/scss/widgets/_billing.scss
deleted file mode 100644
index 0fd6d45ff..000000000
--- a/app/javascript/dashboard/assets/scss/widgets/_billing.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-.billing {
-  @include full-height;
-
-  .row {
-    @include full-height;
-  }
-
-  .billing__stats {
-    @include flex;
-  }
-
-  .billing__form {
-    @include thin-border($color-border-light);
-    @include margin($zero - $space-micro);
-    @include full-height;
-    background: $color-white;
-
-    iframe {
-      @include full-height;
-      border: 0;
-      width: 100%;
-    }
-  }
-
-  .account-row {
-    @include padding($space-normal);
-    @include flex;
-    flex-direction: column;
-    // @include thin-border($color-border-light);
-    // @include margin(-$space-micro $zero);
-    background: $color-white;
-    font-size: $font-size-small;
-
-    .title {
-      color: $color-heading;
-      font-weight: $font-weight-medium;
-    }
-
-    .value {
-      font-size: $font-size-mega;
-      font-weight: $font-weight-light;
-      text-transform: capitalize;
-    }
-  }
-}
-
-.account-locked {
-  @include background-gray;
-  @include margin(0);
-}
-
-.lock-message {
-  @include flex;
-  @include full-height;
-  flex-direction: column;
-  @include flex-align(center, middle);
-
-  div {
-    @include flex;
-    @include full-height;
-    flex-direction: column;
-    @include flex-align(center, middle);
-
-    img {
-      @include margin($space-normal);
-      width: 10rem;
-    }
-
-    span {
-      font-size: $font-size-small;
-      font-weight: $font-weight-medium;
-      text-align: center;
-    }
-  }
-}
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 986232749..b2ccf1697 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -21,18 +21,6 @@
       </transition-group>
     </div>
 
-    <!-- this block is only required in the hosted version with billing enabled -->
-    <transition name="fade" mode="out-in">
-      <woot-status-bar
-        v-if="shouldShowStatusBox"
-        :message="trialMessage"
-        :button-text="$t('APP_GLOBAL.TRAIL_BUTTON')"
-        :button-route="{ name: 'billing' }"
-        :type="statusBarClass"
-        :show-button="isAdmin"
-      />
-    </transition>
-
     <div class="bottom-nav">
       <transition name="menu-slide">
         <div
@@ -108,7 +96,6 @@ import { mixin as clickaway } from 'vue-clickaway';
 import adminMixin from '../../mixins/isAdmin';
 import Auth from '../../api/auth';
 import SidebarItem from './SidebarItem';
-import WootStatusBar from '../widgets/StatusBar';
 import { frontendURL } from '../../helper/URLHelper';
 import Thumbnail from '../widgets/Thumbnail';
 import { getSidebarItems } from '../../i18n/default-sidebar';
@@ -116,7 +103,6 @@ import { getSidebarItems } from '../../i18n/default-sidebar';
 export default {
   components: {
     SidebarItem,
-    WootStatusBar,
     Thumbnail,
   },
   mixins: [clickaway, adminMixin],
@@ -138,7 +124,6 @@ export default {
       daysLeft: 'getTrialLeft',
       globalConfig: 'globalConfig/get',
       inboxes: 'inboxes/getInboxes',
-      subscriptionData: 'getSubscription',
       accountId: 'getCurrentAccountId',
       currentRole: 'getCurrentRole',
     }),
@@ -160,10 +145,6 @@ export default {
         }
       }
 
-      if (!window.chatwootConfig.billingEnabled) {
-        menuItems = this.filterBillingRoutes(menuItems);
-      }
-
       return this.filterMenuItemsByRole(menuItems);
     },
     currentRoute() {
@@ -193,35 +174,11 @@ export default {
     dashboardPath() {
       return frontendURL(`accounts/${this.accountId}/dashboard`);
     },
-    shouldShowStatusBox() {
-      return (
-        window.chatwootConfig.billingEnabled &&
-        (this.subscriptionData.state === 'trial' ||
-          this.subscriptionData.state === 'cancelled')
-      );
-    },
-    statusBarClass() {
-      if (this.subscriptionData.state === 'trial') {
-        return 'warning';
-      }
-      if (this.subscriptionData.state === 'cancelled') {
-        return 'danger';
-      }
-      return '';
-    },
-    trialMessage() {
-      return `${this.daysLeft} ${this.$t('APP_GLOBAL.TRIAL_MESSAGE')}`;
-    },
   },
   mounted() {
     this.$store.dispatch('inboxes/get');
   },
   methods: {
-    filterBillingRoutes(menuItems) {
-      return menuItems.filter(
-        menuItem => !menuItem.toState.includes('billing')
-      );
-    },
     filterMenuItemsByRole(menuItems) {
       if (!this.currentRole) {
         return [];
diff --git a/app/javascript/dashboard/components/widgets/StatusBar.vue b/app/javascript/dashboard/components/widgets/StatusBar.vue
deleted file mode 100644
index 902c2515e..000000000
--- a/app/javascript/dashboard/components/widgets/StatusBar.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<template>
-  <div class="status-bar" :class="type">
-    <p class="message">{{message}}</p>
-    <router-link
-      :to="buttonRoute"
-      class="button small warning nice"
-      v-if="showButton"
-    >
-      {{buttonText}}
-    </router-link>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    message: String,
-    buttonRoute: Object,
-    buttonText: String,
-    showButton: Boolean,
-    type: String, // Danger, Info, Success, Warning
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/helper/APIHelper.js b/app/javascript/dashboard/helper/APIHelper.js
index b1692d492..03e902259 100644
--- a/app/javascript/dashboard/helper/APIHelper.js
+++ b/app/javascript/dashboard/helper/APIHelper.js
@@ -1,15 +1,8 @@
 /* eslint no-console: 0 */
 import constants from '../constants';
 import Auth from '../api/auth';
-import router from '../routes';
 
 const parseErrorCode = error => {
-  const errorStatus = error.response ? error.response.status : undefined;
-  // 901, 902 are used to identify billing related issues
-  if ([901, 902].includes(errorStatus)) {
-    const name = Auth.isAdmin() ? 'billing' : 'billing_deactivated';
-    router.push({ name });
-  }
   return Promise.reject(error);
 };
 
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index f1823915c..5ada97da4 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -8,7 +8,6 @@ export const getSidebarItems = accountId => ({
       'inbox_conversation',
       'conversation_through_inbox',
       'settings_account_reports',
-      'billing_deactivated',
       'profile_settings',
       'profile_settings_index',
     ],
@@ -51,7 +50,6 @@ export const getSidebarItems = accountId => ({
       'settings_inboxes_page_channel',
       'settings_inboxes_add_agents',
       'settings_inbox_finish',
-      'billing',
       'settings_integrations',
       'settings_integrations_webhook',
       'general_settings',
@@ -88,13 +86,6 @@ export const getSidebarItems = accountId => ({
         ),
         toStateName: 'canned_list',
       },
-      billing: {
-        icon: 'ion-card',
-        label: 'BILLING',
-        hasSubMenu: false,
-        toState: frontendURL(`accounts/${accountId}/settings/billing`),
-        toStateName: 'billing',
-      },
       settings_integrations: {
         icon: 'ion-flash',
         label: 'INTEGRATIONS',
diff --git a/app/javascript/dashboard/i18n/locale/ca/billing.json b/app/javascript/dashboard/i18n/locale/ca/billing.json
deleted file mode 100644
index c44ba0dbf..000000000
--- a/app/javascript/dashboard/i18n/locale/ca/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Facturació",
-    "LOADING": "S'estan obtenin les suscripcions",
-    "ACCOUNT_STATE": "Estat del compte",
-    "AGENT_COUNT": "Compte d'agent",
-    "PER_AGENT_COST": "Per cost d'agent",
-    "TOTAL_COST": "Cost total",
-    "BUTTON": {
-      "ADD": "Afegir mètode de pagament",
-      "EDIT": "EDITAR Mètode de pagament"
-    },
-    "TRIAL": {
-      "TITLE": "S'ha acabat el període de prova",
-      "MESSAGE": "Afegiu un mètode de pagament per continuar utilitzant Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "El seu compte no està disponible de moment. <br>Poseu-vos en contacte amb l'administrador per reactivar-lo."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/ca/index.js b/app/javascript/dashboard/i18n/locale/ca/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/ca/index.js
+++ b/app/javascript/dashboard/i18n/locale/ca/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index a36b33447..bf2ffbe39 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -87,7 +87,6 @@
     "AGENTS": "Agents",
     "INBOXES": "Safates d'entrada",
     "CANNED_RESPONSES": "Respostes Predeterminades",
-    "BILLING": "Facturació",
     "INTEGRATIONS": "Integracions",
     "ACCOUNT_SETTINGS": "Configuració del compte"
   }
diff --git a/app/javascript/dashboard/i18n/locale/cs/billing.json b/app/javascript/dashboard/i18n/locale/cs/billing.json
deleted file mode 100644
index cf6469e88..000000000
--- a/app/javascript/dashboard/i18n/locale/cs/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Fakturace",
-    "LOADING": "Načítání předplatného",
-    "ACCOUNT_STATE": "Stav účtu",
-    "AGENT_COUNT": "Počet agentů",
-    "PER_AGENT_COST": "Náklady na jednoho agenta",
-    "TOTAL_COST": "Celkové náklady",
-    "BUTTON": {
-      "ADD": "Přidat způsob platby",
-      "EDIT": "Metoda platby EDIT"
-    },
-    "TRIAL": {
-      "TITLE": "Vaše zkušební období skončilo",
-      "MESSAGE": "Přidejte platební metodu a pokračujte v používání Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Váš účet není momentálně k dispozici. <br>Obraťte se na správce pro opětovné aktivaci."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/de/billing.json b/app/javascript/dashboard/i18n/locale/de/billing.json
deleted file mode 100644
index 44f4f290f..000000000
--- a/app/javascript/dashboard/i18n/locale/de/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Abrechnung",
-    "LOADING": "Abonnements abrufen",
-    "ACCOUNT_STATE": "Kontostatus",
-    "AGENT_COUNT": "Anzahl der Agenten",
-    "PER_AGENT_COST": "Kosten pro Agent",
-    "TOTAL_COST": "Gesamtkosten",
-    "BUTTON": {
-      "ADD": "Zahlungsmethode hinzufügen",
-      "EDIT": "Zahlungsmethode BEARBEITEN"
-    },
-    "TRIAL": {
-      "TITLE": "Ihre Probezeit ist vorbei",
-      "MESSAGE": "Fügen Sie eine Zahlungsmethode hinzu, um Chatwoot weiterhin zu verwenden."
-    },
-    "ACCOUNT_LOCKED": "Ihr Konto ist derzeit nicht verfügbar. <br> Bitte wenden Sie sich zur Reaktivierung an Ihren Administrator."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/de/index.js b/app/javascript/dashboard/i18n/locale/de/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/de/index.js
+++ b/app/javascript/dashboard/i18n/locale/de/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index 70a99e24b..c9ff6b118 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -90,7 +90,6 @@
     "AGENTS": "Agenten",
     "INBOXES": "Posteingänge",
     "CANNED_RESPONSES": "Vorgefertigte Antworten",
-    "BILLING": "Abrechnung",
     "INTEGRATIONS": "Integrationen",
     "ACCOUNT_SETTINGS": "Kontoeinstellungen"
   }
diff --git a/app/javascript/dashboard/i18n/locale/el/billing.json b/app/javascript/dashboard/i18n/locale/el/billing.json
deleted file mode 100644
index 6a96433ff..000000000
--- a/app/javascript/dashboard/i18n/locale/el/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Χρεώσεις",
-    "LOADING": "Λήψη Συνδρομών",
-    "ACCOUNT_STATE": "Κατάσταση Λογαριασμού",
-    "AGENT_COUNT": "Αριθμός Πρακτόρων",
-    "PER_AGENT_COST": "Κόστος ανά πράκτορα",
-    "TOTAL_COST": "Συνολικό κόστος",
-    "BUTTON": {
-      "ADD": "Προσθήκη μεθόδου πληρωμής",
-      "EDIT": "Επεξεργασία μεθόδου πληρωμής"
-    },
-    "TRIAL": {
-      "TITLE": "Η δοκιμαστική περίοδος ολοκληρώθηκε",
-      "MESSAGE": "Προσθέστε μια μέθοδο πληρωμής για να συνεχίσετε την χρήση του Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "O Λογαριασμός σας δεν είναι ενεργός αυτήν τη στιγμή. <br>Παρακαλώ απευθυνθείτε στον διαχειριστή για ενεργοποίηση."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/el/index.js b/app/javascript/dashboard/i18n/locale/el/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/el/index.js
+++ b/app/javascript/dashboard/i18n/locale/el/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 9f8790ffb..1af3e5b01 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Πράκτορες",
     "INBOXES": "Κιβώτια Εισερχομένων",
     "CANNED_RESPONSES": "Έτοιμες Απαντήσεις",
-    "BILLING": "Χρεώσεις",
     "INTEGRATIONS": "Ενοποιήσεις",
     "ACCOUNT_SETTINGS": "Ρυθμίσεις Λογαριασμού"
   }
diff --git a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
index 6ec788207..633424fed 100644
--- a/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/agentMgmt.json
@@ -3,7 +3,7 @@
     "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 and billing, along with all of a normal agents' privileges.</p>",
+    "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": [
       {
         "name": "administrator",
diff --git a/app/javascript/dashboard/i18n/locale/en/billing.json b/app/javascript/dashboard/i18n/locale/en/billing.json
deleted file mode 100644
index 4d300775d..000000000
--- a/app/javascript/dashboard/i18n/locale/en/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Billing",
-    "LOADING": "Fetching Subscriptions",
-    "ACCOUNT_STATE": "Account State",
-    "AGENT_COUNT": "Agent Count",
-    "PER_AGENT_COST": "Per Agent Cost",
-    "TOTAL_COST": "Total Cost",
-    "BUTTON": {
-      "ADD": "Add Payment Method",
-      "EDIT": "EDIT Payment Method"
-    },
-    "TRIAL": {
-      "TITLE": "Your Trial period is over",
-      "MESSAGE": "Add a payment method to continue using Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Your account is not available at the moment. <br>Please contact your administrator for reactivation."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index c1955d90d..38f5a4aac 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Agents",
     "INBOXES": "Inboxes",
     "CANNED_RESPONSES": "Canned Responses",
-    "BILLING": "Billing",
     "INTEGRATIONS": "Integrations",
     "ACCOUNT_SETTINGS": "Account Settings"
   }
diff --git a/app/javascript/dashboard/i18n/locale/es/billing.json b/app/javascript/dashboard/i18n/locale/es/billing.json
deleted file mode 100644
index a7b7b58fb..000000000
--- a/app/javascript/dashboard/i18n/locale/es/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Facturación",
-    "LOADING": "Obteniendo suscripciones",
-    "ACCOUNT_STATE": "Estado de cuenta",
-    "AGENT_COUNT": "Contador de agentes",
-    "PER_AGENT_COST": "Coste por agente",
-    "TOTAL_COST": "Coste total",
-    "BUTTON": {
-      "ADD": "Añadir método de pago",
-      "EDIT": "Método de pago EDIT"
-    },
-    "TRIAL": {
-      "TITLE": "Su período de prueba ha terminado",
-      "MESSAGE": "Añadir un método de pago para seguir usando Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Su cuenta no está disponible en este momento. <br>Póngase en contacto con su administrador para reactivación."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/es/index.js b/app/javascript/dashboard/i18n/locale/es/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/es/index.js
+++ b/app/javascript/dashboard/i18n/locale/es/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index bd1838a69..0833a8f34 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Agentes",
     "INBOXES": "Entradas",
     "CANNED_RESPONSES": "Respuestas predefinidas",
-    "BILLING": "Facturación",
     "INTEGRATIONS": "Integraciones",
     "ACCOUNT_SETTINGS": "Configuración de la cuenta"
   }
diff --git a/app/javascript/dashboard/i18n/locale/fr/billing.json b/app/javascript/dashboard/i18n/locale/fr/billing.json
deleted file mode 100644
index f66afe559..000000000
--- a/app/javascript/dashboard/i18n/locale/fr/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Facturation",
-    "LOADING": "Récupération des abonnements",
-    "ACCOUNT_STATE": "État du compte",
-    "AGENT_COUNT": "Nombre d'agents",
-    "PER_AGENT_COST": "Coût par agent",
-    "TOTAL_COST": "Coût total",
-    "BUTTON": {
-      "ADD": "Ajouter une méthode de paiement",
-      "EDIT": "MODIFIER la méthode de paiement"
-    },
-    "TRIAL": {
-      "TITLE": "Votre période d'essai est terminée",
-      "MESSAGE": "Ajoutez une méthode de paiement pour continuer à utiliser Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Votre compte n'est pas disponible pour le moment. <br>Veuillez contacter votre administrateur pour la réactivation."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/fr/index.js b/app/javascript/dashboard/i18n/locale/fr/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/index.js
+++ b/app/javascript/dashboard/i18n/locale/fr/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index 7aca5abb1..ba7d64d0b 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Agents",
     "INBOXES": "Boîtes de réception",
     "CANNED_RESPONSES": "Réponses standardisées",
-    "BILLING": "Facturation",
     "INTEGRATIONS": "Intégrations",
     "ACCOUNT_SETTINGS": "Paramètres du compte"
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/billing.json b/app/javascript/dashboard/i18n/locale/it/billing.json
deleted file mode 100644
index af0c125e7..000000000
--- a/app/javascript/dashboard/i18n/locale/it/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Fatturazione",
-    "LOADING": "Recupero Iscrizioni",
-    "ACCOUNT_STATE": "Stato del conto",
-    "AGENT_COUNT": "Conteggio Agente",
-    "PER_AGENT_COST": "Costo per agente",
-    "TOTAL_COST": "Costo totale",
-    "BUTTON": {
-      "ADD": "Aggiungi metodo di pagamento",
-      "EDIT": "Metodo di pagamento EDIT"
-    },
-    "TRIAL": {
-      "TITLE": "Il tuo periodo di prova è finito",
-      "MESSAGE": "Aggiungi un metodo di pagamento per continuare a utilizzare Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Il tuo account non è al momento disponibile. <br>Si prega di contattare l'amministratore per la riattivazione."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/ml/billing.json b/app/javascript/dashboard/i18n/locale/ml/billing.json
deleted file mode 100644
index d44fdd661..000000000
--- a/app/javascript/dashboard/i18n/locale/ml/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "ബില്ലിംഗ്",
-    "LOADING": "സബ്സ്ക്രിപ്ഷനുകൾ ലഭ്യമാക്കുന്നു",
-    "ACCOUNT_STATE": "അക്കൗണ്ടിന്റെ അവസ്ഥ",
-    "AGENT_COUNT": "ഏജന്റിന്റെ എണ്ണം ",
-    "PER_AGENT_COST": "ഓരോ ഏജന്റിന്റെ വില",
-    "TOTAL_COST": "ആകെ ചെലവ്",
-    "BUTTON": {
-      "ADD": "പേയ്‌മെന്റ് രീതി ചേർക്കുക",
-      "EDIT": "പേയ്‌മെന്റ് രീതി എഡിറ്റുചെയ്യുക"
-    },
-    "TRIAL": {
-      "TITLE": "നിങ്ങളുടെ ട്രയൽ കാലയളവ് അവസാനിച്ചു",
-      "MESSAGE": "ചാറ്റ് വൂട്ട് ഉപയോഗിക്കുന്നത് തുടരാൻ ഒരു പേയ്‌മെന്റ് രീതി ചേർക്കുക."
-    },
-    "ACCOUNT_LOCKED": "നിങ്ങളുടെ അക്കൗണ്ട് ഇപ്പോൾ ലഭ്യമല്ല. <br> വീണ്ടും സജീവമാക്കുന്നതിന് ദയവായി നിങ്ങളുടെ അഡ്മിനിസ്ട്രേറ്ററുമായി ബന്ധപ്പെടുക."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/ml/index.js b/app/javascript/dashboard/i18n/locale/ml/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/ml/index.js
+++ b/app/javascript/dashboard/i18n/locale/ml/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index c768f6d1c..d7e89fb3f 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -90,7 +90,6 @@
     "AGENTS": "ഏജന്റുമാർ",
     "INBOXES": "ഇൻബോക്സുകൾ",
     "CANNED_RESPONSES": "ക്യാൻഡ് പ്രതികരണങ്ങൾ",
-    "BILLING": "ബില്ലിംഗ്",
     "INTEGRATIONS": "സംയോജനങ്ങൾ",
     "ACCOUNT_SETTINGS": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"
   }
diff --git a/app/javascript/dashboard/i18n/locale/nl/billing.json b/app/javascript/dashboard/i18n/locale/nl/billing.json
deleted file mode 100644
index d5a46cfd1..000000000
--- a/app/javascript/dashboard/i18n/locale/nl/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Facturatie",
-    "LOADING": "Ophalen Abonnementen",
-    "ACCOUNT_STATE": "Accountstatus",
-    "AGENT_COUNT": "Aantal Medewerkers",
-    "PER_AGENT_COST": "Kosten per medewerker",
-    "TOTAL_COST": "Totale kosten",
-    "BUTTON": {
-      "ADD": "Betaalmethode toevoegen",
-      "EDIT": "Betalingsmethode bewerken"
-    },
-    "TRIAL": {
-      "TITLE": "Uw proefperiode is voorbij",
-      "MESSAGE": "Voeg een betaalmethode toe om Chatwoot te blijven gebruiken."
-    },
-    "ACCOUNT_LOCKED": "Uw account is op dit moment niet beschikbaar. <br>Neem contact op met uw beheerder voor heractivatie."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index a5f604209..e013885d4 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Medewerkers",
     "INBOXES": "Inboxen",
     "CANNED_RESPONSES": "Standaard antwoorden",
-    "BILLING": "Facturatie",
     "INTEGRATIONS": "Integraties",
     "ACCOUNT_SETTINGS": "Accountinstellingen"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/billing.json b/app/javascript/dashboard/i18n/locale/pl/billing.json
deleted file mode 100644
index 6a3a07496..000000000
--- a/app/javascript/dashboard/i18n/locale/pl/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Płatność",
-    "LOADING": "Pobieranie subskrypcji",
-    "ACCOUNT_STATE": "Stan konta",
-    "AGENT_COUNT": "Liczba agentów",
-    "PER_AGENT_COST": "Koszt za agenta",
-    "TOTAL_COST": "Całkowity koszt",
-    "BUTTON": {
-      "ADD": "Dodaj metodę płatności",
-      "EDIT": "Metoda płatności EDIT"
-    },
-    "TRIAL": {
-      "TITLE": "Twój okres próbny minął",
-      "MESSAGE": "Dodaj metodę płatności, aby kontynuować korzystanie z Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Twoje konto nie jest obecnie dostępne. <br>Skontaktuj się z administratorem, aby reaktywować."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/pt/billing.json b/app/javascript/dashboard/i18n/locale/pt/billing.json
deleted file mode 100644
index 07cc720f6..000000000
--- a/app/javascript/dashboard/i18n/locale/pt/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Faturamento",
-    "LOADING": "Buscando Assinaturas",
-    "ACCOUNT_STATE": "Estado do cliente",
-    "AGENT_COUNT": "Número de Representantes",
-    "PER_AGENT_COST": "Custo por agente",
-    "TOTAL_COST": "Custo Total",
-    "BUTTON": {
-      "ADD": "Adicionar método de pagamento",
-      "EDIT": "EDIT Método de Pagamento"
-    },
-    "TRIAL": {
-      "TITLE": "Seu período de avaliação terminou",
-      "MESSAGE": "Adicione um método de pagamento para continuar usando o Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Sua conta não está disponível no momento. <br>Por favor, entre em contato com o administrador para reativação."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/pt/index.js b/app/javascript/dashboard/i18n/locale/pt/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/pt/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 2d1c5d4d5..95d891773 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -67,7 +67,6 @@
     "AGENTS": "Agentes",
     "INBOXES": "Caixas de entrada",
     "CANNED_RESPONSES": "Respostas Enlatadas",
-    "BILLING": "Faturamento",
     "INTEGRATIONS": "Integrações",
     "ACCOUNT_SETTINGS": "Configurações da conta"
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/billing.json b/app/javascript/dashboard/i18n/locale/pt_BR/billing.json
deleted file mode 100644
index 2c7d5f390..000000000
--- a/app/javascript/dashboard/i18n/locale/pt_BR/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Faturamento",
-    "LOADING": "Buscando Assinaturas",
-    "ACCOUNT_STATE": "Estado do cliente",
-    "AGENT_COUNT": "Número de Agente",
-    "PER_AGENT_COST": "Custo por agente",
-    "TOTAL_COST": "Custo Total",
-    "BUTTON": {
-      "ADD": "Adicionar Forma de Pagamento",
-      "EDIT": "Editar Forma de Pagamento"
-    },
-    "TRIAL": {
-      "TITLE": "Seu período de avaliação terminou",
-      "MESSAGE": "Adicione um método de pagamento para continuar usando o Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Sua conta não está disponível no momento. <br>Por favor, entre em contato com o administrador para reativação."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/index.js b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
index 351906dd9..558cc9b3a 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/index.js
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/index.js
@@ -1,6 +1,5 @@
 /* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -17,7 +16,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 25c61cf86..65b7dc8e2 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -100,7 +100,6 @@
     "AGENTS": "Agentes",
     "INBOXES": "Caixas de Entrada",
     "CANNED_RESPONSES": "Atalhos",
-    "BILLING": "Faturamento",
     "INTEGRATIONS": "Integrações",
     "ACCOUNT_SETTINGS": "Configurações da conta"
   }
diff --git a/app/javascript/dashboard/i18n/locale/ro/billing.json b/app/javascript/dashboard/i18n/locale/ro/billing.json
deleted file mode 100644
index fb5c851fd..000000000
--- a/app/javascript/dashboard/i18n/locale/ro/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Facturare",
-    "LOADING": "Preluare abonamente",
-    "ACCOUNT_STATE": "Stare cont",
-    "AGENT_COUNT": "Număr de agenți",
-    "PER_AGENT_COST": "Cost per Agent",
-    "TOTAL_COST": "Cost total",
-    "BUTTON": {
-      "ADD": "Adaugă metodă de plată",
-      "EDIT": "Adaugă metodă de plată"
-    },
-    "TRIAL": {
-      "TITLE": "Perioada de evaluare s-a încheiat",
-      "MESSAGE": "Adaugă o metodă de plată pentru a continua să folosești Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Contul dvs. nu este disponibil momentan. <br>Vă rugăm să contactaţi administratorul pentru reactivare."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/ro/index.js b/app/javascript/dashboard/i18n/locale/ro/index.js
index 7cc96f9eb..6b0a4bb4d 100644
--- a/app/javascript/dashboard/i18n/locale/ro/index.js
+++ b/app/javascript/dashboard/i18n/locale/ro/index.js
@@ -1,5 +1,4 @@
 import { default as _agentMgmt } from './agentMgmt.json';
-import { default as _billing } from './billing.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -16,7 +15,6 @@ import { default as _generalSettings } from './generalSettings.json';
 
 export default {
   ..._agentMgmt,
-  ..._billing,
   ..._cannedMgmt,
   ..._chatlist,
   ..._contact,
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index b85bdc9c0..0f8551131 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -102,7 +102,6 @@
     "AGENTS": "Agenți",
     "INBOXES": "Căsuțe",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
-    "BILLING": "Facturare",
     "INTEGRATIONS": "Integrări",
     "ACCOUNT_SETTINGS": "Setările contului"
   }
diff --git a/app/javascript/dashboard/i18n/locale/sv/billing.json b/app/javascript/dashboard/i18n/locale/sv/billing.json
deleted file mode 100644
index 2a2a1ba33..000000000
--- a/app/javascript/dashboard/i18n/locale/sv/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Fakturering",
-    "LOADING": "Hämtar prenumerationer",
-    "ACCOUNT_STATE": "Kontots status",
-    "AGENT_COUNT": "Agentkommando Antal",
-    "PER_AGENT_COST": "Per agent: kostnad",
-    "TOTAL_COST": "Total kostnad",
-    "BUTTON": {
-      "ADD": "Lägg till betalningsmetod",
-      "EDIT": "EDIT betalningsmetod"
-    },
-    "TRIAL": {
-      "TITLE": "Din provperiod är över",
-      "MESSAGE": "Lägg till en betalningsmetod för att fortsätta använda Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "Ditt konto är inte tillgängligt just nu. <br>Kontakta administratören för återaktivering."
-  }
-}
diff --git a/app/javascript/dashboard/i18n/locale/uk/billing.json b/app/javascript/dashboard/i18n/locale/uk/billing.json
deleted file mode 100644
index 0363d000b..000000000
--- a/app/javascript/dashboard/i18n/locale/uk/billing.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "BILLING": {
-    "HEADER": "Оплата",
-    "LOADING": "Отримання підписок",
-    "ACCOUNT_STATE": "Стан облікового запису",
-    "AGENT_COUNT": "Кількість агентів",
-    "PER_AGENT_COST": "Вартість одного агента",
-    "TOTAL_COST": "Загальна вартість",
-    "BUTTON": {
-      "ADD": "Додати спосіб оплати",
-      "EDIT": "РЕДАГУВАТИ спосіб оплати"
-    },
-    "TRIAL": {
-      "TITLE": "Пробний період закінчився",
-      "MESSAGE": "Додайте спосіб оплати, щоб продовжити використовувати Chatwoot."
-    },
-    "ACCOUNT_LOCKED": "На даний момент ваш обліковий запис недоступний. <br>Зверніться до свого адміністратора для повторної активації."
-  }
-}
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/AccountLocked.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/AccountLocked.vue
deleted file mode 100644
index 1c26d0f48..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/AccountLocked.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<template>
-  <div class="column content-box account-locked">
-    <div class="lock-message">
-      <!-- No inboxes attached -->
-      <div>
-        <img src="~dashboard/assets/images/lock.svg" alt="Lock" />
-        <span v-html="$t('BILLING.ACCOUNT_LOCKED')">
-        </span>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-/* eslint no-console: 0 */
-/* global bus */
-export default {
-  props: ['state'],
-
-
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
deleted file mode 100644
index 23099d858..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/Index.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
-  <div class="column content-box billing">
-    <woot-loading-state v-if="fetchStatus" :message="$t('BILLING.LOADING')" />
-    <div v-if="billingDetails" class="row">
-      <div class="small-12 columns billing__stats">
-        <div class="account-row column">
-          <span class="title">{{ $t('BILLING.ACCOUNT_STATE') }}</span>
-          <span class="value">{{ billingDetails.state }} </span>
-        </div>
-        <div class="account-row column">
-          <span class="title">{{ $t('BILLING.AGENT_COUNT') }}</span>
-          <span class="value">{{ billingDetails.agents_count }} </span>
-        </div>
-        <div class="account-row column">
-          <span class="title">{{ $t('BILLING.PER_AGENT_COST') }}</span>
-          <span class="value">${{ billingDetails.per_agent_cost }} </span>
-        </div>
-
-        <div class="account-row column">
-          <span class="title">{{ $t('BILLING.TOTAL_COST') }}</span>
-          <span class="value">${{ billingDetails.total_cost }} </span>
-        </div>
-      </div>
-      <div class="small-12 columns billing__form">
-        <iframe
-          v-if="iframeUrl && !isShowEmptyState"
-          :src="billingDetails.iframe_url"
-        ></iframe>
-        <div v-if="isShowEmptyState">
-          <empty-state :title="emptyStateTitle" :message="emptyStateMessage">
-            <div class="medium-12 columns text-center">
-              <button class="button success nice" @click="billingButtonClick()">
-                {{ buttonText }}
-              </button>
-            </div>
-          </empty-state>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-/* eslint no-console: 0 */
-/* global bus */
-import { mapGetters } from 'vuex';
-
-import EmptyState from '../../../../components/widgets/EmptyState';
-
-export default {
-  components: {
-    EmptyState,
-  },
-  props: ['state'],
-
-  data() {
-    return {
-      is_adding_source: false,
-    };
-  },
-
-  computed: {
-    ...mapGetters({
-      billingDetails: 'getBillingDetails',
-      fetchStatus: 'billingFetchStatus',
-      daysLeft: 'getTrialLeft',
-      subscriptionData: 'getSubscription',
-    }),
-    redirectMessage() {
-      if (!this.state) {
-        return '';
-      }
-      if (this.state === 'succeeded') {
-        return this.$t('BILLING.STATUS.SUCCESS');
-      }
-      return this.$t('BILLING.STATUS.ERROR');
-    },
-    iframeUrl() {
-      return typeof this.billingDetails.iframe_url === 'string';
-    },
-    isShowEmptyState() {
-      if (this.billingDetails !== null) {
-        if (this.is_adding_source) {
-          return false;
-        }
-      }
-      return true;
-    },
-    buttonText() {
-      if (this.billingDetails !== null) {
-        return this.billingDetails.payment_source_added
-          ? this.$t('BILLING.BUTTON.EDIT')
-          : this.$t('BILLING.BUTTON.ADD');
-      }
-      return this.$t('BILLING.BUTTON.ADD');
-    },
-    emptyStateTitle() {
-      if (this.daysLeft <= 0 || this.subscriptionData.state === 'cancelled') {
-        return this.$t('BILLING.TRIAL.TITLE');
-      }
-      return '';
-    },
-    emptyStateMessage() {
-      if (this.daysLeft <= 0 || this.subscriptionData.state === 'cancelled') {
-        return this.$t('BILLING.TRIAL.MESSAGE');
-      }
-      return '';
-    },
-  },
-
-  mounted() {
-    if (this.state) {
-      bus.$emit('newToastMessage', this.redirectMessage);
-    }
-    this.$store.dispatch('fetchSubscription');
-  },
-
-  methods: {
-    billingButtonClick() {
-      this.is_adding_source = true;
-    },
-  },
-};
-</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js b/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js
deleted file mode 100644
index 58bf309c3..000000000
--- a/app/javascript/dashboard/routes/dashboard/settings/billing/billing.routes.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import Index from './Index';
-import SettingsContent from '../Wrapper';
-import AccountLocked from './AccountLocked';
-import { frontendURL } from '../../../../helper/URLHelper';
-
-export default {
-  routes: [
-    {
-      path: frontendURL('accounts/:accountId/settings/billing'),
-      component: SettingsContent,
-      props: {
-        headerTitle: 'BILLING.HEADER',
-        icon: 'ion-card',
-      },
-      children: [
-        {
-          path: '',
-          name: 'billing',
-          component: Index,
-          roles: ['administrator'],
-          props: route => ({ state: route.query.state }),
-        },
-      ],
-    },
-    {
-      path: '/deactivated',
-      name: 'billing_deactivated',
-      component: AccountLocked,
-      roles: ['agent'],
-    },
-  ],
-};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index 5907768cc..f2f0d186c 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -1,6 +1,5 @@
 import { frontendURL } from '../../../helper/URLHelper';
 import agent from './agents/agent.routes';
-import billing from './billing/billing.routes';
 import canned from './canned/canned.routes';
 import inbox from './inbox/inbox.routes';
 import profile from './profile/profile.routes';
@@ -23,7 +22,6 @@ export default {
       },
     },
     ...agent.routes,
-    ...billing.routes,
     ...canned.routes,
     ...inbox.routes,
     ...profile.routes,
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index f88139003..9df653765 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -4,7 +4,6 @@ import Vuex from 'vuex';
 import accounts from './modules/accounts';
 import agents from './modules/agents';
 import auth from './modules/auth';
-import billing from './modules/billing';
 import cannedResponse from './modules/cannedResponse';
 import Channel from './modules/channels';
 import contactConversations from './modules/contactConversations';
@@ -27,7 +26,6 @@ export default new Vuex.Store({
     accounts,
     agents,
     auth,
-    billing,
     cannedResponse,
     Channel,
     contactConversations,
diff --git a/app/javascript/dashboard/store/modules/billing.js b/app/javascript/dashboard/store/modules/billing.js
deleted file mode 100644
index 4df528516..000000000
--- a/app/javascript/dashboard/store/modules/billing.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* eslint no-console: 0 */
-/* eslint no-param-reassign: 0 */
-/* eslint no-shadow: 0 */
-import * as types from '../mutation-types';
-import Billing from '../../api/billing';
-
-const state = {
-  fetchingStatus: false,
-  billingDetails: {},
-  status: null,
-};
-
-const getters = {
-  getBillingDetails(_state) {
-    return _state.billingDetails;
-  },
-  billingFetchStatus(_state) {
-    return _state.fetchingStatus;
-  },
-};
-
-const actions = {
-  fetchSubscription({ commit }) {
-    commit(types.default.TOGGLE_SUBSCRIPTION_LOADING, true);
-    Billing.getSubscription()
-      .then(billingDetails => {
-        commit(types.default.SET_SUBSCRIPTION, billingDetails.data);
-        commit(
-          types.default.TOGGLE_SUBSCRIPTION_LOADING,
-          false,
-          billingDetails.status
-        );
-      })
-      .catch(error => {
-        const { response } = error;
-        commit(
-          types.default.TOGGLE_SUBSCRIPTION_LOADING,
-          false,
-          response.status
-        );
-      });
-  },
-};
-
-const mutations = {
-  [types.default.SET_SUBSCRIPTION](_state, billingDetails) {
-    _state.billingDetails = billingDetails;
-  },
-  [types.default.TOGGLE_SUBSCRIPTION_LOADING](_state, flag, apiStatus) {
-    _state.fetchingStatus = flag;
-    _state.status = apiStatus;
-  },
-};
-
-export default {
-  state,
-  getters,
-  actions,
-  mutations,
-};
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 5357415b2..15c5fe577 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -93,10 +93,6 @@ export default {
   SET_ACCOUNT_SUMMARY: 'SET_ACCOUNT_SUMMARY',
   TOGGLE_ACCOUNT_REPORT_LOADING: 'TOGGLE_ACCOUNT_REPORT_LOADING',
 
-  // Billings
-  SET_SUBSCRIPTION: 'SET_SUBSCRIPTION',
-  TOGGLE_SUBSCRIPTION_LOADING: 'TOGGLE_SUBSCRIPTION_LOADING',
-
   // Conversation Metadata
   SET_CONVERSATION_METADATA: 'SET_CONVERSATION_METADATA',
 
diff --git a/app/listeners/subscription_listener.rb b/app/listeners/subscription_listener.rb
deleted file mode 100644
index 947bcdee7..000000000
--- a/app/listeners/subscription_listener.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-# This listener is left over from the initial version of chatwoot
-# We might reuse this later in the hosted version of chatwoot.
-
-class SubscriptionListener < BaseListener
-  def subscription_created(event)
-    subscription = event.data[:subscription]
-    account = subscription.account
-    Subscription::ChargebeeService.create_subscription(account)
-  end
-
-  def account_destroyed(event)
-    account = event.data[:account]
-    Subscription::ChargebeeService.cancel_subscription(account)
-  end
-
-  def agent_added(event)
-    account = event.data[:account]
-    Subscription::ChargebeeService.update_subscription(account)
-  end
-
-  def agent_removed(event)
-    account = event.data[:account]
-    Subscription::ChargebeeService.update_subscription(account)
-  end
-
-  def subscription_reactivated(event)
-    account = event.data[:account]
-    Subscription::ChargebeeService.reactivate_subscription(account)
-  end
-
-  def subscription_deactivated(event)
-    account = event.data[:account]
-    Subscription::ChargebeeService.deactivate_subscription(account)
-  end
-end
diff --git a/app/models/account.rb b/app/models/account.rb
index dbae201d3..3e5b48f00 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -46,13 +46,11 @@ class Account < ApplicationRecord
   has_many :canned_responses, dependent: :destroy
   has_many :webhooks, dependent: :destroy
   has_many :labels, dependent: :destroy
-  has_one :subscription, dependent: :destroy
   has_many :notification_settings, dependent: :destroy
   has_flags ACCOUNT_SETTINGS_FLAGS.merge(column: 'settings_flags').merge(DEFAULT_QUERY_SETTING)
 
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
 
-  after_create :create_subscription
   after_create :notify_creation
   after_destroy :notify_deletion
 
@@ -74,22 +72,6 @@ class Account < ApplicationRecord
                              .map { |_| _.tag.name }
   end
 
-  def subscription_data
-    agents_count = users.count
-    per_agent_price = Plan.paid_plan.price
-    {
-      state: subscription.state,
-      expiry: subscription.expiry.to_i,
-      agents_count: agents_count,
-      per_agent_cost: per_agent_price,
-      total_cost: (per_agent_price * agents_count),
-      iframe_url: Subscription::ChargebeeService.hosted_page_url(self),
-      trial_expired: subscription.trial_expired?,
-      account_suspended: subscription.suspended?,
-      payment_source_added: subscription.payment_source_added
-    }
-  end
-
   def webhook_data
     {
       id: id,
@@ -99,11 +81,6 @@ class Account < ApplicationRecord
 
   private
 
-  def create_subscription
-    subscription = build_subscription
-    subscription.save
-  end
-
   def notify_creation
     Rails.configuration.dispatcher.dispatch(ACCOUNT_CREATED, Time.zone.now, account: self)
   end
diff --git a/app/models/channel/web_widget.rb b/app/models/channel/web_widget.rb
index 203049f64..5b3762a5b 100644
--- a/app/models/channel/web_widget.rb
+++ b/app/models/channel/web_widget.rb
@@ -2,16 +2,15 @@
 #
 # Table name: channel_web_widgets
 #
-#  id                 :integer          not null, primary key
-#  agent_away_message :string
-#  website_token      :string
-#  website_url        :string
-#  welcome_tagline    :string
-#  welcome_title      :string
-#  widget_color       :string           default("#1f93ff")
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
-#  account_id         :integer
+#  id              :integer          not null, primary key
+#  website_token   :string
+#  website_url     :string
+#  welcome_tagline :string
+#  welcome_title   :string
+#  widget_color    :string           default("#1f93ff")
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  account_id      :integer
 #
 # Indexes
 #
diff --git a/app/models/subscription.rb b/app/models/subscription.rb
deleted file mode 100644
index 8a3afebe3..000000000
--- a/app/models/subscription.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# == Schema Information
-#
-# Table name: subscriptions
-#
-#  id                   :integer          not null, primary key
-#  billing_plan         :string           default("trial")
-#  expiry               :datetime
-#  payment_source_added :boolean          default(FALSE)
-#  pricing_version      :string
-#  state                :integer          default("trial")
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
-#  account_id           :integer
-#  stripe_customer_id   :string
-#
-
-class Subscription < ApplicationRecord
-  include Events::Types
-
-  belongs_to :account
-  before_create :set_default_billing_params
-  after_create :notify_creation
-
-  enum state: [:trial, :active, :cancelled]
-
-  def payment_source_added!
-    self.payment_source_added = true
-    save
-  end
-
-  def trial_expired?
-    (trial? && expiry < Date.current) ||
-      (cancelled? && !payment_source_added)
-  end
-
-  def suspended?
-    cancelled? && payment_source_added
-  end
-
-  def summary
-    {
-      state: state,
-      expiry: expiry.to_i
-    }
-  end
-
-  private
-
-  def set_default_billing_params
-    self.expiry = Time.now + Plan.default_trial_period
-    self.pricing_version = Plan.default_pricing_version
-  end
-
-  def notify_creation
-    Rails.configuration.dispatcher.dispatch(SUBSCRIPTION_CREATED, Time.zone.now, subscription: self)
-  end
-end
diff --git a/app/models/user.rb b/app/models/user.rb
index 2476f586e..6157767a2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -118,7 +118,6 @@ class User < ApplicationRecord
 
   def serializable_hash(options = nil)
     serialized_user = super(options).merge(confirmed: confirmed?)
-    serialized_user.merge(subscription: account.try(:subscription).try(:summary)) if ENV['BILLING_ENABLED']
     serialized_user
   end
 
diff --git a/app/services/subscription/chargebee_service.rb b/app/services/subscription/chargebee_service.rb
deleted file mode 100644
index 2df2af660..000000000
--- a/app/services/subscription/chargebee_service.rb
+++ /dev/null
@@ -1,70 +0,0 @@
-class Subscription::ChargebeeService
-  class << self
-    def create_subscription(account)
-      result = ChargeBee::Subscription.create(
-        plan_id: Plan.paid_plan.id,
-        customer: {
-          email: account.users.administrator.try(:first).try(:email),
-          first_name: account.name,
-          company: account.name
-        }
-      )
-      subscription = account.subscription
-      subscription.stripe_customer_id = result.subscription.customer_id
-      subscription.save
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-
-    def update_subscription(account)
-      subscription = account.subscription
-      agents_count = account.users.count
-      ChargeBee::Subscription.update(subscription.stripe_customer_id, plan_quantity: agents_count)
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-
-    def cancel_subscription(account)
-      subscription = account.subscription
-      ChargeBee::Subscription.delete(subscription.stripe_customer_id)
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-
-    def reactivate_subscription(account)
-      subscription = account.subscription
-      ChargeBee::Subscription.reactivate(subscription.stripe_customer_id)
-      subscription.active!
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-
-    def deactivate_subscription(account)
-      subscription = account.subscription
-      ChargeBee::Subscription.cancel(subscription.stripe_customer_id)
-      subscription.cancelled!
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-
-    def hosted_page_url(account)
-      subscription = account.subscription
-
-      # result = ChargeBee::HostedPage.checkout_existing({
-      #   :subscription => {
-      #     :id => subscription.stripe_customer_id,
-      #     :plan_id => Plan.paid_plan.id
-      #   }
-      # })
-
-      result = ChargeBee::HostedPage.update_payment_method(
-        customer: {
-          id: subscription.stripe_customer_id
-        }
-      )
-      result.hosted_page.url
-    rescue StandardError => e
-      Raven.capture_exception(e)
-    end
-  end
-end
diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb
index f93ccb464..c2dae5279 100644
--- a/app/views/layouts/vueapp.html.erb
+++ b/app/views/layouts/vueapp.html.erb
@@ -31,7 +31,6 @@
       window.chatwootConfig = {
         hostURL: '<%= ENV.fetch('FRONTEND_URL', '') %>',
         fbAppId: '<%= ENV.fetch('FB_APP_ID', nil) %>',
-        billingEnabled: <%= ActiveModel::Type::Boolean.new.cast(ENV.fetch('BILLING_ENABLED', false)) %>,
         signupEnabled: '<%= ENV.fetch('ENABLE_ACCOUNT_SIGNUP', true) %>',
         <% if ENV['VAPID_PUBLIC_KEY'] %>
         vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(ENV['VAPID_PUBLIC_KEY']).bytes %>),
diff --git a/config/initializers/00_init.rb b/config/initializers/00_init.rb
deleted file mode 100644
index f2fc3c112..000000000
--- a/config/initializers/00_init.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-PLAN_CONFIG = YAML.load_file(File.join(Rails.root, 'config', 'plans.yml'))
-$chargebee = ChargeBee.configure(site: ENV['CHARGEBEE_SITE'], api_key: ENV['CHARGEBEE_API_KEY'])
diff --git a/config/plans.yml b/config/plans.yml
deleted file mode 100644
index a00917dd4..000000000
--- a/config/plans.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-active:
-  v1:
-    paid:
-      name: 'Platinum'
-      id: 'v1-platinum'
-      price: 29
-    trial:
-      name: 'Trial'
-      id: 'v1Trial'
-      price: 0
-inactive:
-  v0:
-    free:
-      name: 'Free'
-      price: 0
-trial_period: 365
-default_pricing_version: 'v1'
diff --git a/config/routes.rb b/config/routes.rb
index b0a9b9388..f1c3327d4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -83,13 +83,6 @@ Rails.application.routes.draw do
           resources :notifications, only: [:index, :update]
           resource :notification_settings, only: [:show, :update]
 
-          # this block is only required if subscription via chargebee is enabled
-          resources :subscriptions, only: [:index] do
-            collection do
-              get :summary
-            end
-          end
-
           resources :webhooks, except: [:show]
         end
       end
@@ -114,12 +107,6 @@ Rails.application.routes.draw do
         resources :inbox_members, only: [:index]
         resources :labels, only: [:create, :destroy]
       end
-
-      resources :webhooks, only: [] do
-        collection do
-          post :chargebee
-        end
-      end
     end
 
     namespace :v2 do
diff --git a/db/migrate/20200607140737_remove_subscriptions.rb b/db/migrate/20200607140737_remove_subscriptions.rb
new file mode 100644
index 000000000..33f756083
--- /dev/null
+++ b/db/migrate/20200607140737_remove_subscriptions.rb
@@ -0,0 +1,15 @@
+class RemoveSubscriptions < ActiveRecord::Migration[6.0]
+  def change
+    drop_table :subscriptions do |t|
+      t.string 'pricing_version'
+      t.integer 'account_id'
+      t.datetime 'expiry'
+      t.string 'billing_plan', default: 'trial'
+      t.string 'stripe_customer_id'
+      t.datetime 'created_at', null: false
+      t.datetime 'updated_at', null: false
+      t.integer 'state', default: 0
+      t.boolean 'payment_source_added', default: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1ef9c48e1..914058c79 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: 2020_06_06_132552) do
+ActiveRecord::Schema.define(version: 2020_06_07_140737) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -328,18 +328,6 @@ ActiveRecord::Schema.define(version: 2020_06_06_132552) do
     t.index ["user_id"], name: "index_notifications_on_user_id"
   end
 
-  create_table "subscriptions", id: :serial, force: :cascade do |t|
-    t.string "pricing_version"
-    t.integer "account_id"
-    t.datetime "expiry"
-    t.string "billing_plan", default: "trial"
-    t.string "stripe_customer_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.integer "state", default: 0
-    t.boolean "payment_source_added", default: false
-  end
-
   create_table "super_admins", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
diff --git a/lib/webhooks/chargebee.rb b/lib/webhooks/chargebee.rb
deleted file mode 100644
index dd28a110b..000000000
--- a/lib/webhooks/chargebee.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-class Webhooks::Chargebee
-  SUPPORTED_EVENTS = [:subscription_created, :subscription_trial_end_reminder,
-                      :subscription_activated, :subscription_cancelled,
-                      :subscription_reactivated, :subscription_deleted,
-                      :subscription_renewed, :payment_source_added, :subscription_changed].freeze
-
-  attr_accessor :params, :account
-
-  def initialize(params)
-    @params = params
-  end
-
-  def consume
-    send(event_name) if supported_event?
-  end
-
-  private
-
-  def event_name
-    @params[:event_type]
-  end
-
-  def customer_id
-    @params[:content][:customer][:id]
-  end
-
-  def trial_ends_on
-    trial_end = @params[:content][:subscription][:trial_end]
-    DateTime.strptime(trial_end, '%s')
-  end
-
-  def supported_event?
-    SUPPORTED_EVENTS.include?(event_name.to_sym)
-  end
-
-  def subscription
-    @subscriptiom ||= Subscription.find_by(stripe_customer_id: customer_id)
-  end
-
-  def subscription_created
-    Raven.capture_message("subscription created for #{customer_id}")
-  end
-
-  def subscription_changed
-    if subscription.expiry != trial_ends_on
-      subscription.expiry = trial_ends_on
-      subscription.save
-      subscription.trial!
-    end
-  end
-
-  def subscription_trial_end_reminder
-    # Raven.capture_message("subscription trial end reminder for #{customer_id}")
-  end
-
-  def subscription_activated
-    subscription.active!
-    Raven.capture_message("subscription activated for #{customer_id}")
-  end
-
-  def subscription_cancelled
-    # if there is a reason field in response. Then cancellation is due to payment failure
-    subscription.cancelled!
-    Raven.capture_message("subscription cancelled for #{customer_id}")
-  end
-
-  def subscription_reactivated
-    # TODO: send mail to user that account is reactivated
-    subscription.active!
-    Raven.capture_message("subscription reactivated for #{customer_id}")
-  end
-
-  def subscription_renewed
-    # TODO: Needs this to show payment history.
-    Raven.capture_message("subscription renewed for #{customer_id}")
-  end
-
-  def subscription_deleted; end
-
-  def payment_source_added
-    Raven.capture_message("payment source added for #{customer_id}")
-    subscription.payment_source_added!
-  end
-end
diff --git a/spec/controllers/api/v1/accounts/subscriptions_controller_spec.rb b/spec/controllers/api/v1/accounts/subscriptions_controller_spec.rb
deleted file mode 100644
index af7071f21..000000000
--- a/spec/controllers/api/v1/accounts/subscriptions_controller_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'Subscriptions API', type: :request do
-  let(:account) { create(:account) }
-
-  describe 'GET /api/v1/accounts/{account.id}/subscriptions' do
-    context 'when it is an unauthenticated user' do
-      it 'returns unauthorized' do
-        ENV['BILLING_ENABLED'] = 'true'
-
-        get "/api/v1/accounts/#{account.id}/subscriptions"
-
-        expect(response).to have_http_status(:unauthorized)
-
-        ENV['BILLING_ENABLED'] = nil
-      end
-    end
-
-    context 'when it is an authenticated user' do
-      let(:agent) { create(:user, account: account, role: :agent) }
-
-      it 'returns all subscriptions' do
-        ENV['BILLING_ENABLED'] = 'true'
-
-        get "/api/v1/accounts/#{account.id}/subscriptions",
-            headers: agent.create_new_auth_token,
-            as: :json
-
-        expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body)).to eq(account.subscription_data.as_json)
-
-        ENV['BILLING_ENABLED'] = nil
-      end
-
-      it 'throws 404 error if env variable is not set' do
-        ENV['BILLING_ENABLED'] = nil
-
-        get "/api/v1/accounts/#{account.id}/subscriptions",
-            headers: agent.create_new_auth_token,
-            as: :json
-
-        expect(response).to have_http_status(:not_found)
-      end
-    end
-  end
-end
diff --git a/spec/fixtures/subscriptions.yml b/spec/fixtures/subscriptions.yml
deleted file mode 100644
index f279a5c48..000000000
--- a/spec/fixtures/subscriptions.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
-
-one:
-  pricing_version: MyString
-  account_id: 1
-  expiry: 2017-04-24 22:47:08
-  billing_plan: MyString
-  stripe_customer_id: MyString
-
-two:
-  pricing_version: MyString
-  account_id: 1
-  expiry: 2017-04-24 22:47:08
-  billing_plan: MyString
-  stripe_customer_id: MyString
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 821eb31ba..59929ae8f 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -14,7 +14,6 @@ RSpec.describe Account do
   it { is_expected.to have_many(:canned_responses).dependent(:destroy) }
   it { is_expected.to have_many(:facebook_pages).class_name('::Channel::FacebookPage').dependent(:destroy) }
   it { is_expected.to have_many(:web_widgets).class_name('::Channel::WebWidget').dependent(:destroy) }
-  it { is_expected.to have_one(:subscription).dependent(:destroy) }
   it { is_expected.to have_many(:webhooks).dependent(:destroy) }
   it { is_expected.to have_many(:notification_settings).dependent(:destroy) }
   it { is_expected.to have_many(:events) }

From 602132119b7da5a8692888d4d0184ab0d86d3aed Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 8 Jun 2020 19:13:33 +0530
Subject: [PATCH 08/50] Fix socket reconnect if the pubsub token is same (#942)

---
 app/javascript/widget/helpers/actionCable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index a743471f5..c4ab32b27 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -56,7 +56,7 @@ class ActionCableConnector extends BaseActionCableConnector {
 }
 
 export const refreshActionCableConnector = pubsubToken => {
-  if (!pubsubToken) {
+  if (!pubsubToken || window.chatwootPubsubToken === pubsubToken) {
     return;
   }
   window.chatwootPubsubToken = pubsubToken;

From 40481f64623df2dfd5da8c5db144725d5a77d4ab Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Tue, 9 Jun 2020 16:26:33 +0530
Subject: [PATCH 09/50] Bugfix: Update conversation counters in realtime (#944)

* Bug: Update conversation counters in realtime
---
 .../dashboard/api/inbox/conversation.js       | 10 +++++++
 .../api/specs/inbox/conversation.spec.js      | 19 ++++++++++++
 .../dashboard/api/specs/inboxes.spec.js       |  2 +-
 .../assets/scss/widgets/_conv-header.scss     |  2 ++
 .../scss/widgets/_conversation-view.scss      |  1 +
 .../dashboard/components/ChatList.vue         | 20 +++++++++----
 .../dashboard/helper/actionCable.js           |  8 +++++
 .../store/modules/conversations/actions.js    |  9 ++++++
 .../conversations/specs/actions.spec.js       | 30 +++++++++++++++++++
 .../accounts/conversations/meta.json.jbuilder | 10 +++----
 .../accounts/conversations_controller_spec.rb |  2 +-
 11 files changed, 99 insertions(+), 14 deletions(-)
 create mode 100644 app/javascript/dashboard/api/specs/inbox/conversation.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index 9a50ef1c8..d3942efea 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -43,6 +43,16 @@ class ConversationApi extends ApiClient {
   mute(conversationId) {
     return axios.post(`${this.url}/${conversationId}/mute`);
   }
+
+  meta({ inboxId, status, assigneeType }) {
+    return axios.get(`${this.url}/meta`, {
+      params: {
+        inbox_id: inboxId,
+        status,
+        assignee_type: assigneeType,
+      },
+    });
+  }
 }
 
 export default new ConversationApi();
diff --git a/app/javascript/dashboard/api/specs/inbox/conversation.spec.js b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
new file mode 100644
index 000000000..4eceba728
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/inbox/conversation.spec.js
@@ -0,0 +1,19 @@
+import conversationAPI from '../../inbox/conversation';
+import ApiClient from '../../ApiClient';
+
+describe('#ConversationAPI', () => {
+  it('creates correct instance', () => {
+    expect(conversationAPI).toBeInstanceOf(ApiClient);
+    expect(conversationAPI).toHaveProperty('get');
+    expect(conversationAPI).toHaveProperty('show');
+    expect(conversationAPI).toHaveProperty('create');
+    expect(conversationAPI).toHaveProperty('update');
+    expect(conversationAPI).toHaveProperty('delete');
+    expect(conversationAPI).toHaveProperty('toggleStatus');
+    expect(conversationAPI).toHaveProperty('assignAgent');
+    expect(conversationAPI).toHaveProperty('markMessageRead');
+    expect(conversationAPI).toHaveProperty('toggleTyping');
+    expect(conversationAPI).toHaveProperty('mute');
+    expect(conversationAPI).toHaveProperty('meta');
+  });
+});
diff --git a/app/javascript/dashboard/api/specs/inboxes.spec.js b/app/javascript/dashboard/api/specs/inboxes.spec.js
index d1a1d2683..c4927e2bb 100644
--- a/app/javascript/dashboard/api/specs/inboxes.spec.js
+++ b/app/javascript/dashboard/api/specs/inboxes.spec.js
@@ -1,7 +1,7 @@
 import inboxes from '../inboxes';
 import ApiClient from '../ApiClient';
 
-describe('#AgentAPI', () => {
+describe('#InboxesAPI', () => {
   it('creates correct instance', () => {
     expect(inboxes).toBeInstanceOf(ApiClient);
     expect(inboxes).toHaveProperty('get');
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
index 6de396353..e1aef9307 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conv-header.scss
@@ -66,6 +66,8 @@
 }
 
 .button.resolve--button {
+  @include flex-align($x: center, $y: middle);
+
   width: 13.2rem;
 
   >.icon {
diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 6aef3e3f9..12d0f21a9 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -26,6 +26,7 @@
 
     .link {
       color: $color-white;
+      text-decoration: underline;
     }
   }
 
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 59012d516..a4cec45e3 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -55,6 +55,7 @@
 <script>
 /* eslint-env browser */
 /* eslint no-console: 0 */
+/* global bus */
 import { mapGetters } from 'vuex';
 
 import ChatFilter from './widgets/conversation/ChatFilter';
@@ -109,6 +110,14 @@ export default {
         this.activeAssigneeTab
       );
     },
+    conversationFilters() {
+      return {
+        inboxId: this.conversationInbox ? this.conversationInbox : undefined,
+        assigneeType: this.activeAssigneeTab,
+        status: this.activeStatus,
+        page: this.currentPage + 1,
+      };
+    },
   },
   watch: {
     conversationInbox() {
@@ -119,6 +128,10 @@ export default {
     this.$store.dispatch('setChatFilter', this.activeStatus);
     this.resetAndFetchData();
     this.$store.dispatch('agents/get');
+
+    bus.$on('fetch_conversation_stats', () => {
+      this.$store.dispatch('getConversationStats', this.conversationFilters);
+    });
   },
   methods: {
     resetAndFetchData() {
@@ -127,12 +140,7 @@ export default {
       this.fetchConversations();
     },
     fetchConversations() {
-      this.$store.dispatch('fetchAllConversations', {
-        inboxId: this.conversationInbox ? this.conversationInbox : undefined,
-        assigneeType: this.activeAssigneeTab,
-        status: this.activeStatus,
-        page: this.currentPage + 1,
-      });
+      this.$store.dispatch('fetchAllConversations', this.conversationFilters);
     },
     updateAssigneeTab(selectedTab) {
       if (this.activeAssigneeTab !== selectedTab) {
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index b4401750a..107f85637 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -1,5 +1,6 @@
 import AuthAPI from '../api/auth';
 import BaseActionCableConnector from '../../shared/helpers/BaseActionCableConnector';
+/* global bus */
 
 class ActionCableConnector extends BaseActionCableConnector {
   constructor(app, pubsubToken) {
@@ -45,10 +46,12 @@ class ActionCableConnector extends BaseActionCableConnector {
     if (id) {
       this.app.$store.dispatch('updateAssignee', { id, assignee });
     }
+    this.fetchConversationStats();
   };
 
   onConversationCreated = data => {
     this.app.$store.dispatch('addConversation', data);
+    this.fetchConversationStats();
   };
 
   onLogout = () => AuthAPI.logout();
@@ -61,6 +64,7 @@ class ActionCableConnector extends BaseActionCableConnector {
 
   onStatusChange = data => {
     this.app.$store.dispatch('updateConversation', data);
+    this.fetchConversationStats();
   };
 
   onTypingOn = ({ conversation, user }) => {
@@ -100,6 +104,10 @@ class ActionCableConnector extends BaseActionCableConnector {
       this.onTypingOff({ conversation, user });
     }, 30000);
   };
+
+  fetchConversationStats = () => {
+    bus.$emit('fetch_conversation_stats');
+  };
 }
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 826c92f35..d1e742728 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -236,6 +236,15 @@ const actions = {
       //
     }
   },
+
+  getConversationStats: async ({ commit }, params) => {
+    try {
+      const response = await ConversationApi.meta(params);
+      commit(types.default.SET_CONV_TAB_META, response.data.meta);
+    } catch (error) {
+      // Ignore error
+    }
+  },
 };
 
 export default actions;
diff --git a/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js b/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
new file mode 100644
index 000000000..4693e0a62
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
@@ -0,0 +1,30 @@
+import axios from 'axios';
+import actions from '../actions';
+import * as types from '../../../mutation-types';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#getConversationStats', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: { meta: { mine_count: 1 } } });
+      await actions.getConversationStats(
+        { commit },
+        { inboxId: 1, assigneeTpe: 'me', status: 'open' }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONV_TAB_META, { mine_count: 1 }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.getConversationStats(
+        { commit },
+        { inboxId: 1, assigneeTpe: 'me', status: 'open' }
+      );
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
+});
diff --git a/app/views/api/v1/accounts/conversations/meta.json.jbuilder b/app/views/api/v1/accounts/conversations/meta.json.jbuilder
index 8895ad24d..24fbf10d5 100644
--- a/app/views/api/v1/accounts/conversations/meta.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/meta.json.jbuilder
@@ -1,7 +1,5 @@
-json.data do
-  json.meta do
-    json.mine_count @conversations_count[:mine_count]
-    json.unassigned_count @conversations_count[:unassigned_count]
-    json.all_count @conversations_count[:all_count]
-  end
+json.meta do
+  json.mine_count @conversations_count[:mine_count]
+  json.unassigned_count @conversations_count[:unassigned_count]
+  json.all_count @conversations_count[:all_count]
 end
diff --git a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
index 9ea04c78c..af9eeaa4f 100644
--- a/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/conversations_controller_spec.rb
@@ -54,7 +54,7 @@ RSpec.describe 'Conversations API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        expect(JSON.parse(response.body, symbolize_names: true)[:data][:meta][:all_count]).to eq(1)
+        expect(JSON.parse(response.body, symbolize_names: true)[:meta][:all_count]).to eq(1)
       end
     end
   end

From 8b022311c04e437480dff6d64db8b846fec4ec66 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 9 Jun 2020 17:42:18 +0530
Subject: [PATCH 10/50] Chore: FCM Push Fixes (#934)

---
 .../v1/accounts/notifications_controller.rb   |  9 ++++--
 app/models/notification.rb                    | 23 ++++++++++++++
 .../notification/push_notification_service.rb | 27 ++++++-----------
 .../notifications/index.json.jbuilder         | 18 +++++++++++
 config/routes.rb                              |  6 +++-
 .../accounts/notifications_controller_spec.rb | 30 +++++++++++++++++++
 6 files changed, 92 insertions(+), 21 deletions(-)
 create mode 100644 app/views/api/v1/accounts/notifications/index.json.jbuilder

diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 0f82d0013..1ec27ba29 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -4,8 +4,13 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   before_action :fetch_notification, only: [:update]
 
   def index
-    @notifications = current_user.notifications.where(account_id: Current.account.id)
-    render json: @notifications
+    @unread_count = current_user.notifications.where(account_id: current_account.id, read_at: nil).count
+    @notifications = current_user.notifications.where(account_id: current_account.id).page params[:page]
+  end
+
+  def read_all
+    current_user.notifications.where(account_id: current_account.id, read_at: nil).update(read_at: DateTime.now.utc)
+    head :ok
   end
 
   def update
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 2e81d07c9..660bcc33c 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -38,6 +38,29 @@ class Notification < ApplicationRecord
 
   after_create_commit :process_notification_delivery
 
+  def push_event_data
+    {
+      id: id,
+      notification_type: notification_type,
+      primary_actor: primary_actor&.push_event_data,
+      read_at: read_at,
+      secondary_actor: secondary_actor&.push_event_data,
+      user: user&.push_event_data,
+      created_at: created_at
+    }
+  end
+
+  # TODO: move to a data presenter
+  def push_message_title
+    if notification_type == 'conversation_creation'
+      return "A new conversation [ID -#{primary_actor.display_id}] has been created in #{primary_actor.inbox.name}"
+    end
+
+    return "A new conversation [ID -#{primary_actor.display_id}] has been assigned to you." if notification_type == 'conversation_assignment'
+
+    ''
+  end
+
   private
 
   def process_notification_delivery
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index c29796d64..fadfddf53 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -29,21 +29,9 @@ class Notification::PushNotificationService
     @conversation ||= notification.primary_actor
   end
 
-  def push_message_title
-    if notification.notification_type == 'conversation_creation'
-      return "A new conversation [ID -#{conversation.display_id}] has been created in #{conversation.inbox.name}"
-    end
-
-    if notification.notification_type == 'conversation_assignment'
-      return "A new conversation [ID -#{conversation.display_id}] has been assigned to you."
-    end
-
-    ''
-  end
-
   def push_message
     {
-      title: push_message_title,
+      title: notification.push_message_title,
       tag: "#{notification.notification_type}_#{conversation.display_id}",
       url: push_url
     }
@@ -78,11 +66,14 @@ class Notification::PushNotificationService
     return unless subscription.fcm?
 
     fcm = FCM.new(ENV['FCM_SERVER_KEY'])
-    options = { "notification": {
-      "title": notification.notification_type.titleize,
-      "body": push_message_title,
-      "notification": notification.to_json
-    } }
+    options = {
+      "notification": {
+        "title": notification.notification_type.titleize,
+        "body": notification.push_message_title
+      },
+      "data": { notification: notification.push_event_data.to_json }
+    }
+
     response = fcm.send([subscription.subscription_attributes['push_token']], options)
     subscription.destroy! if JSON.parse(response[:body])['results']&.first&.keys&.include?('error')
   end
diff --git a/app/views/api/v1/accounts/notifications/index.json.jbuilder b/app/views/api/v1/accounts/notifications/index.json.jbuilder
new file mode 100644
index 000000000..048c3d85c
--- /dev/null
+++ b/app/views/api/v1/accounts/notifications/index.json.jbuilder
@@ -0,0 +1,18 @@
+json.data do
+  json.meta do
+    json.unread_count @unread_count
+  end
+
+  json.payload do
+    json.array! @notifications do |notification|
+      json.id notification.id
+      json.notification_type notification.notification_type
+      json.push_message_title notification.push_message_title
+      json.primary_actor notification.primary_actor&.push_event_data
+      json.read_at notification.read_at
+      json.secondary_actor notification.secondary_actor&.push_event_data
+      json.user notification.user&.push_event_data
+      json.created_at notification.created_at.to_i
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index f1c3327d4..4f7d36d07 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -80,7 +80,11 @@ Rails.application.routes.draw do
           resources :inbox_members, only: [:create, :show], param: :inbox_id
           resources :labels, only: [:index, :show, :create, :update, :destroy]
 
-          resources :notifications, only: [:index, :update]
+          resources :notifications, only: [:index, :update] do
+            collection do
+              post :read_all
+            end
+          end
           resource :notification_settings, only: [:show, :update]
 
           resources :webhooks, except: [:show]
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index fac2df97b..594a198b6 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -21,8 +21,38 @@ RSpec.describe 'Notifications API', type: :request do
             headers: admin.create_new_auth_token,
             as: :json
 
+        response_json = JSON.parse(response.body)
         expect(response).to have_http_status(:success)
         expect(response.body).to include(notification.notification_type)
+        expect(response_json['data']['meta']['unread_count']).to eq 1
+      end
+    end
+  end
+
+  describe 'POST /api/v1/accounts/{account.id}/notifications/read_all' do
+    let(:admin) { create(:user, account: account, role: :administrator) }
+    let!(:notification1) { create(:notification, account: account, user: admin) }
+    let!(:notification2) { create(:notification, account: account, user: admin) }
+
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/notifications/read_all"
+
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:admin) { create(:user, account: account, role: :administrator) }
+
+      it 'updates all the notifications read at' do
+        post "/api/v1/accounts/#{account.id}/notifications/read_all",
+             headers: admin.create_new_auth_token,
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(notification1.reload.read_at).not_to eq('')
+        expect(notification2.reload.read_at).not_to eq('')
       end
     end
   end

From 432dad203be4b9e752b5761e0d48fc498273aaf0 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 9 Jun 2020 23:54:35 +0530
Subject: [PATCH 11/50] Feature: Inbox greeting message (#927)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .../api/v1/accounts/inboxes_controller.rb     | 14 ++-
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/en/inboxMgmt.json   | 10 +-
 .../dashboard/i18n/locale/es/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  2 +-
 .../dashboard/i18n/locale/nl/inboxMgmt.json   | 12 ++-
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  2 +-
 .../i18n/locale/pt_BR/inboxMgmt.json          |  2 +-
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  2 +-
 .../dashboard/settings/inbox/Settings.vue     | 94 +++++++++++--------
 .../settings/inbox/channels/Website.vue       | 45 +++++++--
 app/models/inbox.rb                           |  2 +
 app/models/message.rb                         | 12 ++-
 app/services/facebook/send_reply_service.rb   |  2 +-
 .../hook_execution_service.rb                 | 12 ++-
 .../template/email_collect.rb                 | 16 ----
 .../message_templates/template/greeting.rb    | 32 +++++++
 .../twilio/outgoing_message_service.rb        |  6 +-
 .../twitter/direct_message_parser_service.rb  |  2 +-
 app/services/twitter/send_reply_service.rb    |  2 +-
 .../v1/accounts/inboxes/create.json.jbuilder  |  3 +-
 .../v1/accounts/inboxes/index.json.jbuilder   |  3 +-
 .../v1/accounts/inboxes/update.json.jbuilder  |  3 +-
 config/locales/ca.yml                         |  2 +-
 config/locales/cs.yml                         |  2 +-
 config/locales/de.yml                         |  2 +-
 config/locales/el.yml                         |  2 +-
 config/locales/en.yml                         |  2 +-
 config/locales/es.yml                         |  2 +-
 config/locales/fr.yml                         |  2 +-
 config/locales/it.yml                         |  2 +-
 config/locales/ml.yml                         |  2 +-
 config/locales/nl.yml                         |  2 +-
 config/locales/pl.yml                         |  2 +-
 config/locales/pt.yml                         |  2 +-
 config/locales/pt_BR.yml                      |  2 +-
 config/locales/ro.yml                         |  2 +-
 config/locales/sv.yml                         |  2 +-
 ...130625_agent_away_message_to_auto_reply.rb | 21 +++++
 db/schema.rb                                  |  3 +-
 .../api/v1/widget/messages_controller_spec.rb |  4 +-
 spec/finders/message_finder_spec.rb           |  8 +-
 spec/lib/webhooks/twitter_spec.rb             |  2 +-
 spec/mailboxes/conversation_mailbox_spec.rb   |  2 +-
 .../hook_execution_service_spec.rb            | 13 ++-
 .../template/email_collect_spec.rb            |  2 +-
 .../template/greeting_spec.rb                 | 12 +++
 .../twilio/incoming_message_service_spec.rb   |  3 +-
 48 files changed, 262 insertions(+), 120 deletions(-)
 create mode 100644 app/services/message_templates/template/greeting.rb
 create mode 100644 db/migrate/20200605130625_agent_away_message_to_auto_reply.rb
 create mode 100644 spec/services/message_templates/template/greeting_spec.rb

diff --git a/app/controllers/api/v1/accounts/inboxes_controller.rb b/app/controllers/api/v1/accounts/inboxes_controller.rb
index fe19400c3..45a190bfb 100644
--- a/app/controllers/api/v1/accounts/inboxes_controller.rb
+++ b/app/controllers/api/v1/accounts/inboxes_controller.rb
@@ -10,7 +10,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   def create
     ActiveRecord::Base.transaction do
       channel = web_widgets.create!(permitted_params[:channel].except(:type)) if permitted_params[:channel][:type] == 'web_widget'
-      @inbox = Current.account.inboxes.build(name: permitted_params[:name], channel: channel)
+      @inbox = Current.account.inboxes.build(
+        name: permitted_params[:name],
+        greeting_message: permitted_params[:greeting_message],
+        greeting_enabled: permitted_params[:greeting_enabled],
+        channel: channel
+      )
       @inbox.avatar.attach(permitted_params[:avatar])
       @inbox.save!
     end
@@ -56,11 +61,12 @@ class Api::V1::Accounts::InboxesController < Api::V1::Accounts::BaseController
   end
 
   def permitted_params
-    params.permit(:id, :avatar, :name, channel: [:type, :website_url, :widget_color, :welcome_title, :welcome_tagline, :agent_away_message])
+    params.permit(:id, :avatar, :name, :greeting_message, :greeting_enabled, channel:
+      [:type, :website_url, :widget_color, :welcome_title, :welcome_tagline])
   end
 
   def inbox_update_params
-    params.permit(:enable_auto_assignment, :name, :avatar, channel: [:website_url, :widget_color, :welcome_title,
-                                                                     :welcome_tagline, :agent_away_message])
+    params.permit(:enable_auto_assignment, :name, :avatar, :greeting_message, :greeting_enabled,
+                  channel: [:website_url, :widget_color, :welcome_title, :welcome_tagline])
   end
 end
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 0a18b005b..7622b72f1 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -54,7 +54,7 @@
           "LABEL": "Καλώς ήλθατε (Tagline)",
           "PLACEHOLDER": "Είναι απλό να συνδεθείτε μαζί μας. Ζητήστε μας οτιδήποτε, ή μοιραστείτε την εμπειρία σας."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Μήνυμα όταν δεν υπάρχουν πράκτορες",
           "PLACEHOLDER": "Τυπικά απαντάμε σε μερικές ώρες."
         },
diff --git a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
index 514391664..c885c9ab5 100644
--- a/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/en/inboxMgmt.json
@@ -63,10 +63,16 @@
           "LABEL": "Welcome Tagline",
           "PLACEHOLDER": "We make it simple to connect with us. Ask us anything, or share your feedback."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
-          "LABEL": "Agents Away Message",
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Color",
           "PLACEHOLDER": "Update the widget color used in widget"
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 0c71f17a2..9c19709d2 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -63,7 +63,7 @@
           "LABEL": "Bienvenido Tagline",
           "PLACEHOLDER": "Facilitamos la conexión con nosotros. Pídanos cualquier cosa o comparte tus comentarios."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mensaje de Agentes Ausentes",
           "PLACEHOLDER": "Acme Inc normalmente responde en unas pocas horas."
         },
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index fe35bf261..48bf6f51c 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -54,7 +54,7 @@
           "LABEL": "Slogan d'accueil",
           "PLACEHOLDER": "C'est simple de rentrer en contact avec nous. Demandez-nous quoi que ce soit ou partagez vos commentaires."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Message lorsque les agents sont absents",
           "PLACEHOLDER": "Acme Inc répond en général en quelques heures."
         },
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 981ca5ffc..74f3e97ac 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -54,9 +54,15 @@
           "LABEL": "Welkom Tagline",
           "PLACEHOLDER": "We maken het eenvoudig om met ons te verbinden. Vraag ons iets of deel uw feedback."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
-          "LABEL": "Agents Afwezig Bericht",
-          "PLACEHOLDER": "Acme Inc reageert meestal binnen een paar uur."
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Kanaalbegroeting",
+          "PLACEHOLDER": "Acme Inc antwoordt meestal binnen een paar uur."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Kanaalbegroeting inschakelen",
+          "HELP_TEXT": "Stuur een begroetingsbericht naar de gebruiker wanneer hij het gesprek start.",
+          "ENABLED": "Ingeschakeld",
+          "DISABLED": "Gehandicapt"
         },
         "WIDGET_COLOR": {
           "LABEL": "Kleur van widget",
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 631470370..4fca33c25 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -54,7 +54,7 @@
           "LABEL": "Bem-vindo Slogan",
           "PLACEHOLDER": "Nós simplificamos nos conectar com a gente. Pergunte a nós qualquer coisa ou compartilhe seus comentários."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mensagem Ausente dos Agentes",
           "PLACEHOLDER": "Acme Inc normalmente responde em algumas horas."
         },
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 8320edde7..7198a343e 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -54,7 +54,7 @@
           "LABEL": "Bem-vindo, saudação",
           "PLACEHOLDER": "Nós tornamos simples a conexão conosco. Pergunte qualquer assunto ou compartilhe seus comentários."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mensagem de agente ausente",
           "PLACEHOLDER": "Acme Inc tipicamente retorna em algumas horas."
         },
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 702a3b1d5..581121dbb 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -54,7 +54,7 @@
           "LABEL": "Tagline de Bun Venit",
           "PLACEHOLDER": "Noi facem conectarea cu noi simplă. Întreabă-ne orice, sau partajează-ți feedback-ul."
         },
-        "CHANNEL_AGENT_AWAY_MESSAGE": {
+        "CHANNEL_GREETING_MESSAGE": {
           "LABEL": "Mesaj Agent Indisponibil",
           "PLACEHOLDER": "De obicei, Acme Inc răspunde în câteva ore."
         },
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index b36756b6e..99671a7c1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -18,7 +18,7 @@
         <woot-input
           v-if="isAWidgetInbox"
           v-model.trim="selectedInboxName"
-          class="medium-12 columns"
+          class="medium-9 columns"
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.LABEL')"
           :placeholder="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_NAME.PLACEHOLDER')
@@ -27,7 +27,7 @@
         <woot-input
           v-if="isAWidgetInbox"
           v-model.trim="channelWebsiteUrl"
-          class="medium-12 columns"
+          class="medium-9 columns"
           :label="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.LABEL')"
           :placeholder="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_DOMAIN.PLACEHOLDER')
@@ -36,7 +36,7 @@
         <woot-input
           v-if="isAWidgetInbox"
           v-model.trim="channelWelcomeTitle"
-          class="medium-12 columns"
+          class="medium-9 columns"
           :label="
             $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TITLE.LABEL')
           "
@@ -46,46 +46,61 @@
             )
           "
         />
-        <woot-input
-          v-if="isAWidgetInbox"
-          v-model.trim="channelWelcomeTagline"
-          class="medium-12 columns"
-          :label="
-            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.LABEL')
-          "
-          :placeholder="
-            $t(
-              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.PLACEHOLDER'
-            )
-          "
-        />
 
-        <woot-input
-          v-if="isAWidgetInbox"
-          v-model.trim="channelAgentAwayMessage"
-          class="medium-12 columns"
-          :label="
-            $t(
-              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AGENT_AWAY_MESSAGE.LABEL'
-            )
-          "
-          :placeholder="
-            $t(
-              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AGENT_AWAY_MESSAGE.PLACEHOLDER'
-            )
-          "
-        />
-        <label v-if="isAWidgetInbox" class="medium-12 columns">
+        <label v-if="isAWidgetInbox" class="medium-9 columns">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.WIDGET_COLOR.LABEL') }}
           <woot-color-picker v-model="inbox.widget_color" />
         </label>
-        <label class="medium-12 columns">
+
+        <label class="medium-9 columns">
+          {{
+            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.LABEL')
+          }}
+          <select v-model="greetingEnabled">
+            <option :value="true">
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.ENABLED'
+                )
+              }}
+            </option>
+            <option :value="false">
+              {{
+                $t(
+                  'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.DISABLED'
+                )
+              }}
+            </option>
+          </select>
+          <p class="help-text">
+            {{
+              $t(
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.HELP_TEXT'
+              )
+            }}
+          </p>
+        </label>
+
+        <woot-input
+          v-if="greetingEnabled"
+          v-model.trim="greetingMessage"
+          class="medium-9 columns"
+          :label="
+            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.LABEL')
+          "
+          :placeholder="
+            $t(
+              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.PLACEHOLDER'
+            )
+          "
+        />
+        <label class="medium-9 columns">
           {{ $t('INBOX_MGMT.SETTINGS_POPUP.AUTO_ASSIGNMENT') }}
           <select v-model="autoAssignment">
-            <option value="true">
+            <option :value="true">
               {{ $t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.ENABLED') }}
             </option>
-            <option value="false">
+            <option :value="false">
               {{ $t('INBOX_MGMT.EDIT.AUTO_ASSIGNMENT.DISABLED') }}
             </option>
           </select>
@@ -183,13 +198,14 @@ export default {
       avatarFile: null,
       avatarUrl: '',
       selectedAgents: [],
+      greetingEnabled: true,
+      greetingMessage: '',
       autoAssignment: false,
       isAgentListUpdating: false,
       selectedInboxName: '',
       channelWebsiteUrl: '',
       channelWelcomeTitle: '',
       channelWelcomeTagline: '',
-      channelAgentAwayMessage: '',
       autoAssignmentOptions: [
         {
           value: true,
@@ -247,11 +263,12 @@ export default {
         this.fetchAttachedAgents();
         this.avatarUrl = this.inbox.avatar_url;
         this.selectedInboxName = this.inbox.name;
+        this.greetingEnabled = this.inbox.greeting_enabled;
+        this.greetingMessage = this.inbox.greeting_message;
         this.autoAssignment = this.inbox.enable_auto_assignment;
         this.channelWebsiteUrl = this.inbox.website_url;
         this.channelWelcomeTitle = this.inbox.welcome_title;
         this.channelWelcomeTagline = this.inbox.welcome_tagline;
-        this.channelAgentAwayMessage = this.inbox.agent_away_message;
       });
     },
     async fetchAttachedAgents() {
@@ -294,12 +311,13 @@ export default {
           id: this.currentInboxId,
           name: this.selectedInboxName,
           enable_auto_assignment: this.autoAssignment,
+          greeting_enabled: this.greetingEnabled,
+          greeting_message: this.greetingMessage,
           channel: {
             widget_color: this.inbox.widget_color,
             website_url: this.channelWebsiteUrl,
             welcome_title: this.channelWelcomeTitle,
             welcome_tagline: this.channelWelcomeTagline,
-            agent_away_message: this.channelAgentAwayMessage,
           },
         };
         if (this.avatarFile) {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
index 644eb10a1..c992d38a0 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Website.vue
@@ -6,9 +6,8 @@
     />
     <woot-loading-state
       v-if="uiFlags.isCreating"
-      :message="$('INBOX_MGMT.ADD.WEBSITE_CHANNEL.LOADING_MESSAGE')"
-    >
-    </woot-loading-state>
+      :message="$t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.LOADING_MESSAGE')"
+    />
     <form
       v-if="!uiFlags.isCreating"
       class="row"
@@ -76,19 +75,43 @@
           />
         </label>
       </div>
-      <div class="medium-12 columns">
-        <label>
+      <label class="medium-12 columns">
+        {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.LABEL') }}
+        <select v-model="greetingEnabled">
+          <option :value="true">
+            {{
+              $t(
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.ENABLED'
+              )
+            }}
+          </option>
+          <option :value="false">
+            {{
+              $t(
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.DISABLED'
+              )
+            }}
+          </option>
+        </select>
+        <p class="help-text">
           {{
             $t(
-              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AGENT_AWAY_MESSAGE.LABEL'
+              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_TOGGLE.HELP_TEXT'
             )
           }}
+        </p>
+      </label>
+      <div v-if="greetingEnabled" class="medium-12 columns">
+        <label>
+          {{
+            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.LABEL')
+          }}
           <input
-            v-model.trim="channelAgentAwayMessage"
+            v-model.trim="greetingMessage"
             type="text"
             :placeholder="
               $t(
-                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_AGENT_AWAY_MESSAGE.PLACEHOLDER'
+                'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_GREETING_MESSAGE.PLACEHOLDER'
               )
             "
           />
@@ -124,7 +147,8 @@ export default {
       channelWidgetColor: '#009CE0',
       channelWelcomeTitle: '',
       channelWelcomeTagline: '',
-      channelAgentAwayMessage: '',
+      greetingEnabled: false,
+      greetingMessage: '',
     };
   },
   computed: {
@@ -138,13 +162,14 @@ export default {
         'inboxes/createWebsiteChannel',
         {
           name: this.inboxName,
+          greeting_enabled: this.greetingEnabled,
+          greeting_message: this.greetingMessage,
           channel: {
             type: 'web_widget',
             website_url: this.channelWebsiteUrl,
             widget_color: this.channelWidgetColor,
             welcome_title: this.channelWelcomeTitle,
             welcome_tagline: this.channelWelcomeTagline,
-            agent_away_message: this.channelAgentAwayMessage,
           },
         }
       );
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index 4fb395ba5..b5d276c56 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -7,6 +7,8 @@
 #  id                     :integer          not null, primary key
 #  channel_type           :string
 #  enable_auto_assignment :boolean          default(TRUE)
+#  greeting_enabled       :boolean          default(FALSE)
+#  greeting_message       :string
 #  name                   :string           not null
 #  created_at             :datetime         not null
 #  updated_at             :datetime         not null
diff --git a/app/models/message.rb b/app/models/message.rb
index 696ae5a2b..b8678ea0a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -71,11 +71,9 @@ class Message < ApplicationRecord
   has_many :attachments, dependent: :destroy, autosave: true, before_add: :validate_attachments_limit
 
   after_create :reopen_conversation,
-               :execute_message_template_hooks,
                :notify_via_mail
 
-  # we need to wait for the active storage attachments to be available
-  after_create_commit :dispatch_create_events, :send_reply
+  after_create_commit :execute_after_create_commit_callbacks
 
   after_update :dispatch_update_event
 
@@ -117,6 +115,14 @@ class Message < ApplicationRecord
 
   private
 
+  def execute_after_create_commit_callbacks
+    # rails issue with order of active record callbacks being executed
+    # https://github.com/rails/rails/issues/20911
+    dispatch_create_events
+    send_reply
+    execute_message_template_hooks
+  end
+
   def dispatch_create_events
     Rails.configuration.dispatcher.dispatch(MESSAGE_CREATED, Time.zone.now, message: self)
 
diff --git a/app/services/facebook/send_reply_service.rb b/app/services/facebook/send_reply_service.rb
index 9173ecac7..f80f329fd 100644
--- a/app/services/facebook/send_reply_service.rb
+++ b/app/services/facebook/send_reply_service.rb
@@ -23,7 +23,7 @@ class Facebook::SendReplyService
 
   def outgoing_message_from_chatwoot?
     # messages sent directly from chatwoot won't have source_id.
-    message.outgoing? && !message.source_id
+    (message.outgoing? || message.template?) && !message.source_id
   end
 
   # def reopen_lock
diff --git a/app/services/message_templates/hook_execution_service.rb b/app/services/message_templates/hook_execution_service.rb
index c626c4671..947c0f39f 100644
--- a/app/services/message_templates/hook_execution_service.rb
+++ b/app/services/message_templates/hook_execution_service.rb
@@ -4,6 +4,8 @@ class MessageTemplates::HookExecutionService
   def perform
     return if inbox.agent_bot_inbox&.active?
 
+    ::MessageTemplates::Template::Greeting.new(conversation: conversation).perform if should_send_greeting?
+
     ::MessageTemplates::Template::EmailCollect.new(conversation: conversation).perform if should_send_email_collect?
   end
 
@@ -16,8 +18,16 @@ class MessageTemplates::HookExecutionService
     conversation.messages.outgoing.count.zero? && conversation.messages.template.count.zero?
   end
 
+  def should_send_greeting?
+    first_message_from_contact? && conversation.inbox.greeting_enabled?
+  end
+
+  def email_collect_was_sent?
+    conversation.messages.where(content_type: 'input_email').present?
+  end
+
   def should_send_email_collect?
-    !contact_has_email? && conversation.inbox.web_widget? && first_message_from_contact?
+    !contact_has_email? && conversation.inbox.web_widget? && !email_collect_was_sent?
   end
 
   def contact_has_email?
diff --git a/app/services/message_templates/template/email_collect.rb b/app/services/message_templates/template/email_collect.rb
index e9e830d3b..667b6b6cd 100644
--- a/app/services/message_templates/template/email_collect.rb
+++ b/app/services/message_templates/template/email_collect.rb
@@ -3,7 +3,6 @@ class MessageTemplates::Template::EmailCollect
 
   def perform
     ActiveRecord::Base.transaction do
-      conversation.messages.create!(typical_reply_message_params)
       conversation.messages.create!(ways_to_reach_you_message_params)
       conversation.messages.create!(email_input_box_template_message_params)
     end
@@ -17,21 +16,6 @@ class MessageTemplates::Template::EmailCollect
   delegate :contact, :account, to: :conversation
   delegate :inbox, to: :message
 
-  def typical_reply_message_params
-    content = @conversation.inbox&.channel&.agent_away_message
-    if content.blank?
-      content = I18n.t('conversations.templates.typical_reply_message_body',
-                       account_name: account.name)
-    end
-
-    {
-      account_id: @conversation.account_id,
-      inbox_id: @conversation.inbox_id,
-      message_type: :template,
-      content: content
-    }
-  end
-
   def ways_to_reach_you_message_params
     content = I18n.t('conversations.templates.ways_to_reach_you_message_body',
                      account_name: account.name)
diff --git a/app/services/message_templates/template/greeting.rb b/app/services/message_templates/template/greeting.rb
new file mode 100644
index 000000000..478cc9bb7
--- /dev/null
+++ b/app/services/message_templates/template/greeting.rb
@@ -0,0 +1,32 @@
+class MessageTemplates::Template::Greeting
+  pattr_initialize [:conversation!]
+
+  def perform
+    ActiveRecord::Base.transaction do
+      conversation.messages.create!(greeting_message_params)
+    end
+  rescue StandardError => e
+    Raven.capture_exception(e)
+    true
+  end
+
+  private
+
+  delegate :contact, :account, to: :conversation
+  delegate :inbox, to: :message
+
+  def greeting_message_params
+    content = @conversation.inbox&.greeting_message
+    if content.blank?
+      content = I18n.t('conversations.templates.greeting_message_body',
+                       account_name: account.name)
+    end
+
+    {
+      account_id: @conversation.account_id,
+      inbox_id: @conversation.inbox_id,
+      message_type: :template,
+      content: content
+    }
+  end
+end
diff --git a/app/services/twilio/outgoing_message_service.rb b/app/services/twilio/outgoing_message_service.rb
index 015b2f75f..6c4371d76 100644
--- a/app/services/twilio/outgoing_message_service.rb
+++ b/app/services/twilio/outgoing_message_service.rb
@@ -5,7 +5,7 @@ class Twilio::OutgoingMessageService
     return if message.private
     return if message.source_id
     return if inbox.channel.class.to_s != 'Channel::TwilioSms'
-    return unless message.outgoing?
+    return unless outgoing_message?
 
     twilio_message = client.messages.create(message_params)
     message.update!(source_id: twilio_message.sid)
@@ -39,6 +39,10 @@ class Twilio::OutgoingMessageService
     @channel ||= inbox.channel
   end
 
+  def outgoing_message?
+    message.outgoing? || message.template?
+  end
+
   def client
     ::Twilio::REST::Client.new(channel.account_sid, channel.auth_token)
   end
diff --git a/app/services/twitter/direct_message_parser_service.rb b/app/services/twitter/direct_message_parser_service.rb
index f68d60815..bf83958ba 100644
--- a/app/services/twitter/direct_message_parser_service.rb
+++ b/app/services/twitter/direct_message_parser_service.rb
@@ -64,7 +64,7 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
   end
 
   def set_conversation
-    @conversation = @contact_inbox.conversations.first
+    @conversation = @contact_inbox.conversations.where("additional_attributes ->> 'type' = 'direct_message'").first
     return if @conversation
 
     @conversation = ::Conversation.create!(conversation_params)
diff --git a/app/services/twitter/send_reply_service.rb b/app/services/twitter/send_reply_service.rb
index e30786dc0..b68b3aef6 100644
--- a/app/services/twitter/send_reply_service.rb
+++ b/app/services/twitter/send_reply_service.rb
@@ -56,7 +56,7 @@ class Twitter::SendReplyService
   end
 
   def outgoing_message_from_chatwoot?
-    message.outgoing?
+    (message.outgoing? || message.template?)
   end
 
   delegate :additional_attributes, to: :contact
diff --git a/app/views/api/v1/accounts/inboxes/create.json.jbuilder b/app/views/api/v1/accounts/inboxes/create.json.jbuilder
index a596c0dd6..c046402bc 100644
--- a/app/views/api/v1/accounts/inboxes/create.json.jbuilder
+++ b/app/views/api/v1/accounts/inboxes/create.json.jbuilder
@@ -2,12 +2,13 @@ json.id @inbox.id
 json.channel_id @inbox.channel_id
 json.name @inbox.name
 json.channel_type @inbox.channel_type
+json.greeting_enabled @inbox.greeting_enabled
+json.greeting_message @inbox.greeting_message
 json.avatar_url @inbox.try(:avatar_url)
 json.website_token @inbox.channel.try(:website_token)
 json.widget_color @inbox.channel.try(:widget_color)
 json.website_url @inbox.channel.try(:website_url)
 json.welcome_title @inbox.channel.try(:welcome_title)
 json.welcome_tagline @inbox.channel.try(:welcome_tagline)
-json.agent_away_message @inbox.channel.try(:agent_away_message)
 json.web_widget_script @inbox.channel.try(:web_widget_script)
 json.enable_auto_assignment @inbox.enable_auto_assignment
diff --git a/app/views/api/v1/accounts/inboxes/index.json.jbuilder b/app/views/api/v1/accounts/inboxes/index.json.jbuilder
index 7d6879634..da52d6632 100644
--- a/app/views/api/v1/accounts/inboxes/index.json.jbuilder
+++ b/app/views/api/v1/accounts/inboxes/index.json.jbuilder
@@ -4,13 +4,14 @@ json.payload do
     json.channel_id inbox.channel_id
     json.name inbox.name
     json.channel_type inbox.channel_type
+    json.greeting_enabled inbox.greeting_enabled
+    json.greeting_message inbox.greeting_message
     json.avatar_url inbox.try(:avatar_url)
     json.page_id inbox.channel.try(:page_id)
     json.widget_color inbox.channel.try(:widget_color)
     json.website_url inbox.channel.try(:website_url)
     json.welcome_title inbox.channel.try(:welcome_title)
     json.welcome_tagline inbox.channel.try(:welcome_tagline)
-    json.agent_away_message inbox.channel.try(:agent_away_message)
     json.enable_auto_assignment inbox.enable_auto_assignment
     json.web_widget_script inbox.channel.try(:web_widget_script)
     json.phone_number inbox.channel.try(:phone_number)
diff --git a/app/views/api/v1/accounts/inboxes/update.json.jbuilder b/app/views/api/v1/accounts/inboxes/update.json.jbuilder
index a596c0dd6..c046402bc 100644
--- a/app/views/api/v1/accounts/inboxes/update.json.jbuilder
+++ b/app/views/api/v1/accounts/inboxes/update.json.jbuilder
@@ -2,12 +2,13 @@ json.id @inbox.id
 json.channel_id @inbox.channel_id
 json.name @inbox.name
 json.channel_type @inbox.channel_type
+json.greeting_enabled @inbox.greeting_enabled
+json.greeting_message @inbox.greeting_message
 json.avatar_url @inbox.try(:avatar_url)
 json.website_token @inbox.channel.try(:website_token)
 json.widget_color @inbox.channel.try(:widget_color)
 json.website_url @inbox.channel.try(:website_url)
 json.welcome_title @inbox.channel.try(:welcome_title)
 json.welcome_tagline @inbox.channel.try(:welcome_tagline)
-json.agent_away_message @inbox.channel.try(:agent_away_message)
 json.web_widget_script @inbox.channel.try(:web_widget_script)
 json.enable_auto_assignment @inbox.enable_auto_assignment
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 250b3a003..ea5d46706 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -36,6 +36,6 @@ ca:
         assigned: "Assignada a %{assignee_name} per %{user_name}"
         removed: "%{user_name} ha tret l'assignació de la conversa"
     templates:
-      typical_reply_message_body: "%{account_name} normalment respon a les poques hores."
+      greeting_message_body: "%{account_name} normalment respon a les poques hores."
       ways_to_reach_you_message_body: "Fes saber a l'equip la forma de posar-nos en contacte amb tu."
       email_input_box_message_body: "Rep les notificacions per correu electrònic"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bf9ac59d7..e03370860 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -36,6 +36,6 @@ cs:
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
         removed: "Konverzace zrušena uživatelem %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} obvykle odpovídá za několik hodin."
+      greeting_message_body: "%{account_name} obvykle odpovídá za několik hodin."
       ways_to_reach_you_message_body: "Dejte týmu způsob, jak se k vám dostat."
       email_input_box_message_body: "Dostat upozornění e-mailem"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5000c0344..6c007a159 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -51,6 +51,6 @@ de:
         assigned: "%{user_name} von %{assignee_name} zugewiesen"
         removed: "Gespräch nicht zugewiesen von %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} Antworten in der Regel in wenigen Stunden."
+      greeting_message_body: "%{account_name} Antworten in der Regel in wenigen Stunden."
       ways_to_reach_you_message_body: "Geben Sie dem Team einen Weg, Sie zu erreichen."
       email_input_box_message_body: "Lassen Sie sich per E-Mail benachrichtigen"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 6282505cf..5f7a74dfc 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -36,7 +36,7 @@ el:
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
         removed: "Η συνομιλία σημάνθηκε ως μη ανατεθειμένη από τον %{user_name}"
     templates:
-      typical_reply_message_body: "Ο/Η %{account_name} συνήθως απαντάει σε μερικές ώρες."
+      greeting_message_body: "Ο/Η %{account_name} συνήθως απαντάει σε μερικές ώρες."
       ways_to_reach_you_message_body: "Δώστε στην ομάδα ένα τρόπο να φτάσει σε σας."
       email_input_box_message_body: "Ειδοποιηθείτε με email"
     reply:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3b9afe3e4..f1852aa0c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -51,7 +51,7 @@ en:
         assigned: "Assigned to %{assignee_name} by %{user_name}"
         removed: "Conversation unassigned by %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} typically replies in a few hours."
+      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"
     reply:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a85633fc7..5b968a6d9 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -36,7 +36,7 @@ es:
         assigned: "Asignado a %{assignee_name} por %{user_name}"
         removed: "Conversación no asignada por %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} normalmente responde en unas pocas horas."
+      greeting_message_body: "%{account_name} normalmente responde en unas pocas horas."
       ways_to_reach_you_message_body: "Dale al equipo una forma de llegar a ti."
       email_input_box_message_body: "Recibir notificaciones por correo electrónico"
     reply:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5651c1fd5..9ff3ccbe7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -36,7 +36,7 @@ fr:
         assigned: "Assigné à %{assignee_name} par %{user_name}"
         removed: "Responsable de la conversation supprimé par %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} répond généralement en quelques heures."
+      greeting_message_body: "%{account_name} répond généralement en quelques heures."
       ways_to_reach_you_message_body: "Donnez à l'équipe un moyen de vous recontacter."
       email_input_box_message_body: "Recevez des notifications par courriel"
     reply:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1e2d843bc..a7ef603b4 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -36,6 +36,6 @@ it:
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} risponde tipicamente tra qualche ora."
+      greeting_message_body: "%{account_name} risponde tipicamente tra qualche ora."
       ways_to_reach_you_message_body: "Offri alla squadra un modo per raggiungerti."
       email_input_box_message_body: "Ricevi una notifica via email"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 7cf0efe49..2dd97a3ff 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -36,6 +36,6 @@ ml:
         assigned: "%{assignee_name} %{user_name}-നെ നിയുക്തനാക്കി "
         removed: "%{user_name} സംഭാഷണം നിയുക്തമല്ലാതാക്കി"
     templates:
-      typical_reply_message_body: "%{account_name} സാധാരണ കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു."
+      greeting_message_body: "%{account_name} സാധാരണ കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു."
       ways_to_reach_you_message_body: "നിങ്ങളിലേക്ക് എത്താൻ ടീമിന് ഒരു വഴി നൽകുക."
       email_input_box_message_body: "ഇമെയിൽ വഴി അറിയിപ്പ് നേടുക"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 370378423..e6091f25b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -36,6 +36,6 @@ nl:
         assigned: "Toegewezen aan %{assignee_name} door %{user_name}"
         removed: "Gesprek niet toegewezen door %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} reageert meestal binnen een paar uur."
+      greeting_message_body: "%{account_name} reageert meestal binnen een paar uur."
       ways_to_reach_you_message_body: "Geef het team een manier om je te bereiken."
       email_input_box_message_body: "Ontvang een melding via e-mail"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index a5f579186..fa159567a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -36,6 +36,6 @@ pl:
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
         removed: "Rozmowa nieprzypisana przez %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} zazwyczaj odpowiada w kilka godzin."
+      greeting_message_body: "%{account_name} zazwyczaj odpowiada w kilka godzin."
       ways_to_reach_you_message_body: "Daj drużynie możliwość dotarcia do Ciebie."
       email_input_box_message_body: "Otrzymuj powiadomienia przez e-mail"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 554fee99a..a1c20837f 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -36,6 +36,6 @@ pt:
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} normalmente responde em algumas horas."
+      greeting_message_body: "%{account_name} normalmente responde em algumas horas."
       ways_to_reach_you_message_body: "Dê à equipe um jeito de contatá-lo."
       email_input_box_message_body: "Seja notificado por e-mail"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 4c496c68a..8ce6be097 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -36,6 +36,6 @@ pt-BR:
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} normalmente responde em algumas horas."
+      greeting_message_body: "%{account_name} normalmente responde em algumas horas."
       ways_to_reach_you_message_body: "Informe uma forma para entrarmos em contato com você."
       email_input_box_message_body: "Seja notificado por e-mail"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index db83cb3ef..a685277e2 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -36,7 +36,7 @@ ro:
         assigned: "Atribuit lui %{assignee_name} de %{user_name}"
         removed: "Conversație neasociată de %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} răspunde de obicei în câteva ore."
+      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"
     reply:
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index fa70633f2..9a8029a91 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -36,6 +36,6 @@ sv:
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
         removed: "Konversation otilldelad av %{user_name}"
     templates:
-      typical_reply_message_body: "%{account_name} svarar vanligtvis om några timmar."
+      greeting_message_body: "%{account_name} svarar vanligtvis om några timmar."
       ways_to_reach_you_message_body: "Ge laget ett sätt att nå dig."
       email_input_box_message_body: "Få meddelande via e-post"
diff --git a/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb b/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb
new file mode 100644
index 000000000..9bf1d49c6
--- /dev/null
+++ b/db/migrate/20200605130625_agent_away_message_to_auto_reply.rb
@@ -0,0 +1,21 @@
+class AgentAwayMessageToAutoReply < ActiveRecord::Migration[6.0]
+  def change
+    add_column :inboxes, :greeting_enabled, :boolean, default: false # rubocop:disable Rails/BulkChangeTable
+    add_column :inboxes, :greeting_message, :string
+
+    migrate_agent_away_to_greeting
+
+    remove_column :channel_web_widgets, :agent_away_message, :string
+  end
+
+  def migrate_agent_away_to_greeting
+    ::Channel::WebWidget.find_in_batches do |widget_batch|
+      widget_batch.each do |widget|
+        inbox = widget.inbox
+        inbox.greeting_enabled = true
+        inbox.greeting_message = widget.agent_away_message
+        widget.save!
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 914058c79..f237be8f0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -161,7 +161,6 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.string "widget_color", default: "#1f93ff"
     t.string "welcome_title"
     t.string "welcome_tagline"
-    t.string "agent_away_message"
     t.index ["website_token"], name: "index_channel_web_widgets_on_website_token", unique: true
   end
 
@@ -245,6 +244,8 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.datetime "updated_at", null: false
     t.string "channel_type"
     t.boolean "enable_auto_assignment", default: true
+    t.boolean "greeting_enabled", default: false
+    t.string "greeting_message"
     t.index ["account_id"], name: "index_inboxes_on_account_id"
   end
 
diff --git a/spec/controllers/api/v1/widget/messages_controller_spec.rb b/spec/controllers/api/v1/widget/messages_controller_spec.rb
index e4983fa57..a8120d93e 100644
--- a/spec/controllers/api/v1/widget/messages_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/messages_controller_spec.rb
@@ -24,8 +24,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 + 3 messages by the template hook
-        expect(json_response.length).to eq(5)
+        # 2 messages created + 2 messages by the email hook
+        expect(json_response.length).to eq(4)
       end
     end
   end
diff --git a/spec/finders/message_finder_spec.rb b/spec/finders/message_finder_spec.rb
index e51c7c406..58dafcef6 100644
--- a/spec/finders/message_finder_spec.rb
+++ b/spec/finders/message_finder_spec.rb
@@ -15,7 +15,7 @@ describe ::MessageFinder do
     create(:message, account: account, inbox: inbox, conversation: conversation)
     create(:message, message_type: 'activity', account: account, inbox: inbox, conversation: conversation)
     create(:message, message_type: 'activity', account: account, inbox: inbox, conversation: conversation)
-    # this outgoing message creates 3 additional messages because of the hook execution service
+    # this outgoing message creates 2 additional messages because of the email hook execution service
     create(:message, message_type: 'outgoing', account: account, inbox: inbox, conversation: conversation)
   end
 
@@ -25,7 +25,7 @@ describe ::MessageFinder do
 
       it 'filter conversations by status' do
         result = message_finder.perform
-        expect(result.count).to be 7
+        expect(result.count).to be 6
       end
     end
 
@@ -34,7 +34,7 @@ describe ::MessageFinder do
 
       it 'filter conversations by status' do
         result = message_finder.perform
-        expect(result.count).to be 5
+        expect(result.count).to be 4
       end
     end
 
@@ -44,7 +44,7 @@ describe ::MessageFinder do
 
       it 'filter conversations by status' do
         result = message_finder.perform
-        expect(result.count).to be 7
+        expect(result.count).to be 6
       end
     end
   end
diff --git a/spec/lib/webhooks/twitter_spec.rb b/spec/lib/webhooks/twitter_spec.rb
index 28220406b..cb01d03da 100644
--- a/spec/lib/webhooks/twitter_spec.rb
+++ b/spec/lib/webhooks/twitter_spec.rb
@@ -7,7 +7,7 @@ describe Webhooks::Twitter do
   let!(:account) { create(:account) }
   # FIX ME: recipient id is set to 1 inside event factories
   let!(:twitter_channel) { create(:channel_twitter_profile, account: account, profile_id: '1') }
-  let!(:twitter_inbox) { create(:inbox, channel: twitter_channel, account: account) }
+  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!(:tweet_params) { build(:tweet_create_event).with_indifferent_access }
 
diff --git a/spec/mailboxes/conversation_mailbox_spec.rb b/spec/mailboxes/conversation_mailbox_spec.rb
index c3e5dfa2a..65a757058 100644
--- a/spec/mailboxes/conversation_mailbox_spec.rb
+++ b/spec/mailboxes/conversation_mailbox_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ConversationMailbox, type: :mailbox do
   describe 'add mail as reply in a conversation' do
     let(:agent) { create(:user, email: 'agent1@example.com') }
     let(:reply_mail) { create_inbound_email_from_fixture('reply.eml') }
-    let(:conversation) { create(:conversation, assignee: agent) }
+    let(:conversation) { create(:conversation, assignee: agent, inbox: create(:inbox, greeting_enabled: false)) }
     let(:described_subject) { described_class.receive reply_mail }
     let(:serialized_attributes) { %w[text_content html_content number_of_attachments subject date to from in_reply_to cc bcc message_id] }
 
diff --git a/spec/services/message_templates/hook_execution_service_spec.rb b/spec/services/message_templates/hook_execution_service_spec.rb
index 90a7893ad..4b5b8537f 100644
--- a/spec/services/message_templates/hook_execution_service_spec.rb
+++ b/spec/services/message_templates/hook_execution_service_spec.rb
@@ -5,17 +5,22 @@ describe ::MessageTemplates::HookExecutionService do
     it 'calls ::MessageTemplates::Template::EmailCollect' do
       contact = create(:contact, email: nil)
       conversation = create(:conversation, contact: contact)
-      message = create(:message, conversation: conversation)
 
-      # this hook will only get executed for conversations with out any template messages
-      message.conversation.messages.template.destroy_all
+      # ensure greeting hook is enabled
+      conversation.inbox.update(greeting_enabled: true)
 
       email_collect_service = double
+      greeting_service = double
       allow(::MessageTemplates::Template::EmailCollect).to receive(:new).and_return(email_collect_service)
       allow(email_collect_service).to receive(:perform).and_return(true)
+      allow(::MessageTemplates::Template::Greeting).to receive(:new).and_return(greeting_service)
+      allow(greeting_service).to receive(:perform).and_return(true)
 
-      described_class.new(message: message).perform
+      # described class gets called in message after commit
+      message = create(:message, conversation: conversation)
 
+      expect(::MessageTemplates::Template::Greeting).to have_received(:new).with(conversation: message.conversation)
+      expect(greeting_service).to have_received(:perform)
       expect(::MessageTemplates::Template::EmailCollect).to have_received(:new).with(conversation: message.conversation)
       expect(email_collect_service).to have_received(:perform)
     end
diff --git a/spec/services/message_templates/template/email_collect_spec.rb b/spec/services/message_templates/template/email_collect_spec.rb
index 1d688e37a..4fe5256c7 100644
--- a/spec/services/message_templates/template/email_collect_spec.rb
+++ b/spec/services/message_templates/template/email_collect_spec.rb
@@ -6,7 +6,7 @@ describe ::MessageTemplates::Template::EmailCollect do
 
     it 'creates the email collect messages' do
       described_class.new(conversation: conversation).perform
-      expect(conversation.messages.count).to eq(3)
+      expect(conversation.messages.count).to eq(2)
     end
   end
 end
diff --git a/spec/services/message_templates/template/greeting_spec.rb b/spec/services/message_templates/template/greeting_spec.rb
new file mode 100644
index 000000000..7d1f45d8c
--- /dev/null
+++ b/spec/services/message_templates/template/greeting_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+describe ::MessageTemplates::Template::Greeting do
+  context 'when this hook is called' do
+    let(:conversation) { create(:conversation) }
+
+    it 'creates the email collect messages' do
+      described_class.new(conversation: conversation).perform
+      expect(conversation.messages.count).to eq(1)
+    end
+  end
+end
diff --git a/spec/services/twilio/incoming_message_service_spec.rb b/spec/services/twilio/incoming_message_service_spec.rb
index 7b895bd35..277a4f683 100644
--- a/spec/services/twilio/incoming_message_service_spec.rb
+++ b/spec/services/twilio/incoming_message_service_spec.rb
@@ -3,7 +3,8 @@ require 'rails_helper'
 describe Twilio::IncomingMessageService do
   let!(:account) { create(:account) }
   let!(:twilio_sms) do
-    create(:channel_twilio_sms, account: account, phone_number: '+1234567890', account_sid: 'ACxxx')
+    create(:channel_twilio_sms, account: account, phone_number: '+1234567890', account_sid: 'ACxxx',
+                                inbox: create(:inbox, account: account, greeting_enabled: false))
   end
   let!(:contact) { create(:contact, account: account, phone_number: '+12345') }
   let(:contact_inbox) { create(:contact_inbox, source_id: '+12345', contact: contact, inbox: twilio_sms.inbox) }

From eadc33d23078692bc2930ccb40151a22f5282fc0 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Wed, 10 Jun 2020 00:16:34 +0530
Subject: [PATCH 12/50] Use empty string as fallback greeting_message if null
 (#948)

---
 .../dashboard/routes/dashboard/settings/inbox/Settings.vue  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 99671a7c1..5b35d07f3 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -312,12 +312,12 @@ export default {
           name: this.selectedInboxName,
           enable_auto_assignment: this.autoAssignment,
           greeting_enabled: this.greetingEnabled,
-          greeting_message: this.greetingMessage,
+          greeting_message: this.greetingMessage || '',
           channel: {
             widget_color: this.inbox.widget_color,
             website_url: this.channelWebsiteUrl,
-            welcome_title: this.channelWelcomeTitle,
-            welcome_tagline: this.channelWelcomeTagline,
+            welcome_title: this.channelWelcomeTitle || '',
+            welcome_tagline: this.channelWelcomeTagline || '',
           },
         };
         if (this.avatarFile) {

From 04a0aa5f1b419c0db63b57a0639ef5af3a20d354 Mon Sep 17 00:00:00 2001
From: Sojan <sojan@pepalo.com>
Date: Wed, 10 Jun 2020 00:23:34 +0530
Subject: [PATCH 13/50] BugFix: Fix twitter DM view

- Fix twitter DMs gettings getting appended to tweet conversation

Fixes: #939
---
 config/app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/app.yml b/config/app.yml
index 2fb8246aa..cbcfd2d5b 100644
--- a/config/app.yml
+++ b/config/app.yml
@@ -1,5 +1,5 @@
 shared: &shared
-  version: '1.4.0'
+  version: '1.5.2'
 
 development:
   <<: *shared

From e769282e7fc4a568c0c873a166f7eaa52fdb7466 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Wed, 10 Jun 2020 00:30:37 +0530
Subject: [PATCH 14/50] BugFix: Fix missing tagline in inbox settings (#949)

---
 .../routes/dashboard/settings/inbox/Settings.vue   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 5b35d07f3..8a30a4dce 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -47,6 +47,20 @@
           "
         />
 
+        <woot-input
+          v-if="isAWidgetInbox"
+          v-model.trim="channelWelcomeTagline"
+          class="medium-9 columns"
+          :label="
+            $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.LABEL')
+          "
+          :placeholder="
+            $t(
+              'INBOX_MGMT.ADD.WEBSITE_CHANNEL.CHANNEL_WELCOME_TAGLINE.PLACEHOLDER'
+            )
+          "
+        />
+
         <label v-if="isAWidgetInbox" class="medium-9 columns">
           {{ $t('INBOX_MGMT.ADD.WEBSITE_CHANNEL.WIDGET_COLOR.LABEL') }}
           <woot-color-picker v-model="inbox.widget_color" />

From ca7554f88c7fac02baae8f646c089fb74152d54d Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 11 Jun 2020 22:34:22 +0530
Subject: [PATCH 15/50] Chore: Add deployment documentation (#904)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 docs/README.md                             |   8 ++
 docs/deployment/production/architecture.md |  41 ++++++++
 docs/deployment/production/caprover.md     |  57 +++++++++++
 docs/deployment/production/docker.md       |  32 ++++++
 docs/deployment/production/heroku.md       |  22 ++++
 docs/deployment/production/linux-vm.md     | 114 +++++++++++++++++++++
 6 files changed, 274 insertions(+)
 create mode 100644 docs/deployment/production/architecture.md
 create mode 100644 docs/deployment/production/caprover.md
 create mode 100644 docs/deployment/production/docker.md
 create mode 100644 docs/deployment/production/heroku.md
 create mode 100644 docs/deployment/production/linux-vm.md

diff --git a/docs/README.md b/docs/README.md
index e7edfa83c..879451bfa 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,3 +18,11 @@ This guide will help you get started with Chatwoot!
 * [Environment Variables](/docs/environment-variables)
 * [Conversation Continuity with Email](/docs/conversation-continuity)
 * [Common Errors](/docs/common-errors)
+
+### Deployment
+
+* [Architecture](/docs/deployment/architecture)
+* [Heroku](/docs/deployment/deploy-chatwoot-with-heroku) (recommended)
+* [Caprover](/docs/deployment/deploy-chatwoot-with-caprover) (recommended)
+* [Docker](/docs/deployment/deploy-chatwoot-with-docker)
+* [Linux](/docs/deployment/deploy-chatwoot-in-linux-vm)
diff --git a/docs/deployment/production/architecture.md b/docs/deployment/production/architecture.md
new file mode 100644
index 000000000..ad7f1d83d
--- /dev/null
+++ b/docs/deployment/production/architecture.md
@@ -0,0 +1,41 @@
+---
+path: "/docs/deployment/architecture"
+title: "Chatwoot Production deployment guide"
+---
+
+This guide will help you to deploy Chatwoot to production!
+
+## Architecture
+
+Running Chatwoot in production requires the following set of services. 
+
+* Chatwoot web servers
+* Chatwoot workers
+* PostgreSQL  Database
+* Redis Database
+* Email service (SMTP servers / sendgrid / mailgun etc)
+* Object Storage ( S3, Azure Storage, GCS, etc)
+
+
+## Updating your Chatwoot installation 
+
+A new version of Chatwoot is released around the first monday of every month. We also release minor versions when there is a need for Hotfixes or security updates. 
+
+You can stay tuned to our [Roadmap](https://github.com/chatwoot/chatwoot/milestones) and [releases](https://github.com/chatwoot/chatwoot/releases) on github. We recommend you to stay upto date with our releases to enjoy the lastest features and security updates. 
+
+The deployment process for a newer version involves updating your app servers and workers with the latest code. Most updates would involve database migrations as well which can be executed through the following rails command. 
+
+```
+bundle exec rails db:migrate
+```
+
+The detailed instructions can be found in respective deployment guides.
+
+### Available deployment options
+
+If you want to self host Chatwoot, the recommended approach is to use one of the recommended one click installation options from the below list. If you are comfortable with ruby on rails applications, you can also make use of the other deployment options mentioned below. 
+
+* [Heroku](/docs/deployment/deploy-chatwoot-with-heroku) (recommended)
+* [Caprover](/docs/deployment/deploy-chatwoot-with-caprover) (recommended)
+* [Docker](/docs/deployment/deploy-chatwoot-with-docker)
+* [Linux](/docs/deployment/deploy-chatwoot-in-linux-vm)
diff --git a/docs/deployment/production/caprover.md b/docs/deployment/production/caprover.md
new file mode 100644
index 000000000..c508bd057
--- /dev/null
+++ b/docs/deployment/production/caprover.md
@@ -0,0 +1,57 @@
+---
+path: "/docs/deployment/deploy-chatwoot-with-caprover"
+title: "Caprover Chatwoot Production deployment guide"
+---
+
+## Caprover Overview
+
+Caprover is an extremely easy to use application server management tool. It is blazing fast and uses Docker under the hood. Chatwoot has been made available as a one-click app in Chatwoot and hence the deployment process is very easy. 
+
+## Install Caprover on your VM
+
+Finish your caprover installation by referring to [Getting started guid](https://caprover.com/docs/get-started.html). 
+
+## Installing Chatwoot in Caprover
+
+Chatwoot is available in the one-click apps option in caprover, find Chatwoot by searching and clicking on it. Replace the default `version` with the latest `version` of chatwoot. User appropriate values for the Postgres and Redis passwords and click install. It should only take a few minutes. 
+
+## Configure the necessary environment variables 
+
+Caprover will take care of the installation of Postgres and Redis along with the app and worker servers. We would advise you to replace the database/Redis services with managed/standalone servers once you start scaling.  
+
+Also, ensure to set the appropriate environment variables for E-mail, Object Store service etc referring to our [Environment variables guide](./environment-variables)
+
+## Upgrading Chatwoot installation
+
+To update your chatwoot installation to the latest version in caprover, Run the following command in deployment tab for web and worker in the method 5: deploy captain-definition
+
+### web 
+
+```json
+{
+  "schemaVersion": 2,
+  "dockerfileLines": [
+    "FROM chatwoot/chatwoot:latest",
+    "RUN chmod +x docker/entrypoints/rails.sh",
+    "ENTRYPOINT [\"docker/entrypoints/rails.sh\"]",
+    "CMD bundle exec rake db:setup; bundle exec rake db:migrate; bundle exec rails s -b 0.0.0.0 -p 3000"
+  ]
+}
+```
+
+### worker
+```json
+{
+  "schemaVersion": 2,
+  "dockerfileLines": [
+    "FROM chatwoot/chatwoot:latest",
+    "RUN chmod +x docker/entrypoints/rails.sh",
+    "ENTRYPOINT [\"docker/entrypoints/rails.sh\"]",
+    "CMD bundle exec sidekiq -C config/sidekiq.yml"
+  ]
+}
+```
+
+## Further references
+
+- https://isotropic.co/how-to-install-chatwoot-to-a-digitalocean-droplet/
diff --git a/docs/deployment/production/docker.md b/docs/deployment/production/docker.md
new file mode 100644
index 000000000..633232339
--- /dev/null
+++ b/docs/deployment/production/docker.md
@@ -0,0 +1,32 @@
+---
+path: "/docs/deployment/deploy-chatwoot-with-docker"
+title: "Docker Chatwoot Production deployment guide"
+---
+
+## Deploying with docker 
+
+We publish our base images to docker hub. Build your web/worker images from these base images
+
+### Web 
+
+```
+FROM chatwoot/chatwoot:latest
+RUN chmod +x docker/entrypoints/rails.sh
+ENTRYPOINT [\"docker/entrypoints/rails.sh\"]
+CMD bundle exec bundle exec rails s -b 0.0.0.0 -p 3000"
+```
+
+### worker
+
+```
+FROM chatwoot/chatwoot:latest
+RUN chmod +x docker/entrypoints/rails.sh
+ENTRYPOINT [\"docker/entrypoints/rails.sh\"]
+CMD bundle exec sidekiq -C config/sidekiq.yml"
+```
+
+The app servers will available on port `3000`. Ensure the images are connected to the same database and Redis servers. Provide the configuration for these services via environment variables. 
+
+## Upgrading 
+
+Update the images using the latest image from chatwoot.  Run the `rails db:migrate` option after accessing console from one of the containers running latest image.
diff --git a/docs/deployment/production/heroku.md b/docs/deployment/production/heroku.md
new file mode 100644
index 000000000..24cbfed3e
--- /dev/null
+++ b/docs/deployment/production/heroku.md
@@ -0,0 +1,22 @@
+---
+path: "/docs/deployment/deploy-chatwoot-with-Heroku"
+title: "Heroku Chatwoot Production deployment guide"
+---
+
+## Deploying on Heroku
+Deploy chatwoot on Heroku through the following steps
+
+1. Click on the [one click deploy button](https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master) and deploy your app.
+2. Go to the Resources tab in the Heroku app dashboard and ensure the worker dynos is turned on.
+3. Head over to settings tabs in Heroku app dashboard and click reveal config vars.
+4. Configure the environment variables for [mailer](https://www.chatwoot.com/docs/environment-variables#configure-emails) and [storage](https://www.chatwoot.com/docs/configuring-cloud-storage) as per the [documentation](https://www.chatwoot.com/docs/environment-variables).
+5. Head over to `yourapp.herokuapp.com` and enjoy using Chatwoot.
+
+
+## Updating the deployment on Heroku
+
+Whenever a new version is out for chatwoot, you update your Heroku deployment through following steps.
+
+1. In the deploy tab, choose `Github` as the deployment option.
+2. Connect chatwoot repo to the app.
+3. Head over to the manual deploy option, choose `master` branch and hit deploy.
diff --git a/docs/deployment/production/linux-vm.md b/docs/deployment/production/linux-vm.md
new file mode 100644
index 000000000..9d72ca89a
--- /dev/null
+++ b/docs/deployment/production/linux-vm.md
@@ -0,0 +1,114 @@
+---
+path: "/docs/deployment/deploy-chatwoot-in-linux-vm"
+title: "Linux VM Chatwoot Production deployment guide"
+---
+
+
+## Deploying to Linux VM 
+
+We have prepared a deployment script for ubuntu 18.04. Run the script or refer the script and make changes accordingly to OS.
+
+https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh
+
+### After logging in to your Linux VM as the root user perform the following steps for initial set up 
+
+1. Create the `chatwoot.sh` file and copy the content from [deployment script](https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh).
+2. Execute the script and it will take care of the initial Chatwoot setup
+3. Chatwoot Installation will now be accessible at `http://{your_ip}:3000`
+
+### Configure ngix and letsencrypt 
+
+1. configure Nginx to serve as a frontend proxy by following steps in your shell
+
+```bash
+cd /etc/nginx/sites-enabled
+nano yourdomain.com.conf
+```
+2. Add the required Nginx config after replacing the `yourdomain.com` in `server_name`
+```sh
+server {
+  server_name yourdomain.com;
+  # where rails app is running
+  set $upstream 127.0.0.1:3000;
+
+  # Here we define the web-root for our SSL proof
+  location /.well-known {
+     # Note that a request for /.well-known/test.html will be made
+     alias /var/www/ssl-proof/chatwoot/.well-known;
+  }
+  
+  location / {
+    proxy_pass_header Authorization;
+    proxy_pass http://$upstream;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header X-Forwarded-Ssl on; # Optional
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_http_version 1.1;
+    proxy_set_header Connection “”;
+    proxy_buffering off;
+    client_max_body_size 0;
+    proxy_read_timeout 36000s;
+    proxy_redirect off;
+  }
+  listen 80;
+}
+```
+3. Verify and reload your Nginx config by running following command.
+```sh
+nginx -t
+systemctl reload nginx
+```
+4. Run Letsencrypt and configure SSL
+```sh
+mkdir -p /var/www/ssl-proof/chatwoot/.well-known
+certbot --webroot -w /var/www/ssl-proof/chatwoot/  -d yourdomain.com  -i nginx
+```
+
+5. You Chatwoot installation should be accessible from the `https://yourdomain.com` now.
+
+### Configure the required environment variables 
+For your chatwoot installation to properly function you would need to configure some of the essential environment variables like `FRONTEND_URL`, mailer and storage config etc. refer [environment variables](https://www.chatwoot.com/docs/environment-variables) for the full list. 
+
+1. Login as chatwoot and edit the .env file.
+```shell
+# login as chatwoot user 
+sudo -i -u chatwoot
+cd chatwoot
+nano .env
+```
+2. Refer [environment variables](https://www.chatwoot.com/docs/environment-variables) and update the required variables. Save the `.env` file.
+3. Restart the Chatwoot server and enjoy using Chatwoot.
+```sh
+systemctl restart chatwoot.target
+```
+## Updating your Chatwoot Installation on a Linux VM
+
+Run the following steps on your VM if you made use of our installation script Or making changes accordingly to your OS
+
+```sh
+# login as chatwoot user 
+sudo -i -u chatwoot
+
+# navigate to the chatwoot directory
+cd chatwoot 
+
+# pull the latest version of the master branch
+git pull
+
+# update dependencies 
+bundle 
+yarn
+
+# recompile the assets 
+rake assets:precompile RAILS_ENV=production
+
+# migrate the database schema
+RAILS_ENV=production bundle exec rake db:migrate
+
+#Restart the chatwoot server
+systemctl restart chatwoot.target
+```

From 4f3b48306638e9cce6dc3f38cf97c6525f80bdce Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Fri, 12 Jun 2020 19:37:00 +0530
Subject: [PATCH 16/50] Chore: Add Github Sponsors link

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 0c0eeccc5..48a02cff6 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +1,2 @@
 open_collective: chatwoot
+github: chatwoot

From ed1c871633f4d90f79e7664c58565c3aba1963be Mon Sep 17 00:00:00 2001
From: Subin T P <subinthattaparambil@gmail.com>
Date: Fri, 12 Jun 2020 23:12:47 +0530
Subject: [PATCH 17/50] Feature: Slack integration (#783)

- Integrations architecture
- Slack integration
---
 .env.example                                  |  4 +
 Gemfile                                       |  3 +
 Gemfile.lock                                  | 18 +++++
 .../accounts/integrations/apps_controller.rb  | 18 +++++
 .../accounts/integrations/slack_controller.rb | 36 +++++++++
 .../v1/integrations/webhooks_controller.rb    |  7 ++
 app/dispatchers/async_dispatcher.rb           |  2 +-
 app/jobs/hook_job.rb                          | 11 +++
 app/listeners/hook_listener.rb                | 10 +++
 app/models/account.rb                         |  1 +
 app/models/conversation.rb                    |  1 +
 app/models/inbox.rb                           |  1 +
 app/models/integrations.rb                    |  5 ++
 app/models/integrations/app.rb                | 51 ++++++++++++
 app/models/integrations/hook.rb               | 36 +++++++++
 .../integrations/apps/index.json.jbuilder     |  7 ++
 .../integrations/apps/show.json.jbuilder      |  7 ++
 config/initializers/00_init.rb                |  1 +
 config/integration/apps.yml                   |  6 ++
 config/routes.rb                              | 12 ++-
 config/sidekiq.yml                            |  1 +
 ...0200430163438_create_integrations_hooks.rb | 15 ++++
 ...154151_add_reference_id_to_conversation.rb |  5 ++
 .../20200610143132_rename_reference_id.rb     |  5 ++
 db/schema.rb                                  | 30 ++++++-
 lib/integrations/slack/channel_builder.rb     | 33 ++++++++
 lib/integrations/slack/hook_builder.rb        | 42 ++++++++++
 .../slack/incoming_message_builder.rb         | 78 +++++++++++++++++++
 .../slack/outgoing_message_builder.rb         | 50 ++++++++++++
 .../integrations/apps_controller_spec.rb      | 53 +++++++++++++
 spec/factories/conversations.rb               |  1 +
 spec/factories/integrations/hooks.rb          | 12 +++
 spec/jobs/hook_job_spec.rb                    | 15 ++++
 .../integrations/slack/hook_builder_spec.rb   | 22 ++++++
 .../slack/incoming_message_builder_spec.rb    | 45 +++++++++++
 .../slack/outgoing_message_builder_spec.rb    | 30 +++++++
 spec/listeners/hook_listener_spec.rb          | 32 ++++++++
 spec/models/inbox_spec.rb                     |  2 +
 spec/models/integrations/hook_spec.rb         | 12 +++
 spec/rails_helper.rb                          |  6 +-
 .../integrations/slack_request_spec.rb        | 77 ++++++++++++++++++
 .../v1/integrations/webhooks_request_spec.rb  | 15 ++++
 spec/spec_helper.rb                           |  3 +
 spec/support/slack_stubs.rb                   | 53 +++++++++++++
 44 files changed, 867 insertions(+), 7 deletions(-)
 create mode 100644 app/controllers/api/v1/accounts/integrations/apps_controller.rb
 create mode 100644 app/controllers/api/v1/accounts/integrations/slack_controller.rb
 create mode 100644 app/controllers/api/v1/integrations/webhooks_controller.rb
 create mode 100644 app/jobs/hook_job.rb
 create mode 100644 app/listeners/hook_listener.rb
 create mode 100644 app/models/integrations.rb
 create mode 100644 app/models/integrations/app.rb
 create mode 100644 app/models/integrations/hook.rb
 create mode 100644 app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
 create mode 100644 app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
 create mode 100644 config/initializers/00_init.rb
 create mode 100644 config/integration/apps.yml
 create mode 100644 db/migrate/20200430163438_create_integrations_hooks.rb
 create mode 100644 db/migrate/20200510154151_add_reference_id_to_conversation.rb
 create mode 100644 db/migrate/20200610143132_rename_reference_id.rb
 create mode 100644 lib/integrations/slack/channel_builder.rb
 create mode 100644 lib/integrations/slack/hook_builder.rb
 create mode 100644 lib/integrations/slack/incoming_message_builder.rb
 create mode 100644 lib/integrations/slack/outgoing_message_builder.rb
 create mode 100644 spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
 create mode 100644 spec/factories/integrations/hooks.rb
 create mode 100644 spec/jobs/hook_job_spec.rb
 create mode 100644 spec/lib/integrations/slack/hook_builder_spec.rb
 create mode 100644 spec/lib/integrations/slack/incoming_message_builder_spec.rb
 create mode 100644 spec/lib/integrations/slack/outgoing_message_builder_spec.rb
 create mode 100644 spec/listeners/hook_listener_spec.rb
 create mode 100644 spec/models/integrations/hook_spec.rb
 create mode 100644 spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
 create mode 100644 spec/requests/api/v1/integrations/webhooks_request_spec.rb
 create mode 100644 spec/support/slack_stubs.rb

diff --git a/.env.example b/.env.example
index 7dcbe5e62..06a39d17f 100644
--- a/.env.example
+++ b/.env.example
@@ -85,6 +85,10 @@ TWITTER_CONSUMER_KEY=
 TWITTER_CONSUMER_SECRET=
 TWITTER_ENVIRONMENT=
 
+#slack
+SLACK_CLIENT_ID=
+SLACK_CLIENT_SECRET
+
 ### Change this env variable only if you are using a custom build mobile app
 ## Mobile app env variables
 IOS_APP_ID=6C953F3RX2.com.chatwoot.app
diff --git a/Gemfile b/Gemfile
index 5397d5130..a769187de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -65,6 +65,8 @@ gem 'twilio-ruby', '~> 5.32.0'
 gem 'twitty'
 # facebook client
 gem 'koala'
+# slack client
+gem 'slack-ruby-client'
 # Random name generator
 gem 'haikunator'
 
@@ -115,4 +117,5 @@ group :development, :test do
   gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
+  gem 'webmock'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f8ff49e7..aadeaf5be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -143,6 +143,8 @@ GEM
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
     crass (1.0.6)
     datetime_picker_rails (0.0.7)
       momentjs-rails (>= 2.8.1)
@@ -191,6 +193,7 @@ GEM
     ffi (1.12.2)
     flag_shih_tzu (0.3.23)
     foreman (0.87.1)
+    gli (2.19.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     google-api-client (0.39.4)
@@ -225,6 +228,7 @@ GEM
       activesupport (>= 5)
     haikunator (1.1.0)
     hana (1.3.6)
+    hashdiff (1.0.1)
     hashie (4.1.0)
     hkdf (0.3.0)
     http-accept (1.7.0)
@@ -411,6 +415,7 @@ GEM
     rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
+    safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
@@ -452,6 +457,13 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    slack-ruby-client (0.14.6)
+      activesupport
+      faraday (>= 0.9)
+      faraday_middleware
+      gli
+      hashie
+      websocket-driver
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -507,6 +519,10 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
+    webmock (3.8.3)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     webpacker (5.1.1)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
@@ -583,6 +599,7 @@ DEPENDENCIES
   shoulda-matchers
   sidekiq
   simplecov (= 0.17.1)
+  slack-ruby-client
   spring
   spring-watcher-listen
   telegram-bot-ruby
@@ -594,6 +611,7 @@ DEPENDENCIES
   uglifier
   valid_email2
   web-console
+  webmock
   webpacker
   webpush
   wisper (= 2.0.0)
diff --git a/app/controllers/api/v1/accounts/integrations/apps_controller.rb b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
new file mode 100644
index 000000000..35b6f7c4d
--- /dev/null
+++ b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
@@ -0,0 +1,18 @@
+class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseController
+  before_action :fetch_apps, only: [:index]
+  before_action :fetch_app, only: [:show]
+
+  def index; end
+
+  def show; end
+
+  private
+
+  def fetch_apps
+    @apps = Integrations::App.all
+  end
+
+  def fetch_app
+    @app = Integrations::App.find(id: params[:id])
+  end
+end
diff --git a/app/controllers/api/v1/accounts/integrations/slack_controller.rb b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
new file mode 100644
index 000000000..023deaa97
--- /dev/null
+++ b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
@@ -0,0 +1,36 @@
+class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::BaseController
+  before_action :fetch_hook, only: [:update, :destroy]
+
+  def create
+    builder = Integrations::Slack::HookBuilder.new(
+      account: current_account,
+      code: params[:code],
+      inbox_id: params[:inbox_id]
+    )
+
+    @hook = builder.perform
+
+    render json: @hook
+  end
+
+  def update
+    builder = Integrations::Slack::ChannelBuilder.new(
+      hook: @hook, channel: params[:channel]
+    )
+    builder.perform
+
+    render json: @hook
+  end
+
+  def destroy
+    @hook.destroy
+
+    head :ok
+  end
+
+  private
+
+  def fetch_hook
+    @hook = Integrations::Hook.find(params[:id])
+  end
+end
diff --git a/app/controllers/api/v1/integrations/webhooks_controller.rb b/app/controllers/api/v1/integrations/webhooks_controller.rb
new file mode 100644
index 000000000..94373c92e
--- /dev/null
+++ b/app/controllers/api/v1/integrations/webhooks_controller.rb
@@ -0,0 +1,7 @@
+class Api::V1::Integrations::WebhooksController < ApplicationController
+  def create
+    builder = Integrations::Slack::IncomingMessageBuilder.new(params)
+    response = builder.perform
+    render json: response
+  end
+end
diff --git a/app/dispatchers/async_dispatcher.rb b/app/dispatchers/async_dispatcher.rb
index 8ddc963b5..c24b633aa 100644
--- a/app/dispatchers/async_dispatcher.rb
+++ b/app/dispatchers/async_dispatcher.rb
@@ -9,7 +9,7 @@ class AsyncDispatcher < BaseDispatcher
   end
 
   def listeners
-    listeners = [EventListener.instance, WebhookListener.instance]
+    listeners = [EventListener.instance, WebhookListener.instance, HookListener.instance]
     listeners
   end
 end
diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
new file mode 100644
index 000000000..f867248d8
--- /dev/null
+++ b/app/jobs/hook_job.rb
@@ -0,0 +1,11 @@
+class HookJob < ApplicationJob
+  queue_as :integrations
+
+  def perform(hook, message)
+    return unless hook.slack?
+
+    Integrations::Slack::OutgoingMessageBuilder.perform(hook, message)
+  rescue StandardError => e
+    Raven.capture_exception(e)
+  end
+end
diff --git a/app/listeners/hook_listener.rb b/app/listeners/hook_listener.rb
new file mode 100644
index 000000000..efe1c74e8
--- /dev/null
+++ b/app/listeners/hook_listener.rb
@@ -0,0 +1,10 @@
+class HookListener < BaseListener
+  def message_created(event)
+    message = extract_message_and_account(event)[0]
+    return unless message.reportable?
+
+    message.account.hooks.each do |hook|
+      HookJob.perform_later(hook, message)
+    end
+  end
+end
diff --git a/app/models/account.rb b/app/models/account.rb
index 3e5b48f00..7e97365e5 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -47,6 +47,7 @@ class Account < ApplicationRecord
   has_many :webhooks, dependent: :destroy
   has_many :labels, dependent: :destroy
   has_many :notification_settings, dependent: :destroy
+  has_many :hooks, dependent: :destroy, class_name: 'Integrations::Hook'
   has_flags ACCOUNT_SETTINGS_FLAGS.merge(column: 'settings_flags').merge(DEFAULT_QUERY_SETTING)
 
   enum locale: LANGUAGES_CONFIG.map { |key, val| [val[:iso_639_1_code], key] }.to_h
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index db25c27da..98c3ebcc6 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -5,6 +5,7 @@
 #  id                    :integer          not null, primary key
 #  additional_attributes :jsonb
 #  agent_last_seen_at    :datetime
+#  identifier            :string
 #  locked                :boolean          default(FALSE)
 #  status                :integer          default("open"), not null
 #  user_last_seen_at     :datetime
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index b5d276c56..b48b6b354 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -42,6 +42,7 @@ class Inbox < ApplicationRecord
   has_one :agent_bot_inbox, dependent: :destroy
   has_one :agent_bot, through: :agent_bot_inbox
   has_many :webhooks, dependent: :destroy
+  has_many :hooks, dependent: :destroy, class_name: 'Integrations::Hook'
 
   after_destroy :delete_round_robin_agents
 
diff --git a/app/models/integrations.rb b/app/models/integrations.rb
new file mode 100644
index 000000000..a6b681795
--- /dev/null
+++ b/app/models/integrations.rb
@@ -0,0 +1,5 @@
+module Integrations
+  def self.table_name_prefix
+    'integrations_'
+  end
+end
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
new file mode 100644
index 000000000..324b34b98
--- /dev/null
+++ b/app/models/integrations/app.rb
@@ -0,0 +1,51 @@
+class Integrations::App
+  attr_accessor :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def id
+    params[:id]
+  end
+
+  def name
+    params[:name]
+  end
+
+  def description
+    params[:description]
+  end
+
+  def logo
+    params[:logo]
+  end
+
+  def fields
+    params[:fields]
+  end
+
+  def button
+    params[:button]
+  end
+
+  def enabled?(account)
+    account.hooks.where(app_id: id).exists?
+  end
+
+  class << self
+    def apps
+      Hashie::Mash.new(APPS_CONFIG)
+    end
+
+    def all
+      apps.values.each_with_object([]) do |app, result|
+        result << new(app)
+      end
+    end
+
+    def find(params)
+      all.detect { |app| app.id == params[:id] }
+    end
+  end
+end
diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb
new file mode 100644
index 000000000..bd9768624
--- /dev/null
+++ b/app/models/integrations/hook.rb
@@ -0,0 +1,36 @@
+# == Schema Information
+#
+# Table name: integrations_hooks
+#
+#  id           :bigint           not null, primary key
+#  access_token :string
+#  hook_type    :integer          default("account")
+#  settings     :text
+#  status       :integer          default("disabled")
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#  account_id   :integer
+#  app_id       :string
+#  inbox_id     :integer
+#  reference_id :string
+#
+class Integrations::Hook < ApplicationRecord
+  validates :account_id, presence: true
+  validates :app_id, presence: true
+
+  enum status: { disabled: 0, enabled: 1 }
+
+  belongs_to :account
+  belongs_to :inbox, optional: true
+  has_secure_token :access_token
+
+  enum hook_type: { account: 0, inbox: 1 }
+
+  def app
+    @app ||= Integrations::App.find(id: app_id)
+  end
+
+  def slack?
+    app_id == 'cw_slack'
+  end
+end
diff --git a/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder b/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
new file mode 100644
index 000000000..dc314f008
--- /dev/null
+++ b/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
@@ -0,0 +1,7 @@
+json.array! @apps do |app|
+  json.id app.id
+  json.name app.name
+  json.logo app.logo
+  json.enabled app.enabled?(@current_account)
+  json.button app.button
+end
diff --git a/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder b/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
new file mode 100644
index 000000000..9970e9b0d
--- /dev/null
+++ b/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
@@ -0,0 +1,7 @@
+json.id @app.id
+json.name @app.name
+json.logo @app.logo
+json.description @app.description
+json.fields @app.fields
+json.enabled @app.enabled?(@current_account)
+json.button @app.button
diff --git a/config/initializers/00_init.rb b/config/initializers/00_init.rb
new file mode 100644
index 000000000..b72fc4be1
--- /dev/null
+++ b/config/initializers/00_init.rb
@@ -0,0 +1 @@
+APPS_CONFIG = YAML.load_file(File.join(Rails.root, 'config/integration', 'apps.yml'))
\ No newline at end of file
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
new file mode 100644
index 000000000..b95d5e16b
--- /dev/null
+++ b/config/integration/apps.yml
@@ -0,0 +1,6 @@
+slack:
+  id: cw_slack
+  name: Slack
+  logo: https://a.slack-edge.com/80588/marketing/img/media-kit/img-logos@2x.png
+  description: "'Be less busy' -  Slack is the chat tool that brings all your communication together in one place. By integrating Slack with SupportBee, you can get notified in your Slack channels for important events in your support desk"
+  button: <a href="https://slack.com/oauth/v2/authorize?scope=incoming-webhook,commands,chat:write&client_id=706921004289.1094198503990"><img alt=""Add to Slack"" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" /></a>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 4f7d36d07..9602020e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,18 +87,26 @@ Rails.application.routes.draw do
           end
           resource :notification_settings, only: [:show, :update]
 
-          resources :webhooks, except: [:show]
+        resources :webhooks, except: [:show]
+        namespace :integrations do
+          resources :apps, only: [:index, :show]
+          resources :slack, only: [:create, :update, :destroy]
+        end
         end
       end
-
       # end of account scoped api routes
       # ----------------------------------
 
+      namespace :integrations do
+        resources :webhooks, only: [:create]
+      end
+
       resource :profile, only: [:show, :update]
       resource :notification_subscriptions, only: [:create]
 
       resources :agent_bots, only: [:index]
 
+      
       namespace :widget do
         resources :events, only: [:create]
         resources :messages, only: [:index, :create, :update]
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 402758056..3e20bd0df 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -13,6 +13,7 @@
 :queues:
   - [low, 1]
   - [webhooks, 1]
+  - [integrations, 2]
   - [bots, 1]
   - [active_storage_analysis, 1]
   - [action_mailbox_incineration, 1]
diff --git a/db/migrate/20200430163438_create_integrations_hooks.rb b/db/migrate/20200430163438_create_integrations_hooks.rb
new file mode 100644
index 000000000..487297bf6
--- /dev/null
+++ b/db/migrate/20200430163438_create_integrations_hooks.rb
@@ -0,0 +1,15 @@
+class CreateIntegrationsHooks < ActiveRecord::Migration[6.0]
+  def change
+    create_table :integrations_hooks do |t|
+      t.integer :status, default: 0
+      t.integer :inbox_id
+      t.integer :account_id
+      t.string :app_id
+      t.text :settings
+      t.integer :hook_type, default: 0
+      t.string :reference_id
+      t.string :access_token
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20200510154151_add_reference_id_to_conversation.rb b/db/migrate/20200510154151_add_reference_id_to_conversation.rb
new file mode 100644
index 000000000..5bc0af68a
--- /dev/null
+++ b/db/migrate/20200510154151_add_reference_id_to_conversation.rb
@@ -0,0 +1,5 @@
+class AddReferenceIdToConversation < ActiveRecord::Migration[6.0]
+  def change
+    add_column :conversations, :reference_id, :string
+  end
+end
diff --git a/db/migrate/20200610143132_rename_reference_id.rb b/db/migrate/20200610143132_rename_reference_id.rb
new file mode 100644
index 000000000..e15e642a2
--- /dev/null
+++ b/db/migrate/20200610143132_rename_reference_id.rb
@@ -0,0 +1,5 @@
+class RenameReferenceId < ActiveRecord::Migration[6.0]
+  def change
+    rename_column :conversations, :reference_id, :identifier
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f237be8f0..5771ffe28 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,10 +10,9 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_06_07_140737) do
+ActiveRecord::Schema.define(version: 2020_06_10_143132) do
 
   # These are extensions that must be enabled in order to support this database
-  enable_extension "pg_stat_statements"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -206,6 +205,7 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.boolean "locked", default: false
     t.jsonb "additional_attributes"
     t.bigint "contact_inbox_id"
+    t.string "identifier"
     t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
     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"
@@ -228,6 +228,17 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.index ["user_id"], name: "index_events_on_user_id"
   end
 
+  create_table "hooks_inbox_apps", force: :cascade do |t|
+    t.integer "inbox_id"
+    t.integer "agent_id"
+    t.integer "account_id"
+    t.string "app_slug"
+    t.string "status"
+    t.text "settings"
+    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
@@ -257,6 +268,19 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.index ["name", "created_at"], name: "index_installation_configs_on_name_and_created_at", unique: true
   end
 
+  create_table "integrations_hooks", force: :cascade do |t|
+    t.integer "status", default: 0
+    t.integer "inbox_id"
+    t.integer "account_id"
+    t.string "app_id"
+    t.text "settings"
+    t.integer "hook_type", default: 0
+    t.string "reference_id"
+    t.string "access_token"
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
+  end
+
   create_table "labels", force: :cascade do |t|
     t.string "title"
     t.text "description"
@@ -357,9 +381,11 @@ ActiveRecord::Schema.define(version: 2020_06_07_140737) do
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
     t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
     t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
+    t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
     t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
     t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
     t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
+    t.index ["tagger_type", "tagger_id"], name: "index_taggings_on_tagger_type_and_tagger_id"
   end
 
   create_table "tags", id: :serial, force: :cascade do |t|
diff --git a/lib/integrations/slack/channel_builder.rb b/lib/integrations/slack/channel_builder.rb
new file mode 100644
index 000000000..e5d7e6679
--- /dev/null
+++ b/lib/integrations/slack/channel_builder.rb
@@ -0,0 +1,33 @@
+class Integrations::Slack::ChannelBuilder
+  attr_reader :params, :channel
+
+  def initialize(params)
+    @params = params
+  end
+
+  def perform
+    create_channel
+    update_reference_id
+  end
+
+  private
+
+  def hook
+    @hook ||= params[:hook]
+  end
+
+  def slack_client
+    Slack.configure do |config|
+      config.token = hook.access_token
+    end
+    Slack::Web::Client.new
+  end
+
+  def create_channel
+    @channel = slack_client.conversations_create(name: params[:channel])
+  end
+
+  def update_reference_id
+    @hook.reference_id = channel['channel']['id']
+  end
+end
diff --git a/lib/integrations/slack/hook_builder.rb b/lib/integrations/slack/hook_builder.rb
new file mode 100644
index 000000000..8900b2a5a
--- /dev/null
+++ b/lib/integrations/slack/hook_builder.rb
@@ -0,0 +1,42 @@
+class Integrations::Slack::HookBuilder
+  attr_reader :params
+
+  def initialize(params)
+    @params = params
+  end
+
+  def perform
+    token = fetch_access_token
+
+    hook = account.hooks.new(
+      access_token: token,
+      status: 'enabled',
+      inbox_id: params[:inbox_id],
+      hook_type: hook_type,
+      app_id: 'cw_slack'
+    )
+
+    hook.save!
+    hook
+  end
+
+  private
+
+  def account
+    params[:account]
+  end
+
+  def hook_type
+    params[:inbox_id] ? 'inbox' : 'account'
+  end
+
+  def fetch_access_token
+    client = Slack::Web::Client.new
+
+    client.oauth_access(
+      client_id: ENV.fetch('SLACK_CLIENT_ID', 'TEST_CLIENT_ID'),
+      client_secret: ENV.fetch('SLACK_CLIENT_SECRET', 'TEST_CLIENT_SECRET'),
+      code: params[:code]
+    )['bot']['bot_access_token']
+  end
+end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
new file mode 100644
index 000000000..3236739ba
--- /dev/null
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -0,0 +1,78 @@
+class Integrations::Slack::IncomingMessageBuilder
+  attr_reader :params
+
+  SUPPORTED_EVENT_TYPES = %w[event_callback url_verification].freeze
+  SUPPORTED_EVENTS = %w[message].freeze
+  SUPPORTED_MESSAGE_TYPES = %w[rich_text].freeze
+
+  def initialize(params)
+    @params = params
+  end
+
+  def perform
+    return unless valid_event?
+
+    if hook_verification?
+      verify_hook
+    elsif create_message?
+      create_message
+    end
+  end
+
+  private
+
+  def valid_event?
+    supported_event_type? && supported_event?
+  end
+
+  def supported_event_type?
+    SUPPORTED_EVENT_TYPES.include?(params[:type])
+  end
+
+  def supported_event?
+    hook_verification? || SUPPORTED_EVENTS.include?(params[:event][:type])
+  end
+
+  def supported_message?
+    SUPPORTED_MESSAGE_TYPES.include?(message[:type])
+  end
+
+  def hook_verification?
+    params[:type] == 'url_verification'
+  end
+
+  def create_message?
+    supported_message? && integration_hook
+  end
+
+  def message
+    params[:event][:blocks].first
+  end
+
+  def verify_hook
+    {
+      challenge: params[:challenge]
+    }
+  end
+
+  def integration_hook
+    @integration_hook ||= Integrations::Hook.where(reference_id: params[:event][:channel])
+  end
+
+  def conversation
+    @conversation ||= Conversation.where(identifier: params[:event][:thread_ts]).first
+  end
+
+  def create_message
+    return unless conversation
+
+    conversation.messages.create(
+      message_type: 0,
+      account_id: conversation.account_id,
+      inbox_id: conversation.inbox_id,
+      content: message[:elements].first[:elements].first[:text]
+    )
+
+    { status: 'success' }
+  end
+end
diff --git a/lib/integrations/slack/outgoing_message_builder.rb b/lib/integrations/slack/outgoing_message_builder.rb
new file mode 100644
index 000000000..61754d816
--- /dev/null
+++ b/lib/integrations/slack/outgoing_message_builder.rb
@@ -0,0 +1,50 @@
+class Integrations::Slack::OutgoingMessageBuilder
+  attr_reader :hook, :message
+
+  def self.perform(hook, message)
+    new(hook, message).perform
+  end
+
+  def initialize(hook, message)
+    @hook = hook
+    @message = message
+  end
+
+  def perform
+    send_message
+    update_reference_id
+  end
+
+  private
+
+  def conversation
+    @conversation ||= message.conversation
+  end
+
+  def contact
+    @contact ||= conversation.contact
+  end
+
+  def send_message
+    @slack_message = slack_client.chat_postMessage(
+      channel: hook.reference_id,
+      text: message.content,
+      username: contact.try(:name),
+      thread_ts: conversation.identifier
+    )
+  end
+
+  def update_reference_id
+    return if conversation.identifier
+
+    conversation.identifier = @slack_message['ts']
+    conversation.save!
+  end
+
+  def slack_client
+    Slack.configure do |config|
+      config.token = hook.access_token
+    end
+    Slack::Web::Client.new
+  end
+end
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
new file mode 100644
index 000000000..78c72db7e
--- /dev/null
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -0,0 +1,53 @@
+require 'rails_helper'
+
+RSpec.describe 'Integration Apps API', type: :request do
+  let(:account) { create(:account) }
+
+  describe 'GET /api/v1/integrations/apps' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get api_v1_account_integrations_apps_url(account)
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns all the apps' do
+        get api_v1_account_integrations_apps_url(account),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        app = JSON.parse(response.body).first
+        expect(app['id']).to eql('cw_slack')
+        expect(app['name']).to eql('Slack')
+      end
+    end
+  end
+
+  describe 'GET /api/v1/integrations/apps/:id' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        get api_v1_account_integrations_app_url(account_id: account.id, id: 'cw_slack')
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      let(:agent) { create(:user, account: account, role: :agent) }
+
+      it 'returns details of the app' do
+        get api_v1_account_integrations_app_url(account_id: account.id, id: 'cw_slack'),
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        app = JSON.parse(response.body)
+        expect(app['id']).to eql('cw_slack')
+        expect(app['name']).to eql('Slack')
+      end
+    end
+  end
+end
diff --git a/spec/factories/conversations.rb b/spec/factories/conversations.rb
index a14845e7f..ca5960a51 100644
--- a/spec/factories/conversations.rb
+++ b/spec/factories/conversations.rb
@@ -7,6 +7,7 @@ FactoryBot.define do
     user_last_seen_at { Time.current }
     agent_last_seen_at { Time.current }
     locked { false }
+    identifier { SecureRandom.hex }
 
     after(:build) do |conversation|
       conversation.account ||= create(:account)
diff --git a/spec/factories/integrations/hooks.rb b/spec/factories/integrations/hooks.rb
new file mode 100644
index 000000000..6d6ed4a1b
--- /dev/null
+++ b/spec/factories/integrations/hooks.rb
@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :integrations_hook, class: 'Integrations::Hook' do
+    status { 1 }
+    inbox_id { 1 }
+    account_id { 1 }
+    app_id { 'cw_slack' }
+    settings { 'MyText' }
+    hook_type { 1 }
+    access_token { SecureRandom.hex }
+    reference_id { SecureRandom.hex }
+  end
+end
diff --git a/spec/jobs/hook_job_spec.rb b/spec/jobs/hook_job_spec.rb
new file mode 100644
index 000000000..b852db7ad
--- /dev/null
+++ b/spec/jobs/hook_job_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe HookJob, type: :job do
+  subject(:job) { described_class.perform_later(hook, message) }
+
+  let(:account) { create(:account) }
+  let(:hook) { create(:integrations_hook, account: account) }
+  let(:message) { create(:message) }
+
+  it 'queues the job' do
+    expect { job }.to have_enqueued_job(described_class)
+      .with(hook, message)
+      .on_queue('integrations')
+  end
+end
diff --git a/spec/lib/integrations/slack/hook_builder_spec.rb b/spec/lib/integrations/slack/hook_builder_spec.rb
new file mode 100644
index 000000000..948b14fae
--- /dev/null
+++ b/spec/lib/integrations/slack/hook_builder_spec.rb
@@ -0,0 +1,22 @@
+require 'rails_helper'
+
+describe Integrations::Slack::HookBuilder do
+  let(:account) { create(:account) }
+  let(:code) { SecureRandom.hex }
+  let(:token) { SecureRandom.hex }
+
+  describe '#perform' do
+    it 'creates hook' do
+      hooks_count = account.hooks.count
+
+      builder = described_class.new(account: account, code: code)
+      builder.stub(:fetch_access_token) { token }
+
+      builder.perform
+      expect(account.hooks.count).to eql(hooks_count + 1)
+
+      hook = account.hooks.last
+      expect(hook.access_token).to eql(token)
+    end
+  end
+end
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
new file mode 100644
index 000000000..7d38a9ac7
--- /dev/null
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -0,0 +1,45 @@
+require 'rails_helper'
+
+describe Integrations::Slack::IncomingMessageBuilder do
+  let(:account) { create(:account) }
+  let(:message_params) { slack_message_stub }
+  let(:verification_params) { slack_url_verification_stub }
+
+  let(:hook) { create(:integrations_hook, account: account, reference_id: message_params[:event][:channel]) }
+  let!(:conversation) { create(:conversation, identifier: message_params[:event][:thread_ts]) }
+
+  describe '#perform' do
+    context 'when url verification' do
+      it 'return challenge code as response' do
+        builder = described_class.new(verification_params)
+        response = builder.perform
+        expect(response[:challenge]).to eql(verification_params[:challenge])
+      end
+    end
+
+    context 'when message creation' do
+      it 'creates message' do
+        messages_count = conversation.messages.count
+        builder = described_class.new(message_params)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count + 1)
+      end
+
+      it 'does not create message for invalid event type' do
+        messages_count = conversation.messages.count
+        message_params[:type] = 'invalid_event_type'
+        builder = described_class.new(message_params)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count)
+      end
+
+      it 'does not create message for invalid event name' do
+        messages_count = conversation.messages.count
+        message_params[:event][:type] = 'invalid_event_name'
+        builder = described_class.new(message_params)
+        builder.perform
+        expect(conversation.messages.count).to eql(messages_count)
+      end
+    end
+  end
+end
diff --git a/spec/lib/integrations/slack/outgoing_message_builder_spec.rb b/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
new file mode 100644
index 000000000..d52ed33aa
--- /dev/null
+++ b/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
@@ -0,0 +1,30 @@
+require 'rails_helper'
+
+describe Integrations::Slack::OutgoingMessageBuilder do
+  let(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:contact) { create(:contact) }
+
+  let!(:hook) { create(:integrations_hook, account: account) }
+  let!(:conversation) { create(:conversation, account: account, inbox: inbox, contact: contact) }
+  let!(:message) { create(:message, account: account, inbox: inbox, conversation: conversation) }
+
+  describe '#perform' do
+    it 'sent message to slack' do
+      builder = described_class.new(hook, message)
+      stub_request(:post, 'https://slack.com/api/chat.postMessage')
+        .to_return(status: 200, body: '', headers: {})
+
+      # rubocop:disable RSpec/AnyInstance
+      allow_any_instance_of(Slack::Web::Client).to receive(:chat_postMessage).with(
+        channel: hook.reference_id,
+        text: message.content,
+        username: contact.name,
+        thread_ts: conversation.identifier
+      )
+      # rubocop:enable RSpec/AnyInstance
+
+      builder.perform
+    end
+  end
+end
diff --git a/spec/listeners/hook_listener_spec.rb b/spec/listeners/hook_listener_spec.rb
new file mode 100644
index 000000000..f22a074ab
--- /dev/null
+++ b/spec/listeners/hook_listener_spec.rb
@@ -0,0 +1,32 @@
+require 'rails_helper'
+describe HookListener do
+  let(:listener) { described_class.instance }
+  let!(:account) { create(:account) }
+  let!(:user) { create(:user, account: account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:conversation) { create(:conversation, account: account, inbox: inbox, assignee: user) }
+  let!(:message) do
+    create(:message, message_type: 'outgoing',
+                     account: account, inbox: inbox, conversation: conversation)
+  end
+  let!(:event) { Events::Base.new(event_name, Time.zone.now, message: message) }
+
+  describe '#message_created' do
+    let(:event_name) { :'conversation.created' }
+
+    context 'when hook is not configured' do
+      it 'does not trigger hook job' do
+        expect(HookJob).to receive(:perform_later).exactly(0).times
+        listener.message_created(event)
+      end
+    end
+
+    context 'when hook is configured' do
+      it 'triggers hook job' do
+        hook = create(:integrations_hook, account: account)
+        expect(HookJob).to receive(:perform_later).with(hook, message).once
+        listener.message_created(event)
+      end
+    end
+  end
+end
diff --git a/spec/models/inbox_spec.rb b/spec/models/inbox_spec.rb
index 65dd9ee9e..e92e66c31 100644
--- a/spec/models/inbox_spec.rb
+++ b/spec/models/inbox_spec.rb
@@ -29,6 +29,8 @@ RSpec.describe Inbox do
     it { is_expected.to have_many(:webhooks).dependent(:destroy) }
 
     it { is_expected.to have_many(:events) }
+
+    it { is_expected.to have_many(:hooks) }
   end
 
   describe '#add_member' do
diff --git a/spec/models/integrations/hook_spec.rb b/spec/models/integrations/hook_spec.rb
new file mode 100644
index 000000000..da5f1ff20
--- /dev/null
+++ b/spec/models/integrations/hook_spec.rb
@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe Integrations::Hook, type: :model do
+  context 'with validations' do
+    it { is_expected.to validate_presence_of(:app_id) }
+    it { is_expected.to validate_presence_of(:account_id) }
+  end
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:account) }
+  end
+end
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ef39ac0ef..bb4475cca 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -22,7 +22,9 @@ require 'sidekiq/testing'
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
 #
-# Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
+# rubocop:disable  Rails/FilePath
+Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+# rubocop:enable  Rails/FilePath
 
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove these lines.
@@ -61,7 +63,7 @@ RSpec.configure do |config|
   config.filter_rails_from_backtrace!
   # arbitrary gems may also be filtered via:
   # config.filter_gems_from_backtrace("gem name")
-
+  config.include SlackStubs
   config.include Devise::Test::IntegrationHelpers, type: :request
 end
 
diff --git a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
new file mode 100644
index 000000000..71f8c1d18
--- /dev/null
+++ b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
@@ -0,0 +1,77 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
+  let(:account) { create(:account) }
+  let(:agent) { create(:user, account: account, role: :agent) }
+  let(:hook) { create(:integrations_hook, account: account) }
+
+  describe 'POST /api/v1/accounts/{account.id}/integrations/slack' do
+    context 'when it is an unauthenticated user' do
+      it 'returns unauthorized' do
+        post "/api/v1/accounts/#{account.id}/integrations/slack", params: {}
+        expect(response).to have_http_status(:unauthorized)
+      end
+    end
+
+    context 'when it is an authenticated user' do
+      it 'creates hook' do
+        hook_builder = Integrations::Slack::HookBuilder.new(account: account, code: SecureRandom.hex)
+        hook_builder.stub(:fetch_access_token) { SecureRandom.hex }
+
+        expect(Integrations::Slack::HookBuilder).to receive(:new).and_return(hook_builder)
+
+        post "/api/v1/accounts/#{account.id}/integrations/slack",
+             params: { code: SecureRandom.hex },
+             headers: agent.create_new_auth_token
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+        expect(json_response['app_id']).to eql('cw_slack')
+      end
+    end
+
+    describe 'PUT /api/v1/accounts/{account.id}/integrations/slack/{id}' do
+      context 'when it is an unauthenticated user' do
+        it 'returns unauthorized' do
+          put "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}", params: {}
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+
+      context 'when it is an authenticated user' do
+        it 'updates hook' do
+          channel_builder = Integrations::Slack::ChannelBuilder.new(hook: hook, channel: 'channel')
+          channel_builder.stub(:perform)
+
+          expect(Integrations::Slack::ChannelBuilder).to receive(:new).and_return(channel_builder)
+
+          put "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}",
+              params: { channel: SecureRandom.hex },
+              headers: agent.create_new_auth_token
+
+          expect(response).to have_http_status(:success)
+          json_response = JSON.parse(response.body)
+          expect(json_response['app_id']).to eql('cw_slack')
+        end
+      end
+    end
+
+    describe 'DELETE /api/v1/accounts/{account.id}/integrations/slack/{id}' do
+      context 'when it is an unauthenticated user' do
+        it 'returns unauthorized' do
+          delete "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}", params: {}
+          expect(response).to have_http_status(:unauthorized)
+        end
+      end
+
+      context 'when it is an authenticated user' do
+        it 'deletes hook' do
+          delete "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}",
+                 headers: agent.create_new_auth_token
+          expect(response).to have_http_status(:success)
+          expect(Integrations::Hook.find_by(id: hook.id)).to be nil
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/integrations/webhooks_request_spec.rb b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
new file mode 100644
index 000000000..1a29f2695
--- /dev/null
+++ b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe 'Api::V1::Integrations::Webhooks', type: :request do
+  describe 'POST /api/v1/integrations/webhooks' do
+    it 'consumes webhook' do
+      builder = Integrations::Slack::IncomingMessageBuilder.new({})
+      builder.stub(:perform) { true }
+
+      expect(Integrations::Slack::IncomingMessageBuilder).to receive(:new).and_return(builder)
+
+      post '/api/v1/integrations/webhooks', params: {}
+      expect(response).to have_http_status(:success)
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ee6aa71b9..207f3bea6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,5 +1,8 @@
 require 'simplecov'
+require 'webmock/rspec'
+
 SimpleCov.start 'rails'
+WebMock.allow_net_connect!
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
diff --git a/spec/support/slack_stubs.rb b/spec/support/slack_stubs.rb
new file mode 100644
index 000000000..971803f4e
--- /dev/null
+++ b/spec/support/slack_stubs.rb
@@ -0,0 +1,53 @@
+module SlackStubs
+  def slack_url_verification_stub
+    {
+      "token": 'Jhj5dZrVaK7ZwHHjRyZWjbDl',
+      "challenge": '3eZbrw1aBm2rZgRNFdxV2595E9CY3gmdALWMmHkvFXO7tYXAYM8P',
+      "type": 'url_verification'
+    }
+  end
+
+  # rubocop:disable  Metrics/MethodLength
+  def slack_message_stub
+    {
+      "token": '[FILTERED]',
+      "team_id": 'TLST3048H',
+      "api_app_id": 'A012S5UETV4',
+      "event": {
+        "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
+        "type": 'message',
+        "text": 'this is test',
+        "user": 'ULYPAKE5S',
+        "ts": '1588623033.006000',
+        "team": 'TLST3048H',
+        "blocks": [
+          {
+            "type": 'rich_text',
+            "block_id": 'jaIv3',
+            "elements": [
+              {
+                "type": 'rich_text_section',
+                "elements": [
+                  {
+                    "type": 'text',
+                    "text": 'this is test'
+                  }
+                ]
+              }
+            ]
+          }
+        ],
+        "thread_ts": '1588623023.005900',
+        "channel": 'G01354F6A6Q',
+        "event_ts": '1588623033.006000',
+        "channel_type": 'group'
+      },
+      "type": 'event_callback',
+      "event_id": 'Ev013QUX3WV6',
+      "event_time": 1_588_623_033,
+      "authed_users": '[FILTERED]',
+      "webhook": {}
+    }
+  end
+  # rubocop:enable  Metrics/MethodLength
+end

From f9e8bb8e104f405a360b8de046fa3367d6237cf6 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 13 Jun 2020 00:19:43 +0530
Subject: [PATCH 18/50] Chore: Send browser language in webwidget events (#952)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 .../api/v1/widget/events_controller.rb           |  9 ++++++++-
 app/javascript/widget/api/endPoints.js           | 11 ++---------
 app/javascript/widget/api/events.js              |  4 +++-
 .../widget/helpers/specs/urlParamsHelper.spec.js | 16 ++++++++++++++++
 app/javascript/widget/helpers/urlParamsHelper.js | 10 ++++++++++
 app/listeners/agent_bot_listener.rb              |  1 +
 app/listeners/webhook_listener.rb                |  1 +
 app/models/conversation.rb                       |  5 +----
 db/schema.rb                                     | 16 ++--------------
 .../api/v1/widget/events_controller_spec.rb      |  4 +++-
 10 files changed, 47 insertions(+), 30 deletions(-)
 create mode 100644 app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
 create mode 100644 app/javascript/widget/helpers/urlParamsHelper.js

diff --git a/app/controllers/api/v1/widget/events_controller.rb b/app/controllers/api/v1/widget/events_controller.rb
index b32b0f78d..ea5326d6f 100644
--- a/app/controllers/api/v1/widget/events_controller.rb
+++ b/app/controllers/api/v1/widget/events_controller.rb
@@ -2,12 +2,19 @@ class Api::V1::Widget::EventsController < Api::V1::Widget::BaseController
   include Events::Types
 
   def create
-    Rails.configuration.dispatcher.dispatch(permitted_params[:name], Time.zone.now, contact_inbox: @contact_inbox)
+    Rails.configuration.dispatcher.dispatch(permitted_params[:name], Time.zone.now, contact_inbox: @contact_inbox, event_info: event_info)
     head :no_content
   end
 
   private
 
+  def event_info
+    {
+      widget_language: params[:locale],
+      browser_language: browser.accept_language.first&.code
+    }
+  end
+
   def permitted_params
     params.permit(:name, :website_token)
   end
diff --git a/app/javascript/widget/api/endPoints.js b/app/javascript/widget/api/endPoints.js
index ef51af907..64432402e 100755
--- a/app/javascript/widget/api/endPoints.js
+++ b/app/javascript/widget/api/endPoints.js
@@ -1,15 +1,8 @@
-import Vue from 'vue';
+import { buildSearchParamsWithLocale } from '../helpers/urlParamsHelper';
 
 const sendMessage = content => {
-  const locale = Vue.config.lang;
   const refererURL = window.refererURL || '';
-  let search = window.location.search;
-  if (search) {
-    search = `${search}&locale=${locale}`;
-  } else {
-    search = `?locale=${locale}`;
-  }
-
+  const search = buildSearchParamsWithLocale(window.location.search);
   return {
     url: `/api/v1/widget/messages${search}`,
     params: {
diff --git a/app/javascript/widget/api/events.js b/app/javascript/widget/api/events.js
index 61c0c0db2..0c8fcfb23 100644
--- a/app/javascript/widget/api/events.js
+++ b/app/javascript/widget/api/events.js
@@ -1,7 +1,9 @@
 import { API } from 'widget/helpers/axios';
+import { buildSearchParamsWithLocale } from '../helpers/urlParamsHelper';
 
 export default {
   create(name) {
-    return API.post(`/api/v1/widget/events${window.location.search}`, { name });
+    const search = buildSearchParamsWithLocale(window.location.search);
+    return API.post(`/api/v1/widget/events${search}`, { name });
   },
 };
diff --git a/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js b/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
new file mode 100644
index 000000000..422a45f88
--- /dev/null
+++ b/app/javascript/widget/helpers/specs/urlParamsHelper.spec.js
@@ -0,0 +1,16 @@
+import { buildSearchParamsWithLocale } from '../urlParamsHelper';
+
+jest.mock('vue', () => ({
+  config: {
+    lang: 'el',
+  },
+}));
+
+describe('#buildSearchParamsWithLocale', () => {
+  it('returns correct search params', () => {
+    expect(buildSearchParamsWithLocale('?test=1234')).toEqual(
+      '?test=1234&locale=el'
+    );
+    expect(buildSearchParamsWithLocale('')).toEqual('?locale=el');
+  });
+});
diff --git a/app/javascript/widget/helpers/urlParamsHelper.js b/app/javascript/widget/helpers/urlParamsHelper.js
new file mode 100644
index 000000000..271c5eb94
--- /dev/null
+++ b/app/javascript/widget/helpers/urlParamsHelper.js
@@ -0,0 +1,10 @@
+import Vue from 'vue';
+export const buildSearchParamsWithLocale = search => {
+  const locale = Vue.config.lang;
+  if (search) {
+    search = `${search}&locale=${locale}`;
+  } else {
+    search = `?locale=${locale}`;
+  }
+  return search;
+};
diff --git a/app/listeners/agent_bot_listener.rb b/app/listeners/agent_bot_listener.rb
index 4c7b4a610..b4b9cc8a3 100644
--- a/app/listeners/agent_bot_listener.rb
+++ b/app/listeners/agent_bot_listener.rb
@@ -56,6 +56,7 @@ class AgentBotListener < BaseListener
     agent_bot = inbox.agent_bot_inbox.agent_bot
 
     payload = contact_inbox.webhook_data.merge(event: __method__.to_s)
+    payload[:event_info] = event.data[:event_info]
     AgentBotJob.perform_later(agent_bot.outgoing_url, payload)
   end
 end
diff --git a/app/listeners/webhook_listener.rb b/app/listeners/webhook_listener.rb
index 1244df148..14ad91709 100644
--- a/app/listeners/webhook_listener.rb
+++ b/app/listeners/webhook_listener.rb
@@ -38,6 +38,7 @@ class WebhookListener < BaseListener
     inbox = contact_inbox.inbox
 
     payload = contact_inbox.webhook_data.merge(event: __method__.to_s)
+    payload[:event_info] = event.data[:event_info]
     deliver_webhook_payloads(payload, inbox)
   end
 
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 98c3ebcc6..4798d36b3 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -107,10 +107,7 @@ class Conversation < ApplicationRecord
   end
 
   def webhook_data
-    {
-      display_id: display_id,
-      additional_attributes: additional_attributes
-    }
+    Conversations::EventDataPresenter.new(self).push_data
   end
 
   def notifiable_assignee_change?
diff --git a/db/schema.rb b/db/schema.rb
index 5771ffe28..000d1e4b7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -13,6 +13,7 @@
 ActiveRecord::Schema.define(version: 2020_06_10_143132) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "pg_stat_statements"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -205,8 +206,8 @@ ActiveRecord::Schema.define(version: 2020_06_10_143132) do
     t.boolean "locked", default: false
     t.jsonb "additional_attributes"
     t.bigint "contact_inbox_id"
-    t.string "identifier"
     t.uuid "uuid", default: -> { "gen_random_uuid()" }, null: false
+    t.string "identifier"
     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 ["contact_inbox_id"], name: "index_conversations_on_contact_inbox_id"
@@ -228,17 +229,6 @@ ActiveRecord::Schema.define(version: 2020_06_10_143132) do
     t.index ["user_id"], name: "index_events_on_user_id"
   end
 
-  create_table "hooks_inbox_apps", force: :cascade do |t|
-    t.integer "inbox_id"
-    t.integer "agent_id"
-    t.integer "account_id"
-    t.string "app_slug"
-    t.string "status"
-    t.text "settings"
-    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
@@ -381,11 +371,9 @@ ActiveRecord::Schema.define(version: 2020_06_10_143132) do
     t.index ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context"
     t.index ["taggable_id", "taggable_type", "tagger_id", "context"], name: "taggings_idy"
     t.index ["taggable_id"], name: "index_taggings_on_taggable_id"
-    t.index ["taggable_type", "taggable_id"], name: "index_taggings_on_taggable_type_and_taggable_id"
     t.index ["taggable_type"], name: "index_taggings_on_taggable_type"
     t.index ["tagger_id", "tagger_type"], name: "index_taggings_on_tagger_id_and_tagger_type"
     t.index ["tagger_id"], name: "index_taggings_on_tagger_id"
-    t.index ["tagger_type", "tagger_id"], name: "index_taggings_on_tagger_type_and_tagger_id"
   end
 
   create_table "tags", id: :serial, force: :cascade do |t|
diff --git a/spec/controllers/api/v1/widget/events_controller_spec.rb b/spec/controllers/api/v1/widget/events_controller_spec.rb
index e99686830..a1b8e4af9 100644
--- a/spec/controllers/api/v1/widget/events_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/events_controller_spec.rb
@@ -30,7 +30,9 @@ RSpec.describe '/api/v1/widget/events', type: :request do
              as: :json
 
         expect(response).to have_http_status(:success)
-        expect(Rails.configuration.dispatcher).to have_received(:dispatch).with(params[:name], anything, contact_inbox: contact_inbox)
+        expect(Rails.configuration.dispatcher).to have_received(:dispatch)
+          .with(params[:name], anything, contact_inbox: contact_inbox,
+                                         event_info: { browser_language: nil, widget_language: nil })
       end
     end
   end

From 944fbf27b715f9fb0958c19ffd904a7926b10ab1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Sat, 13 Jun 2020 20:33:23 +0530
Subject: [PATCH 19/50] Enhancement: Improve scrolling on widget #954 (#955)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 app/javascript/sdk/IFrameHelper.js  | 20 ++++++++++++++++----
 app/javascript/sdk/bubbleHelpers.js |  9 ---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index e5fadfbd4..751e9fa6b 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -4,8 +4,6 @@ import {
   body,
   widgetHolder,
   createBubbleHolder,
-  disableScroll,
-  enableScroll,
   createBubbleIcon,
   bubbleImg,
   chatBubble,
@@ -37,6 +35,7 @@ export const IFrameHelper = {
     IFrameHelper.initPostMessageCommunication();
     IFrameHelper.initLocationListener();
     IFrameHelper.initWindowSizeListener();
+    IFrameHelper.preventDefaultScroll();
   },
   getAppFrame: () => document.getElementById('chatwoot_live_chat_widget'),
   sendMessage: (key, value) => {
@@ -70,6 +69,21 @@ export const IFrameHelper = {
       IFrameHelper.toggleCloseButton();
     });
   },
+  preventDefaultScroll: () => {
+    widgetHolder.addEventListener('wheel', event => {
+      const deltaY = event.deltaY;
+      const contentHeight = widgetHolder.scrollHeight;
+      const visibleHeight = widgetHolder.offsetHeight;
+      const scrollTop = widgetHolder.scrollTop;
+
+      if (
+        (scrollTop === 0 && deltaY < 0) ||
+        (visibleHeight + scrollTop === contentHeight && deltaY > 0)
+      ) {
+        event.preventDefault();
+      }
+    });
+  },
   events: {
     loaded: message => {
       Cookies.set('cw_conversation', message.config.authToken, {
@@ -99,8 +113,6 @@ export const IFrameHelper = {
     const iframe = IFrameHelper.getAppFrame();
     iframe.style.visibility = '';
     iframe.setAttribute('id', `chatwoot_live_chat_widget`);
-    iframe.onmouseenter = disableScroll;
-    iframe.onmouseleave = enableScroll;
 
     loadCSS();
     createBubbleHolder();
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index 664bac5ec..cb58a4431 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -12,7 +12,6 @@ export const chatBubble = document.createElement('div');
 export const closeBubble = document.createElement('div');
 
 export const notificationBubble = document.createElement('span');
-const bodyOverFlowStyle = document.body.style.overflow;
 
 export const createBubbleIcon = ({ className, src, target }) => {
   target.className = `${className} woot-elements--${window.$chatwoot.position}`;
@@ -45,11 +44,3 @@ export const onBubbleClick = () => {
 export const onClickChatBubble = () => {
   wootOn(bubbleHolder, 'click', onBubbleClick);
 };
-
-export const disableScroll = () => {
-  document.body.style.overflow = 'hidden';
-};
-
-export const enableScroll = () => {
-  document.body.style.overflow = bodyOverFlowStyle;
-};

From ecd5e2013322d9b6f0c08086383f57c794b76ea7 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sat, 13 Jun 2020 22:29:12 +0530
Subject: [PATCH 20/50] Bug: Replace non-numeric characters in Twilio
 phonenumber (#958)

---
 .../routes/dashboard/settings/inbox/channels/Twilio.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
index ac5ba6859..e6d4056c1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/channels/Twilio.vue
@@ -138,7 +138,7 @@ export default {
               medium: this.medium,
               account_sid: this.accountSID,
               auth_token: this.authToken,
-              phone_number: this.phoneNumber,
+              phone_number: `+${this.phoneNumber.replace(/\D/g, '')}`,
             },
           }
         );

From 5ec9af932539c530a2fb9cdd6460d38ae4914005 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Sun, 14 Jun 2020 11:28:38 +0530
Subject: [PATCH 21/50] Bug: Add min height to widget input box (#960)

---
 app/javascript/widget/components/ChatInputArea.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/widget/components/ChatInputArea.vue b/app/javascript/widget/components/ChatInputArea.vue
index bc335a72c..036f8b2fe 100755
--- a/app/javascript/widget/components/ChatInputArea.vue
+++ b/app/javascript/widget/components/ChatInputArea.vue
@@ -49,6 +49,7 @@ export default {
 .user-message-input {
   border: 0;
   height: $space-large;
+  min-height: $space-large;
   resize: none;
   padding-top: $space-small;
 }

From 5cb88237f5fd8b351c19b80b1b037379b748940b Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sun, 14 Jun 2020 14:07:52 +0530
Subject: [PATCH 22/50] Chore: Move conversationStats to a seperate module
 (#962)

* Chore: Move conversationStats to a seperate module

* Move toggleTyping to conversationTypingStatus

* Remove unused agentTyping flag

* Fix review comments
---
 .../dashboard/api/channel/fbChannel.js        | 14 -----
 .../api/specs/channel/fbChannel.spec.js       |  2 -
 .../dashboard/api/specs/contacts.spec.js      | 16 +++---
 .../dashboard/components/ChatList.vue         | 17 +++---
 .../components/widgets/ChatTypeTabs.vue       |  5 --
 .../widgets/conversation/ReplyBox.vue         |  2 +-
 app/javascript/dashboard/store/index.js       |  2 +
 .../store/modules/conversationStats.js        | 53 +++++++++++++++++++
 .../store/modules/conversationTypingStatus.js |  9 +++-
 .../store/modules/conversations/actions.js    | 30 +----------
 .../store/modules/conversations/getters.js    |  1 -
 .../store/modules/conversations/index.js      | 24 ---------
 .../conversationStats}/actions.spec.js        | 25 +++++++--
 .../specs/conversationStats/getters.spec.js   | 16 ++++++
 .../specs/conversationStats/mutations.spec.js | 20 +++++++
 .../dashboard/store/mutation-types.js         |  1 -
 16 files changed, 139 insertions(+), 98 deletions(-)
 create mode 100644 app/javascript/dashboard/store/modules/conversationStats.js
 rename app/javascript/dashboard/store/modules/{conversations/specs => specs/conversationStats}/actions.spec.js (56%)
 create mode 100644 app/javascript/dashboard/store/modules/specs/conversationStats/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/conversationStats/mutations.spec.js

diff --git a/app/javascript/dashboard/api/channel/fbChannel.js b/app/javascript/dashboard/api/channel/fbChannel.js
index e53885b4a..2e86cb927 100644
--- a/app/javascript/dashboard/api/channel/fbChannel.js
+++ b/app/javascript/dashboard/api/channel/fbChannel.js
@@ -6,20 +6,6 @@ class FBChannel extends ApiClient {
     super('facebook_indicators', { accountScoped: true });
   }
 
-  markSeen({ inboxId, contactId }) {
-    return axios.post(`${this.url}/mark_seen`, {
-      inbox_id: inboxId,
-      contact_id: contactId,
-    });
-  }
-
-  toggleTyping({ status, inboxId, contactId }) {
-    return axios.post(`${this.url}/typing_${status}`, {
-      inbox_id: inboxId,
-      contact_id: contactId,
-    });
-  }
-
   create(params) {
     return axios.post(
       `${this.url.replace(this.resource, '')}callbacks/register_facebook_page`,
diff --git a/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js b/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
index 63ae1492d..03f1cb649 100644
--- a/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
+++ b/app/javascript/dashboard/api/specs/channel/fbChannel.spec.js
@@ -9,7 +9,5 @@ describe('#FBChannel', () => {
     expect(fbChannel).toHaveProperty('create');
     expect(fbChannel).toHaveProperty('update');
     expect(fbChannel).toHaveProperty('delete');
-    expect(fbChannel).toHaveProperty('markSeen');
-    expect(fbChannel).toHaveProperty('toggleTyping');
   });
 });
diff --git a/app/javascript/dashboard/api/specs/contacts.spec.js b/app/javascript/dashboard/api/specs/contacts.spec.js
index 1021c0409..2cc89ccc8 100644
--- a/app/javascript/dashboard/api/specs/contacts.spec.js
+++ b/app/javascript/dashboard/api/specs/contacts.spec.js
@@ -1,14 +1,14 @@
-import agents from '../contacts';
+import contacts from '../contacts';
 import ApiClient from '../ApiClient';
 
 describe('#ContactsAPI', () => {
   it('creates correct instance', () => {
-    expect(agents).toBeInstanceOf(ApiClient);
-    expect(agents).toHaveProperty('get');
-    expect(agents).toHaveProperty('show');
-    expect(agents).toHaveProperty('create');
-    expect(agents).toHaveProperty('update');
-    expect(agents).toHaveProperty('delete');
-    expect(agents).toHaveProperty('getConversations');
+    expect(contacts).toBeInstanceOf(ApiClient);
+    expect(contacts).toHaveProperty('get');
+    expect(contacts).toHaveProperty('show');
+    expect(contacts).toHaveProperty('create');
+    expect(contacts).toHaveProperty('update');
+    expect(contacts).toHaveProperty('delete');
+    expect(contacts).toHaveProperty('getConversations');
   });
 });
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index a4cec45e3..9adb05dcc 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -88,14 +88,17 @@ export default {
       chatListLoading: 'getChatListLoadingStatus',
       currentUserID: 'getCurrentUserID',
       activeInbox: 'getSelectedInbox',
-      convStats: 'getConvTabStats',
+      conversationStats: 'conversationStats/getStats',
     }),
     assigneeTabItems() {
-      return this.$t('CHAT_LIST.ASSIGNEE_TYPE_TABS').map(item => ({
-        key: item.KEY,
-        name: item.NAME,
-        count: this.convStats[item.COUNT_KEY] || 0,
-      }));
+      return this.$t('CHAT_LIST.ASSIGNEE_TYPE_TABS').map(item => {
+        const count = this.conversationStats[item.COUNT_KEY] || 0;
+        return {
+          key: item.KEY,
+          name: item.NAME,
+          count,
+        };
+      });
     },
     inbox() {
       return this.$store.getters['inboxes/getInbox'](this.activeInbox);
@@ -130,7 +133,7 @@ export default {
     this.$store.dispatch('agents/get');
 
     bus.$on('fetch_conversation_stats', () => {
-      this.$store.dispatch('getConversationStats', this.conversationFilters);
+      this.$store.dispatch('conversationStats/get', this.conversationFilters);
     });
   },
   methods: {
diff --git a/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue b/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
index 0ed5e542b..e57f63fbf 100644
--- a/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
+++ b/app/javascript/dashboard/components/widgets/ChatTypeTabs.vue
@@ -22,11 +22,6 @@ export default {
       default: wootConstants.ASSIGNEE_TYPE.ME,
     },
   },
-  data() {
-    return {
-      tabsIndex: wootConstants.ASSIGNEE_TYPE.ME,
-    };
-  },
   computed: {
     activeTabIndex() {
       return this.items.findIndex(item => item.key === this.activeTab);
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index 8a2a836ba..df2e03398 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -269,7 +269,7 @@ export default {
     toggleTyping(status) {
       if (this.channelType === 'Channel::WebWidget' && !this.isPrivate) {
         const conversationId = this.currentChat.id;
-        this.$store.dispatch('toggleTyping', {
+        this.$store.dispatch('conversationTypingStatus/toggleTyping', {
           status,
           conversationId,
         });
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 9df653765..be0328178 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -12,6 +12,7 @@ import conversationLabels from './modules/conversationLabels';
 import conversationMetadata from './modules/conversationMetadata';
 import conversationPage from './modules/conversationPage';
 import conversations from './modules/conversations';
+import conversationStats from './modules/conversationStats';
 import conversationTypingStatus from './modules/conversationTypingStatus';
 import globalConfig from 'shared/store/globalConfig';
 import inboxes from './modules/inboxes';
@@ -33,6 +34,7 @@ export default new Vuex.Store({
     conversationLabels,
     conversationMetadata,
     conversationPage,
+    conversationStats,
     conversations,
     conversationTypingStatus,
     globalConfig,
diff --git a/app/javascript/dashboard/store/modules/conversationStats.js b/app/javascript/dashboard/store/modules/conversationStats.js
new file mode 100644
index 000000000..b7be14f28
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/conversationStats.js
@@ -0,0 +1,53 @@
+import Vue from 'vue';
+import types from '../mutation-types';
+import ConversationApi from '../../api/inbox/conversation';
+
+const state = {
+  mineCount: 0,
+  unAssignedCount: 0,
+  allCount: 0,
+};
+
+export const getters = {
+  getStats: $state => $state,
+};
+
+export const actions = {
+  get: async ({ commit }, params) => {
+    try {
+      const response = await ConversationApi.meta(params);
+      const {
+        data: { meta },
+      } = response;
+      commit(types.SET_CONV_TAB_META, meta);
+    } catch (error) {
+      // Ignore error
+    }
+  },
+  set({ commit }, meta) {
+    commit(types.SET_CONV_TAB_META, meta);
+  },
+};
+
+export const mutations = {
+  [types.SET_CONV_TAB_META](
+    $state,
+    {
+      mine_count: mineCount,
+      unassigned_count: unAssignedCount,
+      all_count: allCount,
+    } = {}
+  ) {
+    Vue.set($state, 'mineCount', mineCount);
+    Vue.set($state, 'allCount', allCount);
+    Vue.set($state, 'unAssignedCount', unAssignedCount);
+  },
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/conversationTypingStatus.js b/app/javascript/dashboard/store/modules/conversationTypingStatus.js
index 4ad9f3cb4..27badb668 100644
--- a/app/javascript/dashboard/store/modules/conversationTypingStatus.js
+++ b/app/javascript/dashboard/store/modules/conversationTypingStatus.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import * as types from '../mutation-types';
-
+import ConversationAPI from '../../api/inbox/conversation';
 const state = {
   records: {},
 };
@@ -12,6 +12,13 @@ export const getters = {
 };
 
 export const actions = {
+  toggleTyping: async (_, { status, conversationId }) => {
+    try {
+      await ConversationAPI.toggleTyping({ status, conversationId });
+    } catch (error) {
+      // Handle error
+    }
+  },
   create: ({ commit }, { conversationId, user }) => {
     commit(types.default.ADD_USER_TYPING_TO_CONVERSATION, {
       conversationId,
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index d1e742728..72b46e850 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import * as types from '../../mutation-types';
 import ConversationApi from '../../../api/inbox/conversation';
 import MessageApi from '../../../api/inbox/message';
-import FBChannel from '../../../api/channel/fbChannel';
 
 // actions
 const actions = {
@@ -26,7 +25,7 @@ const actions = {
       const { data } = response.data;
       const { payload: chatList, meta: metaData } = data;
       commit(types.default.SET_ALL_CONVERSATION, chatList);
-      commit(types.default.SET_CONV_TAB_META, metaData);
+      dispatch('conversationStats/set', metaData);
       commit(types.default.CLEAR_LIST_LOADING_STATUS);
       commit(
         `contacts/${types.default.SET_CONTACTS}`,
@@ -171,24 +170,6 @@ const actions = {
     commit(types.default.UPDATE_CONVERSATION, conversation);
   },
 
-  toggleTyping: async ({ commit }, { status, conversationId }) => {
-    try {
-      commit(types.default.SET_AGENT_TYPING, { status });
-      await ConversationApi.toggleTyping({ status, conversationId });
-    } catch (error) {
-      // Handle error
-    }
-  },
-
-  markSeen: async ({ commit }, data) => {
-    try {
-      await FBChannel.markSeen(data);
-      commit(types.default.MARK_SEEN);
-    } catch (error) {
-      // Handle error
-    }
-  },
-
   markMessagesRead: async ({ commit }, data) => {
     setTimeout(() => {
       commit(types.default.MARK_MESSAGE_READ, data);
@@ -236,15 +217,6 @@ const actions = {
       //
     }
   },
-
-  getConversationStats: async ({ commit }, params) => {
-    try {
-      const response = await ConversationApi.meta(params);
-      commit(types.default.SET_CONV_TAB_META, response.data.meta);
-    } catch (error) {
-      // Ignore error
-    }
-  },
 };
 
 export default actions;
diff --git a/app/javascript/dashboard/store/modules/conversations/getters.js b/app/javascript/dashboard/store/modules/conversations/getters.js
index 311342941..cfea74813 100644
--- a/app/javascript/dashboard/store/modules/conversations/getters.js
+++ b/app/javascript/dashboard/store/modules/conversations/getters.js
@@ -52,7 +52,6 @@ const getters = {
   },
   getChatStatusFilter: ({ chatStatusFilter }) => chatStatusFilter,
   getSelectedInbox: ({ currentInbox }) => currentInbox,
-  getConvTabStats: ({ convTabStats }) => convTabStats,
   getNextChatConversation: _state => {
     const { selectedChat } = _state;
     const conversations = getters.getAllStatusChats(_state);
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 71c226c40..5896405ec 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -12,16 +12,10 @@ const initialSelectedChat = {
   status: null,
   muted: false,
   seen: false,
-  agentTyping: 'off',
   dataFetched: false,
 };
 const state = {
   allConversations: [],
-  convTabStats: {
-    mineCount: 0,
-    unAssignedCount: 0,
-    allCount: 0,
-  },
   selectedChat: { ...initialSelectedChat },
   listLoadingStatus: true,
   chatStatusFilter: wootConstants.STATUS_TYPE.OPEN,
@@ -57,7 +51,6 @@ const mutations = {
   },
   [types.default.CLEAR_CURRENT_CHAT_WINDOW](_state) {
     _state.selectedChat.id = null;
-    _state.selectedChat.agentTyping = 'off';
   },
 
   [types.default.SET_PREVIOUS_CONVERSATIONS](_state, { id, data }) {
@@ -67,19 +60,6 @@ const mutations = {
     }
   },
 
-  [types.default.SET_CONV_TAB_META](
-    _state,
-    {
-      mine_count: mineCount,
-      unassigned_count: unAssignedCount,
-      all_count: allCount,
-    } = {}
-  ) {
-    Vue.set(_state.convTabStats, 'mineCount', mineCount);
-    Vue.set(_state.convTabStats, 'allCount', allCount);
-    Vue.set(_state.convTabStats, 'unAssignedCount', unAssignedCount);
-  },
-
   [types.default.CURRENT_CHAT_WINDOW](_state, activeChat) {
     if (activeChat) {
       Object.assign(_state.selectedChat, activeChat);
@@ -176,10 +156,6 @@ const mutations = {
     _state.selectedChat.seen = true;
   },
 
-  [types.default.SET_AGENT_TYPING](_state, { status }) {
-    _state.selectedChat.agentTyping = status;
-  },
-
   [types.default.SET_LIST_LOADING_STATUS](_state) {
     _state.listLoadingStatus = true;
   },
diff --git a/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationStats/actions.spec.js
similarity index 56%
rename from app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
rename to app/javascript/dashboard/store/modules/specs/conversationStats/actions.spec.js
index 4693e0a62..e357204d2 100644
--- a/app/javascript/dashboard/store/modules/conversations/specs/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationStats/actions.spec.js
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import actions from '../actions';
+import { actions } from '../../conversationStats';
 import * as types from '../../../mutation-types';
 
 const commit = jest.fn();
@@ -7,10 +7,10 @@ global.axios = axios;
 jest.mock('axios');
 
 describe('#actions', () => {
-  describe('#getConversationStats', () => {
-    it('sends correct actions if API is success', async () => {
+  describe('#get', () => {
+    it('sends correct mutations if API is success', async () => {
       axios.get.mockResolvedValue({ data: { meta: { mine_count: 1 } } });
-      await actions.getConversationStats(
+      await actions.get(
         { commit },
         { inboxId: 1, assigneeTpe: 'me', status: 'open' }
       );
@@ -20,11 +20,26 @@ describe('#actions', () => {
     });
     it('sends correct actions if API is error', async () => {
       axios.get.mockRejectedValue({ message: 'Incorrect header' });
-      await actions.getConversationStats(
+      await actions.get(
         { commit },
         { inboxId: 1, assigneeTpe: 'me', status: 'open' }
       );
       expect(commit.mock.calls).toEqual([]);
     });
   });
+
+  describe('#set', () => {
+    it('sends correct mutations', async () => {
+      actions.set(
+        { commit },
+        { mine_count: 1, unassigned_count: 1, all_count: 2 }
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.SET_CONV_TAB_META,
+          { mine_count: 1, unassigned_count: 1, all_count: 2 },
+        ],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversationStats/getters.spec.js b/app/javascript/dashboard/store/modules/specs/conversationStats/getters.spec.js
new file mode 100644
index 000000000..38b7a88bc
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/conversationStats/getters.spec.js
@@ -0,0 +1,16 @@
+import { getters } from '../../conversationStats';
+
+describe('#getters', () => {
+  it('getCurrentPage', () => {
+    const state = {
+      mineCount: 1,
+      unAssignedCount: 1,
+      allCount: 2,
+    };
+    expect(getters.getStats(state)).toEqual({
+      mineCount: 1,
+      unAssignedCount: 1,
+      allCount: 2,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/conversationStats/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversationStats/mutations.spec.js
new file mode 100644
index 000000000..e49d938e3
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/conversationStats/mutations.spec.js
@@ -0,0 +1,20 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../conversationStats';
+
+describe('#mutations', () => {
+  describe('#SET_CONV_TAB_META', () => {
+    it('set conversation stats correctly', () => {
+      const state = {};
+      mutations[types.SET_CONV_TAB_META](state, {
+        mine_count: 1,
+        unassigned_count: 1,
+        all_count: 2,
+      });
+      expect(state).toEqual({
+        mineCount: 1,
+        unAssignedCount: 1,
+        allCount: 2,
+      });
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 15c5fe577..98731d2bc 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -32,7 +32,6 @@ export default {
   ADD_MESSAGE: 'ADD_MESSAGE',
   MARK_SEEN: 'MARK_SEEN',
   MARK_MESSAGE_READ: 'MARK_MESSAGE_READ',
-  SET_AGENT_TYPING: 'SET_AGENT_TYPING',
   SET_PREVIOUS_CONVERSATIONS: 'SET_PREVIOUS_CONVERSATIONS',
   SET_ACTIVE_INBOX: 'SET_ACTIVE_INBOX',
 

From 7c6ea3a05a2452ee5f3f5e55bf3e046b2c5148e6 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sun, 14 Jun 2020 18:30:36 +0530
Subject: [PATCH 23/50] Chore: Fix HTML rendering in ConversationCard (#963)

---
 .../widgets/conversation/ConversationCard.vue | 51 +++++++------------
 1 file changed, 17 insertions(+), 34 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index a2a914bb2..d63940127 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -23,15 +23,19 @@
           {{ inboxName(chat.inbox_id) }}
         </span>
       </h4>
-      <p
-        class="conversation--message"
-        v-html="extractMessageText(lastMessageInChat)"
-      />
+      <p v-if="lastMessageInChat" class="conversation--message">
+        <span v-if="lastMessageInChat.content">
+          {{ lastMessageInChat.content }}
+        </span>
+        <span v-else-if="!lastMessageInChat.attachments">{{ ` ` }}</span>
+        <span v-else>
+          <i :class="`small-icon ${this.$t(`${attachmentIconKey}.ICON`)}`"></i>
+          {{ this.$t(`${attachmentIconKey}.CONTENT`) }}
+        </span>
+      </p>
       <div class="conversation--meta">
         <span class="timestamp">
-          {{
-            lastMessageInChat ? dynamicTime(lastMessageInChat.created_at) : ''
-          }}
+          {{ dynamicTime(chat.timestamp) }}
         </span>
         <span class="unread">{{ getUnreadCount }}</span>
       </div>
@@ -39,11 +43,8 @@
   </div>
 </template>
 <script>
-/* eslint no-console: 0 */
-/* eslint no-extra-boolean-cast: 0 */
 import { mapGetters } from 'vuex';
 import Thumbnail from '../Thumbnail';
-import getEmojiSVG from '../emoji/utils';
 import conversationMixin from '../../../mixins/conversations';
 import timeMixin from '../../../mixins/time';
 import router from '../../../routes';
@@ -85,6 +86,12 @@ export default {
       );
     },
 
+    attachmentIconKey() {
+      const lastMessage = this.lastMessageInChat;
+      const [{ file_type: fileType } = {}] = lastMessage.attachments;
+      return `CHAT_LIST.ATTACHMENTS.${fileType}`;
+    },
+
     isActiveChat() {
       return this.currentChat.id === this.chat.id;
     },
@@ -112,30 +119,6 @@ export default {
       const path = conversationUrl(this.accountId, activeInbox, chat.id);
       router.push({ path: frontendURL(path) });
     },
-    extractMessageText(chatItem) {
-      if (!chatItem) {
-        return '';
-      }
-
-      const { content, attachments } = chatItem;
-
-      if (content) {
-        return content;
-      }
-      if (!attachments) {
-        return ' ';
-      }
-
-      const [attachment] = attachments;
-      const { file_type: fileType } = attachment;
-      const key = `CHAT_LIST.ATTACHMENTS.${fileType}`;
-      return `
-        <i class="small-icon ${this.$t(`${key}.ICON`)}"></i>
-        ${this.$t(`${key}.CONTENT`)}
-      `;
-    },
-    getEmojiSVG,
-
     inboxName(inboxId) {
       const stateInbox = this.$store.getters['inboxes/getInbox'](inboxId);
       return stateInbox.name || '';

From 667e3abbe158b5dc267a9a4cd299082efc595c44 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 15 Jun 2020 13:35:52 +0530
Subject: [PATCH 24/50] Fix: Set widget bg color for file-bubble (#965)

---
 .../widget/components/FileBubble.vue          |  4 ++++
 .../widget/components/UserMessage.vue         | 14 +++++++++++--
 .../widget/components/UserMessageBubble.vue   | 20 ++++++++-----------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/javascript/widget/components/FileBubble.vue b/app/javascript/widget/components/FileBubble.vue
index 0a5d545ea..3731bd027 100644
--- a/app/javascript/widget/components/FileBubble.vue
+++ b/app/javascript/widget/components/FileBubble.vue
@@ -32,6 +32,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    widgetColor: {
+      type: String,
+      default: '',
+    },
   },
   computed: {
     title() {
diff --git a/app/javascript/widget/components/UserMessage.vue b/app/javascript/widget/components/UserMessage.vue
index ffdf5685d..9663e4932 100755
--- a/app/javascript/widget/components/UserMessage.vue
+++ b/app/javascript/widget/components/UserMessage.vue
@@ -2,12 +2,17 @@
   <div class="user-message-wrap">
     <div class="user-message">
       <div class="message-wrap" :class="{ 'in-progress': isInProgress }">
-        <UserMessageBubble
+        <user-message-bubble
           v-if="showTextBubble"
           :message="message.content"
           :status="message.status"
+          :widget-color="widgetColor"
         />
-        <div v-if="hasAttachments" class="chat-bubble has-attachment user">
+        <div
+          v-if="hasAttachments"
+          class="chat-bubble has-attachment user"
+          :style="{ backgroundColor: widgetColor }"
+        >
           <div v-for="attachment in message.attachments" :key="attachment.id">
             <file-bubble
               v-if="attachment.file_type !== 'image'"
@@ -32,6 +37,7 @@ import UserMessageBubble from 'widget/components/UserMessageBubble';
 import ImageBubble from 'widget/components/ImageBubble';
 import FileBubble from 'widget/components/FileBubble';
 import timeMixin from 'dashboard/mixins/time';
+import { mapGetters } from 'vuex';
 
 export default {
   name: 'UserMessage',
@@ -48,6 +54,10 @@ export default {
     },
   },
   computed: {
+    ...mapGetters({
+      widgetColor: 'appConfig/getWidgetColor',
+    }),
+
     isInProgress() {
       const { status = '' } = this.message;
       return status === 'in_progress';
diff --git a/app/javascript/widget/components/UserMessageBubble.vue b/app/javascript/widget/components/UserMessageBubble.vue
index 03fac6601..2a3e84836 100755
--- a/app/javascript/widget/components/UserMessageBubble.vue
+++ b/app/javascript/widget/components/UserMessageBubble.vue
@@ -3,33 +3,29 @@
     class="chat-bubble user"
     :style="{ background: widgetColor }"
     v-html="formatMessage(message)"
-  ></div>
+  />
 </template>
 
 <script>
 import messageFormatterMixin from 'shared/mixins/messageFormatterMixin';
-import { mapGetters } from 'vuex';
 
 export default {
   name: 'UserMessageBubble',
   mixins: [messageFormatterMixin],
   props: {
-    message: String,
+    message: {
+      type: String,
+      default: '',
+    },
     status: {
       type: String,
       default: '',
     },
-    computed: {
-      ...mapGetters({
-        widgetColor: 'appConfig/getWidgetColor',
-      }),
+    widgetColor: {
+      type: String,
+      default: '',
     },
   },
-  computed: {
-    ...mapGetters({
-      widgetColor: 'appConfig/getWidgetColor',
-    }),
-  },
 };
 </script>
 

From b0bbd757b519a915a83edf0177cf86ec6f3137e3 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 15 Jun 2020 13:36:56 +0530
Subject: [PATCH 25/50] Chore: FCM Notification Improvements (#957)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 .../v1/accounts/notifications_controller.rb   | 16 ++++++++++++-
 app/models/notification.rb                    |  5 ++++
 .../notification/push_notification_service.rb | 13 +++++++----
 .../notifications/index.json.jbuilder         |  2 ++
 .../accounts/notifications_controller_spec.rb | 23 ++++++++++++++++---
 spec/models/notification_spec.rb              | 21 +++++++++++++++++
 6 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 spec/models/notification_spec.rb

diff --git a/app/controllers/api/v1/accounts/notifications_controller.rb b/app/controllers/api/v1/accounts/notifications_controller.rb
index 1ec27ba29..8ae1629ca 100644
--- a/app/controllers/api/v1/accounts/notifications_controller.rb
+++ b/app/controllers/api/v1/accounts/notifications_controller.rb
@@ -2,6 +2,7 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   protect_from_forgery with: :null_session
 
   before_action :fetch_notification, only: [:update]
+  before_action :set_primary_actor, only: [:read_all]
 
   def index
     @unread_count = current_user.notifications.where(account_id: current_account.id, read_at: nil).count
@@ -9,7 +10,13 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
   end
 
   def read_all
-    current_user.notifications.where(account_id: current_account.id, read_at: nil).update(read_at: DateTime.now.utc)
+    if @primary_actor
+      current_user.notifications.where(account_id: current_account.id, primary_actor: @primary_actor, read_at: nil)
+                  .update(read_at: DateTime.now.utc)
+    else
+      current_user.notifications.where(account_id: current_account.id, read_at: nil).update(read_at: DateTime.now.utc)
+    end
+
     head :ok
   end
 
@@ -20,6 +27,13 @@ class Api::V1::Accounts::NotificationsController < Api::V1::Accounts::BaseContro
 
   private
 
+  def set_primary_actor
+    return unless params[:primary_actor_type]
+    return unless Notification::PRIMARY_ACTORS.include?(params[:primary_actor_type])
+
+    @primary_actor = params[:primary_actor_type].safe_constantize.find_by(id: params[:primary_actor_id])
+  end
+
   def fetch_notification
     @notification = current_user.notifications.find(params[:id])
   end
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 660bcc33c..33c04dda2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -37,11 +37,16 @@ class Notification < ApplicationRecord
   enum notification_type: NOTIFICATION_TYPES
 
   after_create_commit :process_notification_delivery
+  default_scope { order(id: :desc) }
+
+  PRIMARY_ACTORS = ['Conversation'].freeze
 
   def push_event_data
     {
       id: id,
       notification_type: notification_type,
+      primary_actor_type: primary_actor_type,
+      primary_actor_id: primary_actor_id,
       primary_actor: primary_actor&.push_event_data,
       read_at: read_at,
       secondary_actor: secondary_actor&.push_event_data,
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index fadfddf53..275e10c2b 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -66,15 +66,18 @@ class Notification::PushNotificationService
     return unless subscription.fcm?
 
     fcm = FCM.new(ENV['FCM_SERVER_KEY'])
-    options = {
+    response = fcm.send([subscription.subscription_attributes['push_token']], fcm_options)
+    subscription.destroy! if JSON.parse(response[:body])['results']&.first&.keys&.include?('error')
+  end
+
+  def fcm_options
+    {
       "notification": {
         "title": notification.notification_type.titleize,
         "body": notification.push_message_title
       },
-      "data": { notification: notification.push_event_data.to_json }
+      "data": { notification: notification.push_event_data.to_json },
+      "collapse_key": "chatwoot_#{notification.primary_actor_type.downcase}_#{notification.primary_actor_id}"
     }
-
-    response = fcm.send([subscription.subscription_attributes['push_token']], options)
-    subscription.destroy! if JSON.parse(response[:body])['results']&.first&.keys&.include?('error')
   end
 end
diff --git a/app/views/api/v1/accounts/notifications/index.json.jbuilder b/app/views/api/v1/accounts/notifications/index.json.jbuilder
index 048c3d85c..b69d869e6 100644
--- a/app/views/api/v1/accounts/notifications/index.json.jbuilder
+++ b/app/views/api/v1/accounts/notifications/index.json.jbuilder
@@ -8,6 +8,8 @@ json.data do
       json.id notification.id
       json.notification_type notification.notification_type
       json.push_message_title notification.push_message_title
+      json.primary_actor_type notification.primary_actor_type
+      json.primary_actor_id notification.primary_actor_id
       json.primary_actor notification.primary_actor&.push_event_data
       json.read_at notification.read_at
       json.secondary_actor notification.secondary_actor&.push_event_data
diff --git a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
index 594a198b6..8f61cd803 100644
--- a/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/notifications_controller_spec.rb
@@ -14,7 +14,8 @@ RSpec.describe 'Notifications API', type: :request do
 
     context 'when it is an authenticated user' do
       let(:admin) { create(:user, account: account, role: :administrator) }
-      let!(:notification) { create(:notification, account: account, user: admin) }
+      let!(:notification1) { create(:notification, account: account, user: admin) }
+      let!(:notification2) { create(:notification, account: account, user: admin) }
 
       it 'returns all notifications' do
         get "/api/v1/accounts/#{account.id}/notifications",
@@ -23,8 +24,10 @@ RSpec.describe 'Notifications API', type: :request do
 
         response_json = JSON.parse(response.body)
         expect(response).to have_http_status(:success)
-        expect(response.body).to include(notification.notification_type)
-        expect(response_json['data']['meta']['unread_count']).to eq 1
+        expect(response.body).to include(notification1.notification_type)
+        expect(response_json['data']['meta']['unread_count']).to eq 2
+        # notification appear in descending order
+        expect(response_json['data']['payload'].first['id']).to eq notification2.id
       end
     end
   end
@@ -54,6 +57,20 @@ RSpec.describe 'Notifications API', type: :request do
         expect(notification1.reload.read_at).not_to eq('')
         expect(notification2.reload.read_at).not_to eq('')
       end
+
+      it 'updates only the notifications read at for primary actor when param is passed' do
+        post "/api/v1/accounts/#{account.id}/notifications/read_all",
+             headers: admin.create_new_auth_token,
+             params: {
+               primary_actor_id: notification1.primary_actor_id,
+               primary_actor_type: notification1.primary_actor_type
+             },
+             as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(notification1.reload.read_at).not_to eq('')
+        expect(notification2.reload.read_at).to eq nil
+      end
     end
   end
 
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
new file mode 100644
index 000000000..7920df919
--- /dev/null
+++ b/spec/models/notification_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Notification do
+  context 'with associations' do
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:user) }
+  end
+
+  context 'with default order by' do
+    it 'sort by primary id desc' do
+      notification1 = create(:notification)
+      create(:notification)
+      notification3 = create(:notification)
+
+      expect(described_class.all.first).to eq notification3
+      expect(described_class.all.last).to eq notification1
+    end
+  end
+end

From 04f6460afb2cdaf880eda7d07d8c3cb9f1eae055 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Tue, 16 Jun 2020 19:39:57 +0530
Subject: [PATCH 26/50] Chore: Fix failing sidekiq events for contact create
 (#966)

---
 .rubocop.yml                                          |  2 +-
 app/models/contact.rb                                 |  4 ++--
 .../notification/push_notification_service.rb         |  7 ++++++-
 config/initializers/00_init.rb                        |  2 +-
 config/initializers/custom_error_codes.rb             |  6 ++----
 config/routes.rb                                      | 11 +++++------
 .../notification/push_notification_service_spec.rb    |  4 ++++
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index af3e3f831..d1a1cb5f5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -102,8 +102,8 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'db/schema.rb'
-    - 'config/**/*'
     - 'public/**/*'
+    - 'config/initializers/bot.rb'
     - 'vendor/**/*'
     - 'node_modules/**/*'
     - 'lib/tasks/auto_annotate_models.rake'
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 00783f5bc..9ea82ba4c 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -38,8 +38,8 @@ class Contact < ApplicationRecord
   has_many :messages, dependent: :destroy
 
   before_validation :downcase_email
-  after_create :dispatch_create_event
-  after_update :dispatch_update_event
+  after_create_commit :dispatch_create_event
+  after_update_commit :dispatch_update_event
 
   def get_source_id(inbox_id)
     contact_inboxes.find_by!(inbox_id: inbox_id).source_id
diff --git a/app/services/notification/push_notification_service.rb b/app/services/notification/push_notification_service.rb
index 275e10c2b..76aa44478 100644
--- a/app/services/notification/push_notification_service.rb
+++ b/app/services/notification/push_notification_service.rb
@@ -41,8 +41,12 @@ class Notification::PushNotificationService
     app_account_conversation_url(account_id: conversation.account_id, id: conversation.display_id)
   end
 
+  def send_browser_push?(subscription)
+    ENV['VAPID_PUBLIC_KEY'] && subscription.browser_push?
+  end
+
   def send_browser_push(subscription)
-    return unless subscription.browser_push?
+    return unless send_browser_push?(subscription)
 
     Webpush.payload_send(
       message: JSON.generate(push_message),
@@ -63,6 +67,7 @@ class Notification::PushNotificationService
   end
 
   def send_fcm_push(subscription)
+    return unless ENV['FCM_SERVER_KEY']
     return unless subscription.fcm?
 
     fcm = FCM.new(ENV['FCM_SERVER_KEY'])
diff --git a/config/initializers/00_init.rb b/config/initializers/00_init.rb
index b72fc4be1..8a12cc226 100644
--- a/config/initializers/00_init.rb
+++ b/config/initializers/00_init.rb
@@ -1 +1 @@
-APPS_CONFIG = YAML.load_file(File.join(Rails.root, 'config/integration', 'apps.yml'))
\ No newline at end of file
+APPS_CONFIG = YAML.load_file(Rails.root.join('config/integration/apps.yml'))
diff --git a/config/initializers/custom_error_codes.rb b/config/initializers/custom_error_codes.rb
index d5efcb034..e2800b2a3 100644
--- a/config/initializers/custom_error_codes.rb
+++ b/config/initializers/custom_error_codes.rb
@@ -1,4 +1,2 @@
-Rack::Utils::HTTP_STATUS_CODES.merge!(
-  901 => 'Trial Expired',
-  902 => 'Account Suspended'
-)
+Rack::Utils::HTTP_STATUS_CODES[901] = 'Trial Expired'
+Rack::Utils::HTTP_STATUS_CODES[902] = 'Account Suspended'
diff --git a/config/routes.rb b/config/routes.rb
index 9602020e3..c4b6aeb62 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -87,11 +87,11 @@ Rails.application.routes.draw do
           end
           resource :notification_settings, only: [:show, :update]
 
-        resources :webhooks, except: [:show]
-        namespace :integrations do
-          resources :apps, only: [:index, :show]
-          resources :slack, only: [:create, :update, :destroy]
-        end
+          resources :webhooks, except: [:show]
+          namespace :integrations do
+            resources :apps, only: [:index, :show]
+            resources :slack, only: [:create, :update, :destroy]
+          end
         end
       end
       # end of account scoped api routes
@@ -106,7 +106,6 @@ Rails.application.routes.draw do
 
       resources :agent_bots, only: [:index]
 
-      
       namespace :widget do
         resources :events, only: [:create]
         resources :messages, only: [:index, :create, :update]
diff --git a/spec/services/notification/push_notification_service_spec.rb b/spec/services/notification/push_notification_service_spec.rb
index 67fc9f999..44a5dbaf5 100644
--- a/spec/services/notification/push_notification_service_spec.rb
+++ b/spec/services/notification/push_notification_service_spec.rb
@@ -14,19 +14,23 @@ describe Notification::PushNotificationService do
 
   describe '#perform' do
     it 'sends webpush notifications for webpush subscription' do
+      ENV['VAPID_PUBLIC_KEY'] = 'test'
       create(:notification_subscription, user: notification.user)
 
       described_class.new(notification: notification).perform
       expect(Webpush).to have_received(:payload_send)
       expect(FCM).not_to have_received(:new)
+      ENV['ENABLE_ACCOUNT_SIGNUP'] = nil
     end
 
     it 'sends a fcm notification for firebase subscription' do
+      ENV['FCM_SERVER_KEY'] = 'test'
       create(:notification_subscription, user: notification.user, subscription_type: 'fcm')
 
       described_class.new(notification: notification).perform
       expect(FCM).to have_received(:new)
       expect(Webpush).not_to have_received(:payload_send)
+      ENV['ENABLE_ACCOUNT_SIGNUP'] = nil
     end
   end
 end

From 963f173730691dcfa7fe8a4c21ae6d887e8dc1fe Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Thu, 18 Jun 2020 15:17:45 +0530
Subject: [PATCH 27/50] Feature: ResizableTextArea in widget and dashboard
 (#969)

* Create ResizableTextArea component
* Rubocop fixes and spec fixes

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .rubocop.yml                                  |  17 ++
 Gemfile.lock                                  | 192 +++++++++---------
 .../assets/scss/widgets/_reply-box.scss       |   7 +-
 .../widgets/conversation/ReplyBox.vue         |   7 +-
 .../shared/components/ResizableTextArea.vue   |  56 +++++
 .../widget/components/ChatInputArea.vue       |  56 -----
 .../widget/components/ChatInputWrap.vue       |  28 ++-
 .../widget/components/ResizableTextarea.vue   |  26 ---
 .../widget/components/UserMessageBubble.vue   |   1 +
 app/presenters/mail_presenter.rb              |   2 +-
 config/initializers/assets.rb                 |   1 +
 11 files changed, 208 insertions(+), 185 deletions(-)
 create mode 100644 app/javascript/shared/components/ResizableTextArea.vue
 delete mode 100755 app/javascript/widget/components/ChatInputArea.vue
 delete mode 100644 app/javascript/widget/components/ResizableTextarea.vue

diff --git a/.rubocop.yml b/.rubocop.yml
index d1a1cb5f5..4d75629e8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,8 +8,17 @@ Lint/RaiseException:
   Enabled: true
 Lint/StructNewOverride:
   Enabled: true
+Lint/DeprecatedOpenSSLConstant:
+  Enabled: true
+Lint/MixedRegexpCaptureTypes:
+  Enabled: true
 Layout/LineLength:
   Max: 150
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
 Metrics/ClassLength:
   Max: 125
   Exclude:
@@ -18,6 +27,8 @@ RSpec/ExampleLength:
   Max: 25
 Style/Documentation:
   Enabled: false
+Style/ExponentialNotation:
+  Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
 Style/SymbolArray:
@@ -28,6 +39,12 @@ Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Style/RedundantRegexpCharacterClass:
+  Enabled: true
+Style/RedundantRegexpEscape:
+  Enabled: true
+Style/SlicingWithRange:
+  Enabled: true
 Style/GlobalVars:
   Exclude:
     - 'config/initializers/redis.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index aadeaf5be..a71da76b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,56 +18,56 @@ GEM
   specs:
     action-cable-testing (0.6.1)
       actioncable (>= 5.0)
-    actioncable (6.0.3.1)
-      actionpack (= 6.0.3.1)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.1)
-      actionview (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.1)
-      activesupport (= 6.0.3.1)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activerecord (6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
-    activestorage (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.3.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -91,25 +91,25 @@ GEM
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
-    ast (2.4.0)
-    attr_extras (6.2.3)
+    ast (2.4.1)
+    attr_extras (6.2.4)
     autoprefixer-rails (9.7.6)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.317.0)
-    aws-sdk-core (3.96.1)
+    aws-partitions (1.329.0)
+    aws-sdk-core (3.100.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.31.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.34.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.65.0)
-      aws-sdk-core (~> 3, >= 3.96.1)
+    aws-sdk-s3 (1.68.1)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.3)
+    aws-sigv4 (1.1.4)
       aws-eventstream (~> 1.0, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
@@ -127,22 +127,22 @@ GEM
     bootsnap (1.4.6)
       msgpack (~> 1.0)
     brakeman (4.8.2)
-    browser (4.1.0)
+    browser (4.2.0)
     builder (3.2.4)
     bullet (6.1.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
     bundle-audit (0.1.0)
       bundler-audit
-    bundler-audit (0.6.1)
+    bundler-audit (0.7.0.1)
       bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
+      thor (>= 0.18, < 2)
     byebug (11.1.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    connection_pool (2.2.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -152,16 +152,17 @@ GEM
     declarative-option (0.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.7.1)
+    devise (4.7.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    devise_token_auth (1.1.3)
+    devise_token_auth (1.1.4)
       bcrypt (~> 3.0)
       devise (> 3.5.2, < 5)
       rails (>= 4.2.0, < 6.1)
+      sprockets (= 3.7.2)
     diff-lcs (1.3)
     digest-crc (0.5.1)
     docile (1.3.2)
@@ -182,7 +183,7 @@ GEM
     factory_bot_rails (5.2.0)
       factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
-    faker (2.11.0)
+    faker (2.12.0)
       i18n (>= 1.6, < 2)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
@@ -190,13 +191,13 @@ GEM
       faraday (~> 1.0)
     fcm (1.0.1)
       faraday (~> 1.0.0)
-    ffi (1.12.2)
+    ffi (1.13.1)
     flag_shih_tzu (0.3.23)
     foreman (0.87.1)
-    gli (2.19.0)
+    gli (2.19.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-api-client (0.39.4)
+    google-api-client (0.40.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
@@ -207,10 +208,10 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.1)
+    google-cloud-env (1.3.2)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.0)
-    google-cloud-storage (1.26.1)
+    google-cloud-errors (1.0.1)
+    google-cloud-storage (1.26.2)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
@@ -234,11 +235,11 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    httparty (0.18.0)
+    httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.8.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     inflecto (0.0.2)
@@ -274,7 +275,7 @@ GEM
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.5.0)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -304,8 +305,8 @@ GEM
     oauth (0.5.4)
     orm_adapter (0.5.0)
     os (1.1.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
+    parallel (1.19.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
     pg (1.2.3)
     pry (0.13.1)
@@ -318,8 +319,8 @@ GEM
       nio4r (~> 2.0)
     pundit (2.1.0)
       activesupport (>= 3.0.0)
-    rack (2.2.2)
-    rack-cache (1.11.1)
+    rack (2.2.3)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -329,29 +330,29 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.3.1)
-      actioncable (= 6.0.3.1)
-      actionmailbox (= 6.0.3.1)
-      actionmailer (= 6.0.3.1)
-      actionpack (= 6.0.3.1)
-      actiontext (= 6.0.3.1)
-      actionview (= 6.0.3.1)
-      activejob (= 6.0.3.1)
-      activemodel (= 6.0.3.1)
-      activerecord (= 6.0.3.1)
-      activestorage (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.1)
+      railties (= 6.0.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.3.1)
-      actionpack (= 6.0.3.1)
-      activesupport (= 6.0.3.1)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -360,7 +361,7 @@ GEM
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    redis (4.1.4)
+    redis (4.2.1)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     redis-rack-cache (2.2.1)
@@ -368,11 +369,12 @@ GEM
       redis-store (>= 1.6, < 2)
     redis-store (1.8.2)
       redis (>= 4, < 5)
+    regexp_parser (1.7.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    responders (3.0.0)
+    responders (3.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
     rest-client (2.1.0)
@@ -399,20 +401,24 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.83.0)
+    rubocop (0.85.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
       rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-performance (1.5.2)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-rails (2.6.0)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.39.0)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.40.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
@@ -421,7 +427,7 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sassc (2.3.0)
+    sassc (2.4.0)
       ffi (~> 1.9)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
@@ -468,7 +474,7 @@ GEM
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (4.0.0)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -480,7 +486,7 @@ GEM
       inflecto
       virtus
     telephone_number (1.4.7)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     time_diff (0.3.0)
@@ -514,7 +520,7 @@ GEM
       equalizer (~> 0.0, >= 0.0.9)
     warden (1.2.8)
       rack (>= 2.0.6)
-    web-console (4.0.2)
+    web-console (4.0.3)
       actionview (>= 6.0.0)
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
@@ -531,7 +537,7 @@ GEM
     webpush (1.0.0)
       hkdf (~> 0.2)
       jwt (~> 2.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wisper (2.0.0)
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index d0bab2074..f5322ac92 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -3,7 +3,7 @@
   border-bottom: 0;
   margin: $space-normal;
   margin-top: 0;
-  max-height: $space-jumbo * 2;
+  max-height: $space-mega * 3;
   transition: height 2s $ease-in-out-cubic;
 
   .reply-box__top {
@@ -68,13 +68,14 @@
       padding: 0 $space-small;
     }
 
-    >textarea {
+    > textarea {
       @include ghost-input();
       @include margin(0);
       background: transparent;
       // Override min-height : 50px in foundation
       //
-      min-height: 1rem;
+      max-height: $space-mega * 2.4;
+      min-height: 4rem;
       resize: none;
     }
   }
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index df2e03398..c74854ff3 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -13,13 +13,12 @@
         v-on-clickaway="hideEmojiPicker"
         :on-click="emojiOnClick"
       />
-      <textarea
+      <resizable-text-area
         ref="messageInput"
         v-model="message"
-        rows="1"
         class="input"
-        type="text"
         :placeholder="$t(messagePlaceHolder())"
+        :min-height="4"
         @focus="onFocus"
         @blur="onBlur"
       />
@@ -93,12 +92,14 @@ import FileUpload from 'vue-upload-component';
 
 import EmojiInput from '../emoji/EmojiInput';
 import CannedResponse from './CannedResponse';
+import ResizableTextArea from 'shared/components/ResizableTextArea';
 
 export default {
   components: {
     EmojiInput,
     CannedResponse,
     FileUpload,
+    ResizableTextArea,
   },
   mixins: [clickaway],
   data() {
diff --git a/app/javascript/shared/components/ResizableTextArea.vue b/app/javascript/shared/components/ResizableTextArea.vue
new file mode 100644
index 000000000..d5ba3aa8d
--- /dev/null
+++ b/app/javascript/shared/components/ResizableTextArea.vue
@@ -0,0 +1,56 @@
+<template>
+  <textarea
+    ref="textarea"
+    :placeholder="placeholder"
+    :value="value"
+    @input="onInput"
+    @focus="onFocus"
+    @blur="onBlur"
+  />
+</template>
+
+<script>
+export default {
+  props: {
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    value: {
+      type: String,
+      default: '',
+    },
+    minHeight: {
+      type: Number,
+      default: 3.2,
+    },
+  },
+  watch: {
+    value() {
+      this.resizeTextarea();
+    },
+  },
+  methods: {
+    resizeTextarea() {
+      if (!this.value) {
+        this.$el.style.height = `${this.minHeight}rem`;
+      } else {
+        this.$el.style.height = `${this.$el.scrollHeight}px`;
+      }
+    },
+    onInput(event) {
+      this.$emit('input', event.target.value);
+      this.resizeTextarea();
+    },
+    onBlur() {
+      this.$emit('blur');
+    },
+    onFocus() {
+      this.$emit('focus');
+    },
+    focus() {
+      this.$refs.textarea.focus();
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/components/ChatInputArea.vue b/app/javascript/widget/components/ChatInputArea.vue
deleted file mode 100755
index 036f8b2fe..000000000
--- a/app/javascript/widget/components/ChatInputArea.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-  <resizable-textarea>
-    <textarea
-      class="form-input user-message-input"
-      :placeholder="placeholder"
-      :value="value"
-      @input="$emit('input', $event.target.value)"
-      @focus="onFocus"
-      @blur="onBlur"
-    />
-  </resizable-textarea>
-</template>
-
-<script>
-import ResizableTextarea from 'widget/components/ResizableTextarea.vue';
-
-export default {
-  components: {
-    ResizableTextarea,
-  },
-  props: {
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    value: {
-      type: String,
-      default: '',
-    },
-  },
-  methods: {
-    onBlur() {
-      this.toggleTyping('off');
-    },
-    onFocus() {
-      this.toggleTyping('on');
-    },
-    toggleTyping(typingStatus) {
-      this.$store.dispatch('conversation/toggleUserTyping', { typingStatus });
-    },
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-@import '~widget/assets/scss/variables.scss';
-
-.user-message-input {
-  border: 0;
-  height: $space-large;
-  min-height: $space-large;
-  resize: none;
-  padding-top: $space-small;
-}
-</style>
diff --git a/app/javascript/widget/components/ChatInputWrap.vue b/app/javascript/widget/components/ChatInputWrap.vue
index 307fc242f..f2bd945ae 100755
--- a/app/javascript/widget/components/ChatInputWrap.vue
+++ b/app/javascript/widget/components/ChatInputWrap.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="chat-message--input">
-    <chat-input-area
+    <resizable-text-area
       v-model="userInput"
       :placeholder="$t('CHAT_PLACEHOLDER')"
+      class="form-input user-message-input"
+      @focus="onFocus"
+      @blur="onBlur"
     />
     <div class="button-wrap">
       <chat-attachment-button
@@ -34,7 +37,7 @@ import emojione from 'emojione';
 import { mixin as clickaway } from 'vue-clickaway';
 import ChatSendButton from 'widget/components/ChatSendButton.vue';
 import ChatAttachmentButton from 'widget/components/ChatAttachment.vue';
-import ChatInputArea from 'widget/components/ChatInputArea.vue';
+import ResizableTextArea from 'shared/components/ResizableTextArea';
 import EmojiInput from 'dashboard/components/widgets/emoji/EmojiInput';
 
 export default {
@@ -42,8 +45,8 @@ export default {
   components: {
     ChatAttachmentButton,
     ChatSendButton,
-    ChatInputArea,
     EmojiInput,
+    ResizableTextArea,
   },
   mixins: [clickaway],
   props: {
@@ -109,6 +112,16 @@ export default {
         `${this.userInput}${emoji.shortname} `
       );
     },
+
+    onBlur() {
+      this.toggleTyping('off');
+    },
+    onFocus() {
+      this.toggleTyping('on');
+    },
+    toggleTyping(typingStatus) {
+      this.$store.dispatch('conversation/toggleUserTyping', { typingStatus });
+    },
   },
 };
 </script>
@@ -140,4 +153,13 @@ export default {
   display: flex;
   align-items: center;
 }
+
+.user-message-input {
+  border: 0;
+  height: $space-large;
+  min-height: $space-large;
+  max-height: 2.4 * $space-mega;
+  resize: none;
+  padding-top: $space-small;
+}
 </style>
diff --git a/app/javascript/widget/components/ResizableTextarea.vue b/app/javascript/widget/components/ResizableTextarea.vue
deleted file mode 100644
index 0b04e2c06..000000000
--- a/app/javascript/widget/components/ResizableTextarea.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script>
-export default {
-  mounted() {
-    this.$nextTick(() => {
-      this.$el.setAttribute(
-        'style',
-        `height: ${this.$el.scrollHeight}px;overflow-y:hidden;`
-      );
-    });
-
-    this.$el.addEventListener('input', this.resizeTextarea);
-  },
-  beforeDestroy() {
-    this.$el.removeEventListener('input', this.resizeTextarea);
-  },
-  methods: {
-    resizeTextarea(event) {
-      event.target.style.height = '3.2rem';
-      event.target.style.height = `${event.target.scrollHeight}px`;
-    },
-  },
-  render() {
-    return this.$slots.default[0];
-  },
-};
-</script>
diff --git a/app/javascript/widget/components/UserMessageBubble.vue b/app/javascript/widget/components/UserMessageBubble.vue
index 2a3e84836..4811ee979 100755
--- a/app/javascript/widget/components/UserMessageBubble.vue
+++ b/app/javascript/widget/components/UserMessageBubble.vue
@@ -43,6 +43,7 @@ export default {
   line-height: 1.5;
   padding: $space-slab $space-normal $space-slab $space-normal;
   text-align: left;
+  word-break: break-word;
 
   > a {
     color: $color-primary;
diff --git a/app/presenters/mail_presenter.rb b/app/presenters/mail_presenter.rb
index 31aa294c5..cd3d75fc4 100644
--- a/app/presenters/mail_presenter.rb
+++ b/app/presenters/mail_presenter.rb
@@ -80,7 +80,7 @@ class MailPresenter < SimpleDelegator
 
     {
       reply: content[0..(index - 1)].strip,
-      quoted_text: content[index..-1].strip
+      quoted_text: content[index..].strip
     }
   end
 
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 4b828e80c..351f7b42b 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -12,3 +12,4 @@ Rails.application.config.assets.paths << Rails.root.join('node_modules')
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
 # Rails.application.config.assets.precompile += %w( admin.js admin.css )
+Rails.application.config.assets.precompile += %w[dashboardChart.js]

From 1ef8d03e186c4df2e9ffb717634abfbc790fd110 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 22 Jun 2020 13:19:26 +0530
Subject: [PATCH 28/50] Feature: Slack - receive messages, create threads, send
 replies (#974)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .circleci/config.yml                          |  28 +++--
 .env.example                                  |  10 +-
 .../accounts/integrations/apps_controller.rb  |   2 +-
 .../accounts/integrations/slack_controller.rb |  20 +--
 app/javascript/dashboard/api/ApiClient.js     |   7 +-
 app/javascript/dashboard/api/integrations.js  |  21 ++++
 .../scss/views/settings/integrations.scss     |   7 +-
 .../dashboard/components/layout/Sidebar.vue   |   1 -
 .../components/widgets/BackButton.vue         |  18 ++-
 .../dashboard/i18n/default-sidebar.js         |   1 +
 .../i18n/locale/en/generalSettings.json       |   1 +
 .../i18n/locale/en/integrations.json          |  11 +-
 .../dashboard/settings/SettingsHeader.vue     |   6 +-
 .../routes/dashboard/settings/Wrapper.vue     |   5 +
 .../dashboard/settings/integrations/Index.vue |  60 +++------
 .../settings/integrations/Integration.vue     | 114 ++++++++++++++++++
 .../settings/integrations/ShowIntegration.vue |  70 +++++++++++
 .../settings/integrations/Webhook.vue         |   7 +-
 .../integrations/integrations.routes.js       |  18 +++
 app/javascript/dashboard/store/index.js       |   2 +
 .../dashboard/store/modules/auth.js           |  16 ---
 .../dashboard/store/modules/integrations.js   |  83 +++++++++++++
 .../specs/integrations/actions.spec.js        |  72 +++++++++++
 .../modules/specs/integrations/fixtures.js    |  16 +++
 .../specs/integrations/getters.spec.js        |  51 ++++++++
 .../specs/integrations/mutations.spec.js      |  26 ++++
 .../dashboard/store/mutation-types.js         |   6 +
 .../shared/helpers/vuex/mutationHelpers.js    |   9 ++
 app/models/integrations/app.rb                |  33 ++++-
 app/models/integrations/hook.rb               |   2 +-
 .../integrations/apps/index.json.jbuilder     |  15 ++-
 .../integrations/apps/show.json.jbuilder      |   2 +-
 .../integrations/slack/create.json.jbuilder   |   2 +
 config/environments/test.rb                   |   1 +
 config/integration/apps.yml                   |  15 ++-
 config/routes.rb                              |   2 +-
 db/seeds.rb                                   |   1 +
 .../project-setup/slack-integration-setup.md  |  39 ++++++
 lib/integrations/slack/channel_builder.rb     |   9 +-
 lib/integrations/slack/hook_builder.rb        |  11 +-
 .../slack/incoming_message_builder.rb         |  29 ++++-
 .../slack/outgoing_message_builder.rb         |  28 ++++-
 public/admin/avatar_square.png                | Bin 0 -> 4514 bytes
 .../assets/dashboard}/integrations/cable.svg  |   0
 .../assets/dashboard/integrations/slack.png   | Bin 0 -> 1320 bytes
 .../integrations/apps_controller_spec.rb      |  12 +-
 spec/factories/integrations/hooks.rb          |   2 +-
 .../integrations/slack/hook_builder_spec.rb   |   2 +-
 .../slack/incoming_message_builder_spec.rb    |   4 +-
 .../slack/outgoing_message_builder_spec.rb    |  11 +-
 .../integrations/slack_request_spec.rb        |  27 +++--
 .../v1/integrations/webhooks_request_spec.rb  |   2 +-
 spec/support/slack_stubs.rb                   |  66 +++++-----
 53 files changed, 815 insertions(+), 188 deletions(-)
 create mode 100644 app/javascript/dashboard/api/integrations.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
 create mode 100644 app/javascript/dashboard/store/modules/integrations.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/integrations/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
 create mode 100644 app/views/api/v1/accounts/integrations/slack/create.json.jbuilder
 create mode 100644 docs/development/project-setup/slack-integration-setup.md
 create mode 100644 public/admin/avatar_square.png
 rename {app/javascript/dashboard/assets/images => public/assets/dashboard}/integrations/cable.svg (100%)
 create mode 100644 public/assets/dashboard/integrations/slack.png

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9579c23a8..07f4a7991 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ defaults: &defaults
     - image: circleci/redis:alpine
   environment:
       - CC_TEST_REPORTER_ID: b1b5c4447bf93f6f0b06a64756e35afd0810ea83649f03971cbf303b4449456f
-
+      - RAILS_LOG_TO_STDOUT: false
 jobs:
   build:
     <<: *defaults
@@ -69,11 +69,11 @@ jobs:
       - run:
           name:  Download cc-test-reporter
           command: |
-            mkdir -p tmp/
-            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./tmp/cc-test-reporter
-            chmod +x ./tmp/cc-test-reporter
+            mkdir -p ~/tmp
+            curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ~/tmp/cc-test-reporter
+            chmod +x ~/tmp/cc-test-reporter
       - persist_to_workspace:
-          root: tmp
+          root: ~/tmp
           paths:
             - cc-test-reporter
 
@@ -99,9 +99,9 @@ jobs:
           name: Run backend tests
           command: |
             bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-            ./tmp/cc-test-reporter format-coverage -t simplecov -o tmp/codeclimate.backend.json coverage/backend/.resultset.json
+            ~/tmp/cc-test-reporter format-coverage -t simplecov -o ~/tmp/codeclimate.backend.json coverage/backend/.resultset.json
       - persist_to_workspace:
-          root: tmp
+          root: ~/tmp
           paths:
             - codeclimate.backend.json
 
@@ -109,21 +109,23 @@ jobs:
           name: Run frontend tests
           command: |
             yarn test:coverage
-            ./tmp/cc-test-reporter format-coverage -t lcov -o tmp/codeclimate.frontend.json buildreports/lcov.info
+            ~/tmp/cc-test-reporter format-coverage -t lcov -o ~/tmp/codeclimate.frontend.json buildreports/lcov.info
       - persist_to_workspace:
-          root: tmp
+          root: ~/tmp
           paths:
             - codeclimate.frontend.json
 
       # collect reports
       - store_test_results:
-          path: /tmp/test-results
+          path: ~/tmp/test-results
       - store_artifacts:
-          path: /tmp/test-results
+          path: ~/tmp/test-results
           destination: test-results
+      - store_artifacts:
+          path: log
 
       - run:
           name: Upload coverage results to Code Climate
           command: |
-            ./tmp/cc-test-reporter sum-coverage tmp/codeclimate.*.json -p 2 -o tmp/codeclimate.total.json
-            ./tmp/cc-test-reporter upload-coverage -i tmp/codeclimate.total.json
+            ~/tmp/cc-test-reporter sum-coverage ~/tmp/codeclimate.*.json -p 2 -o ~/tmp/codeclimate.total.json
+            ~/tmp/cc-test-reporter upload-coverage -i ~/tmp/codeclimate.total.json
diff --git a/.env.example b/.env.example
index 06a39d17f..5adb4a848 100644
--- a/.env.example
+++ b/.env.example
@@ -59,6 +59,7 @@ MANDRILL_INGRESS_API_KEY=
 ACTIVE_STORAGE_SERVICE=local
 
 # Amazon S3
+# documentation: https://www.chatwoot.com/docs/configuring-s3-bucket-as-cloud-storage
 S3_BUCKET_NAME=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=
@@ -74,20 +75,23 @@ LOG_LEVEL=info
 LOG_SIZE=500
 
 ### This environment variables are only required if you are setting up social media channels
-#facebook
+
+# Facebook
+# documentation: https://www.chatwoot.com/docs/facebook-setup
 FB_VERIFY_TOKEN=
 FB_APP_SECRET=
 FB_APP_ID=
 
 # Twitter
+# documentation: https://www.chatwoot.com/docs/twitter-app-setup
 TWITTER_APP_ID=
 TWITTER_CONSUMER_KEY=
 TWITTER_CONSUMER_SECRET=
 TWITTER_ENVIRONMENT=
 
-#slack
+#slack integration
 SLACK_CLIENT_ID=
-SLACK_CLIENT_SECRET
+SLACK_CLIENT_SECRET=
 
 ### Change this env variable only if you are using a custom build mobile app
 ## Mobile app env variables
diff --git a/app/controllers/api/v1/accounts/integrations/apps_controller.rb b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
index 35b6f7c4d..f88cc7c5f 100644
--- a/app/controllers/api/v1/accounts/integrations/apps_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/apps_controller.rb
@@ -9,7 +9,7 @@ class Api::V1::Accounts::Integrations::AppsController < Api::V1::Accounts::BaseC
   private
 
   def fetch_apps
-    @apps = Integrations::App.all
+    @apps = Integrations::App.all.select(&:active?)
   end
 
   def fetch_app
diff --git a/app/controllers/api/v1/accounts/integrations/slack_controller.rb b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
index 023deaa97..77cf05ade 100644
--- a/app/controllers/api/v1/accounts/integrations/slack_controller.rb
+++ b/app/controllers/api/v1/accounts/integrations/slack_controller.rb
@@ -7,18 +7,12 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
       code: params[:code],
       inbox_id: params[:inbox_id]
     )
-
     @hook = builder.perform
-
-    render json: @hook
+    create_chatwoot_slack_channel
   end
 
   def update
-    builder = Integrations::Slack::ChannelBuilder.new(
-      hook: @hook, channel: params[:channel]
-    )
-    builder.perform
-
+    create_chatwoot_slack_channel
     render json: @hook
   end
 
@@ -31,6 +25,14 @@ class Api::V1::Accounts::Integrations::SlackController < Api::V1::Accounts::Base
   private
 
   def fetch_hook
-    @hook = Integrations::Hook.find(params[:id])
+    @hook = Integrations::Hook.find_by(app_id: 'slack')
+  end
+
+  def create_chatwoot_slack_channel
+    channel = params[:channel] || 'customer-conversations'
+    builder = Integrations::Slack::ChannelBuilder.new(
+      hook: @hook, channel: channel
+    )
+    builder.perform
   end
 end
diff --git a/app/javascript/dashboard/api/ApiClient.js b/app/javascript/dashboard/api/ApiClient.js
index 9199109a1..097caa906 100644
--- a/app/javascript/dashboard/api/ApiClient.js
+++ b/app/javascript/dashboard/api/ApiClient.js
@@ -10,6 +10,10 @@ class ApiClient {
   }
 
   get url() {
+    return `${this.baseUrl()}/${this.resource}`;
+  }
+
+  baseUrl() {
     let url = this.apiVersion;
     if (this.options.accountScoped) {
       const isInsideAccountScopedURLs = window.location.pathname.includes(
@@ -21,7 +25,8 @@ class ApiClient {
         url = `${url}/accounts/${accountId}`;
       }
     }
-    return `${url}/${this.resource}`;
+
+    return url;
   }
 
   get() {
diff --git a/app/javascript/dashboard/api/integrations.js b/app/javascript/dashboard/api/integrations.js
new file mode 100644
index 000000000..587c94d43
--- /dev/null
+++ b/app/javascript/dashboard/api/integrations.js
@@ -0,0 +1,21 @@
+/* global axios */
+
+import ApiClient from './ApiClient';
+
+class IntegrationsAPI extends ApiClient {
+  constructor() {
+    super('integrations/apps', { accountScoped: true });
+  }
+
+  connectSlack(code) {
+    return axios.post(`${this.baseUrl()}/integrations/slack`, {
+      code: code,
+    });
+  }
+
+  delete(integrationId) {
+    return axios.delete(`${this.baseUrl()}/integrations/${integrationId}`);
+  }
+}
+
+export default new IntegrationsAPI();
diff --git a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
index e791f4cd7..b43bbb4bc 100644
--- a/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
+++ b/app/javascript/dashboard/assets/scss/views/settings/integrations.scss
@@ -3,16 +3,17 @@
     background: $color-white;
     border: 1px solid $color-border;
     border-radius: $space-smaller;
+    margin-bottom: $space-normal;
     padding: $space-normal;
 
     .integration--image {
       display: flex;
       margin-right: $space-normal;
-      width: 8rem;
+      width: 10rem;
 
       img {
-        max-width: 8rem;
-        padding: $space-small;
+        max-width: 100%;
+        padding: $space-medium;
       }
     }
 
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index b2ccf1697..88578e635 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -121,7 +121,6 @@ export default {
   computed: {
     ...mapGetters({
       currentUser: 'getCurrentUser',
-      daysLeft: 'getTrialLeft',
       globalConfig: 'globalConfig/get',
       inboxes: 'inboxes/getInboxes',
       accountId: 'getCurrentAccountId',
diff --git a/app/javascript/dashboard/components/widgets/BackButton.vue b/app/javascript/dashboard/components/widgets/BackButton.vue
index 9b5085983..9bf87d131 100644
--- a/app/javascript/dashboard/components/widgets/BackButton.vue
+++ b/app/javascript/dashboard/components/widgets/BackButton.vue
@@ -1,14 +1,26 @@
 <template>
-  <span class="back-button ion-ios-arrow-left" @click.capture="goBack">Back</span>
+  <span class="back-button ion-ios-arrow-left" @click.capture="goBack">
+    {{ $t('GENERAL_SETTINGS.BACK') }}
+  </span>
 </template>
 <script>
 import router from '../../routes/index';
 
 export default {
+  props: {
+    backUrl: {
+      type: [String, Object],
+      default: '',
+    },
+  },
   methods: {
     goBack() {
-      router.go(-1);
+      if (this.backUrl !== '') {
+        router.push(this.backUrl);
+      } else {
+        router.go(-1);
+      }
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index 5ada97da4..4b479f5f6 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -52,6 +52,7 @@ export const getSidebarItems = accountId => ({
       'settings_inbox_finish',
       'settings_integrations',
       'settings_integrations_webhook',
+      'settings_integrations_integration',
       'general_settings',
       'general_settings_index',
     ],
diff --git a/app/javascript/dashboard/i18n/locale/en/generalSettings.json b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
index 702680b92..31b5f9fe2 100644
--- a/app/javascript/dashboard/i18n/locale/en/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/en/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Account settings",
     "SUBMIT": "Update settings",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Could not update settings, try again!",
       "SUCCESS": "Successfully updated account settings"
diff --git a/app/javascript/dashboard/i18n/locale/en/integrations.json b/app/javascript/dashboard/i18n/locale/en/integrations.json
index 7259c038e..21df315bc 100644
--- a/app/javascript/dashboard/i18n/locale/en/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/en/integrations.json
@@ -49,6 +49,15 @@
           "NO": "No, Keep it"
         }
       }
-    }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }  
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
index 442d14360..37374f03b 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/SettingsHeader.vue
@@ -2,7 +2,7 @@
   <div class="settings-header">
     <h1 class="page-title">
       <woot-sidemenu-icon></woot-sidemenu-icon>
-      <back-button v-if="showBackButton"></back-button>
+      <back-button v-if="showBackButton" :back-url="backUrl"></back-button>
       <i :class="iconClass"></i>
       <span>{{ headerTitle }}</span>
     </h1>
@@ -45,6 +45,10 @@ export default {
     },
     showBackButton: { type: Boolean, default: false },
     showNewButton: { type: Boolean, default: false },
+    backUrl: {
+      type: [String, Object],
+      default: '',
+    },
   },
   computed: {
     ...mapGetters({
diff --git a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
index 04138cea1..c0aa1eae9 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/Wrapper.vue
@@ -6,6 +6,7 @@
       :header-title="$t(headerTitle)"
       :button-text="$t(headerButtonText)"
       :show-back-button="showBackButton"
+      :back-url="backUrl"
       :show-new-button="showNewButton"
     />
     <keep-alive>
@@ -34,6 +35,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    backUrl: {
+      type: [String, Object],
+      default: '',
+    },
   },
   data() {
     return {};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
index 5652677cd..6d8ca1895 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Index.vue
@@ -3,38 +3,19 @@
     <div class="row">
       <div class="small-8 columns integrations-wrap">
         <div class="row integrations">
-          <div class="small-12 columns integration">
-            <div class="row">
-              <div class="integration--image">
-                <img src="~dashboard/assets/images/integrations/cable.svg" />
-              </div>
-              <div class="column">
-                <h3 class="integration--title">
-                  {{ $t('INTEGRATION_SETTINGS.WEBHOOK.TITLE') }}
-                </h3>
-                <p class="integration--description">
-                  {{
-                    useInstallationName(
-                      $t('INTEGRATION_SETTINGS.WEBHOOK.INTEGRATION_TXT'),
-                      globalConfig.installationName
-                    )
-                  }}
-                </p>
-              </div>
-              <div class="small-2 column button-wrap">
-                <router-link
-                  :to="
-                    frontendURL(
-                      `accounts/${accountId}/settings/integrations/webhook`
-                    )
-                  "
-                >
-                  <button class="button success nice">
-                    {{ $t('INTEGRATION_SETTINGS.WEBHOOK.CONFIGURE') }}
-                  </button>
-                </router-link>
-              </div>
-            </div>
+          <div
+            v-for="item in integrationsList"
+            :key="item.id"
+            class="small-12 columns integration"
+          >
+            <integration
+              :integration-id="item.id"
+              :integration-logo="item.logo"
+              :integration-name="item.name"
+              :integration-description="item.description"
+              :integration-enabled="item.enabled"
+              :integration-action="item.action"
+            />
           </div>
         </div>
       </div>
@@ -43,20 +24,19 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { frontendURL } from '../../../../helper/URLHelper';
-import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import Integration from './Integration';
 
 export default {
-  mixins: [globalConfigMixin],
+  components: {
+    Integration,
+  },
   computed: {
     ...mapGetters({
-      currentUser: 'getCurrentUser',
-      globalConfig: 'globalConfig/get',
-      accountId: 'getCurrentAccountId',
+      integrationsList: 'integrations/getIntegrations',
     }),
   },
-  methods: {
-    frontendURL,
+  mounted() {
+    this.$store.dispatch('integrations/get');
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
new file mode 100644
index 000000000..cdab7ceee
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Integration.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="row">
+    <div class="integration--image">
+      <img :src="'/assets/dashboard/integrations/' + integrationLogo" />
+    </div>
+    <div class="column">
+      <h3 class="integration--title">
+        {{ integrationName }}
+      </h3>
+      <p class="integration--description">
+        {{ integrationDescription }}
+      </p>
+    </div>
+    <div class="small-2 column button-wrap">
+      <router-link
+        :to="
+          frontendURL(
+            `accounts/${accountId}/settings/integrations/` + integrationId
+          )
+        "
+      >
+        <div v-if="integrationEnabled">
+          <div v-if="integrationAction === 'disconnect'">
+            <div @click="openDeletePopup()">
+              <woot-submit-button
+                :button-text="
+                  $t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.BUTTON_TEXT')
+                "
+                icon-class="ion-close-circled"
+                button-class="nice alert"
+              />
+            </div>
+          </div>
+          <div v-else>
+            <button class="button nice">
+              {{ $t('INTEGRATION_SETTINGS.WEBHOOK.CONFIGURE') }}
+            </button>
+          </div>
+        </div>
+      </router-link>
+      <div v-if="!integrationEnabled">
+        <a :href="integrationAction" class="button success nice">
+          {{ $t('INTEGRATION_SETTINGS.CONNECT.BUTTON_TEXT') }}
+        </a>
+      </div>
+    </div>
+    <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')"
+      :confirm-text="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.YES')"
+      :reject-text="$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.CONFIRM.NO')"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import { frontendURL } from '../../../../helper/URLHelper';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  mixins: [alertMixin],
+  props: [
+    'integrationId',
+    'integrationLogo',
+    'integrationName',
+    'integrationDescription',
+    'integrationEnabled',
+    'integrationAction',
+  ],
+  data() {
+    return {
+      showDeleteConfirmationPopup: false,
+    };
+  },
+  computed: {
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  methods: {
+    frontendURL,
+    openDeletePopup() {
+      this.showDeleteConfirmationPopup = true;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+    confirmDeletion() {
+      this.closeDeletePopup();
+      this.deleteIntegration(this.deleteIntegration);
+      this.$router.push({ name: 'settings_integrations' });
+    },
+    async deleteIntegration() {
+      try {
+        await this.$store.dispatch(
+          'integrations/deleteIntegration',
+          this.integrationId
+        );
+        this.showAlert(
+          this.$t('INTEGRATION_SETTINGS.DELETE.API.SUCCESS_MESSAGE')
+        );
+      } catch (error) {
+        this.showAlert(
+          this.$t('INTEGRATION_SETTINGS.WEBHOOK.DELETE.API.ERROR_MESSAGE')
+        );
+      }
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
new file mode 100644
index 000000000..3185f17b0
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/ShowIntegration.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="column content-box">
+    <div class="row">
+      <div class="small-8 columns integrations-wrap">
+        <div class="row integrations">
+          <div v-if="integrationLoaded" class="small-12 columns integration">
+            <integration
+              :integration-id="integration.id"
+              :integration-logo="integration.logo"
+              :integration-name="integration.name"
+              :integration-description="integration.description"
+              :integration-enabled="integration.enabled"
+              :integration-action="integrationAction()"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+import globalConfigMixin from 'shared/mixins/globalConfigMixin';
+import Integration from './Integration';
+
+export default {
+  components: {
+    Integration,
+  },
+  mixins: [globalConfigMixin],
+  props: ['integrationId', 'code'],
+  data() {
+    return {
+      integrationLoaded: false,
+    };
+  },
+  computed: {
+    integration() {
+      return this.$store.getters['integrations/getIntegration'](
+        this.integrationId
+      );
+    },
+    ...mapGetters({
+      currentUser: 'getCurrentUser',
+      globalConfig: 'globalConfig/get',
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  mounted() {
+    this.intializeSlackIntegration();
+  },
+  methods: {
+    integrationAction() {
+      if (this.integration.enabled) {
+        return 'disconnect';
+      }
+      return this.integration.action;
+    },
+    async intializeSlackIntegration() {
+      await this.$store.dispatch('integrations/get', this.integrationId);
+      if (this.code) {
+        await this.$store.dispatch('integrations/connectSlack', this.code);
+        // we are clearing code from the path as subsequent request would throw error
+        this.$router.replace(this.$route.path);
+      }
+      this.integrationLoaded = true;
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
index 980f16b05..6f2ce7f40 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/integrations/Webhook.vue
@@ -82,16 +82,16 @@
   </div>
 </template>
 <script>
-/* global bus */
 import { mapGetters } from 'vuex';
 import NewWebhook from './New';
+import alertMixin from 'shared/mixins/alertMixin';
 import globalConfigMixin from 'shared/mixins/globalConfigMixin';
 
 export default {
   components: {
     NewWebhook,
   },
-  mixins: [globalConfigMixin],
+  mixins: [alertMixin, globalConfigMixin],
   data() {
     return {
       loading: {},
@@ -111,9 +111,6 @@ export default {
     this.$store.dispatch('webhooks/get');
   },
   methods: {
-    showAlert(message) {
-      bus.$emit('newToastMessage', message);
-    },
     openAddPopup() {
       this.showAddPopup = true;
     },
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 2a1485080..0439033be 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,7 @@
 import Index from './Index';
 import SettingsContent from '../Wrapper';
 import Webhook from './Webhook';
+import ShowIntegration from './ShowIntegration';
 import { frontendURL } from '../../../../helper/URLHelper';
 
 export default {
@@ -10,10 +11,15 @@ export default {
       component: SettingsContent,
       props: params => {
         const showBackButton = params.name !== 'settings_integrations';
+        const backUrl =
+          params.name === 'settings_integrations_integration'
+            ? { name: 'settings_integrations' }
+            : '';
         return {
           headerTitle: 'INTEGRATION_SETTINGS.HEADER',
           icon: 'ion-flash',
           showBackButton,
+          backUrl,
         };
       },
       children: [
@@ -29,6 +35,18 @@ export default {
           name: 'settings_integrations_webhook',
           roles: ['administrator'],
         },
+        {
+          path: ':integration_id',
+          name: 'settings_integrations_integration',
+          component: ShowIntegration,
+          roles: ['administrator'],
+          props: route => {
+            return {
+              integrationId: route.params.integration_id,
+              code: route.query.code,
+            };
+          },
+        },
       ],
     },
   ],
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index be0328178..de33bddb4 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -17,6 +17,7 @@ import conversationTypingStatus from './modules/conversationTypingStatus';
 import globalConfig from 'shared/store/globalConfig';
 import inboxes from './modules/inboxes';
 import inboxMembers from './modules/inboxMembers';
+import integrations from './modules/integrations';
 import reports from './modules/reports';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
@@ -40,6 +41,7 @@ export default new Vuex.Store({
     globalConfig,
     inboxes,
     inboxMembers,
+    integrations,
     reports,
     userNotificationSettings,
     webhooks,
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index b4ea0ecba..6486eb956 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -1,6 +1,5 @@
 /* eslint no-param-reassign: 0 */
 import axios from 'axios';
-import moment from 'moment';
 import Vue from 'vue';
 import * as types from '../mutation-types';
 import authAPI from '../../api/auth';
@@ -50,21 +49,6 @@ export const getters = {
   getCurrentUser(_state) {
     return _state.currentUser;
   },
-
-  getSubscription(_state) {
-    return _state.currentUser.subscription === undefined
-      ? null
-      : _state.currentUser.subscription;
-  },
-
-  getTrialLeft(_state) {
-    const createdAt =
-      _state.currentUser.subscription === undefined
-        ? moment()
-        : _state.currentUser.subscription.expiry * 1000;
-    const daysLeft = moment(createdAt).diff(moment(), 'days');
-    return daysLeft < 0 ? 0 : daysLeft;
-  },
 };
 
 // actions
diff --git a/app/javascript/dashboard/store/modules/integrations.js b/app/javascript/dashboard/store/modules/integrations.js
new file mode 100644
index 000000000..7c8d62ef8
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/integrations.js
@@ -0,0 +1,83 @@
+/* eslint no-param-reassign: 0 */
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import * as types from '../mutation-types';
+import IntegrationsAPI from '../../api/integrations';
+
+const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isFetchingItem: false,
+    isUpdating: false,
+  },
+};
+
+export const getters = {
+  getIntegrations($state) {
+    return $state.records;
+  },
+  getIntegration: $state => integrationId => {
+    const [integration] = $state.records.filter(
+      record => record.id === integrationId
+    );
+    return integration || {};
+  },
+  getUIFlags($state) {
+    return $state.uiFlags;
+  },
+};
+
+export const actions = {
+  get: async ({ commit }) => {
+    commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: true });
+    try {
+      const response = await IntegrationsAPI.get();
+      commit(types.default.SET_INTEGRATIONS, response.data.payload);
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false });
+    } catch (error) {
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  connectSlack: async ({ commit }, code) => {
+    commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await IntegrationsAPI.connectSlack(code);
+      commit(types.default.ADD_INTEGRATION, response.data);
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false });
+    } catch (error) {
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false });
+    }
+  },
+
+  deleteIntegration: async ({ commit }, integrationId) => {
+    commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true });
+    try {
+      await IntegrationsAPI.delete(integrationId);
+      commit(types.default.DELETE_INTEGRATION, {
+        id: integrationId,
+        enabled: false,
+      });
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false });
+    } catch (error) {
+      commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.default.SET_INTEGRATIONS_UI_FLAG]($state, uiFlag) {
+    $state.uiFlags = { ...$state.uiFlags, ...uiFlag };
+  },
+  [types.default.SET_INTEGRATIONS]: MutationHelpers.set,
+  [types.default.ADD_INTEGRATION]: MutationHelpers.updateAttributes,
+  [types.default.DELETE_INTEGRATION]: MutationHelpers.updateAttributes,
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
new file mode 100644
index 000000000..cc0dd9d22
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/integrations/actions.spec.js
@@ -0,0 +1,72 @@
+import axios from 'axios';
+import { actions } from '../../integrations';
+import * as types from '../../../mutation-types';
+import integrationsList from './fixtures';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: integrationsList });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
+        [types.default.SET_INTEGRATIONS, integrationsList.payload],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: true }],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#connectSlack:', () => {
+    it('sends correct actions if API is success', async () => {
+      let data = { id: 'slack', enabled: true };
+      axios.post.mockResolvedValue({ data: data });
+      await actions.connectSlack({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
+        [types.default.ADD_INTEGRATION, data],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.connectSlack({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: true }],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
+
+  describe('#deleteIntegration:', () => {
+    it('sends correct actions if API is success', async () => {
+      let data = { id: 'slack', enabled: false };
+      axios.delete.mockResolvedValue({ data: data });
+      await actions.deleteIntegration({ commit }, data.id);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_INTEGRATION, data],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.deleteIntegration({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_INTEGRATIONS_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/fixtures.js b/app/javascript/dashboard/store/modules/specs/integrations/fixtures.js
new file mode 100644
index 000000000..96bc0d50b
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/integrations/fixtures.js
@@ -0,0 +1,16 @@
+export default {
+  payload: [
+    {
+      id: 1,
+      name: 'test1',
+      logo: 'test',
+      enabled: true,
+    },
+    {
+      id: 2,
+      name: 'test2',
+      logo: 'test',
+      enabled: true,
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
new file mode 100644
index 000000000..7ec4657a6
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/integrations/getters.spec.js
@@ -0,0 +1,51 @@
+import { getters } from '../../integrations';
+
+describe('#getters', () => {
+  it('getIntegrations', () => {
+    const state = {
+      records: [
+        {
+          id: 1,
+          name: 'test1',
+          logo: 'test',
+          enabled: true,
+        },
+        {
+          id: 2,
+          name: 'test2',
+          logo: 'test',
+          enabled: true,
+        },
+      ],
+    };
+    expect(getters.getIntegrations(state)).toEqual([
+      {
+        id: 1,
+        name: 'test1',
+        logo: 'test',
+        enabled: true,
+      },
+      {
+        id: 2,
+        name: 'test2',
+        logo: 'test',
+        enabled: true,
+      },
+    ]);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isFetchingItem: false,
+        isUpdating: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isFetchingItem: false,
+      isUpdating: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
new file mode 100644
index 000000000..c485b5018
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/integrations/mutations.spec.js
@@ -0,0 +1,26 @@
+import * as types from '../../../mutation-types';
+import { mutations } from '../../integrations';
+
+describe('#mutations', () => {
+  describe('#GET_INTEGRATIONS', () => {
+    it('set integrations records', () => {
+      const state = { records: [] };
+      mutations[types.default.SET_INTEGRATIONS](state, [
+        {
+          id: 1,
+          name: 'test1',
+          logo: 'test',
+          enabled: true,
+        },
+      ]);
+      expect(state.records).toEqual([
+        {
+          id: 1,
+          name: 'test1',
+          logo: 'test',
+          enabled: true,
+        },
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 98731d2bc..c65c4f829 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -67,6 +67,12 @@ export default {
   EDIT_CANNED: 'EDIT_CANNED',
   DELETE_CANNED: 'DELETE_CANNED',
 
+  // Integrations
+  SET_INTEGRATIONS_UI_FLAG: 'SET_INTEGRATIONS_UI_FLAG',
+  SET_INTEGRATIONS: 'SET_INTEGRATIONS',
+  ADD_INTEGRATION: 'ADD_INTEGRATION',
+  DELETE_INTEGRATION: 'DELETE_INTEGRATION',
+
   // WebHook
   SET_WEBHOOK_UI_FLAG: 'SET_WEBHOOK_UI_FLAG',
   SET_WEBHOOK: 'SET_WEBHOOK',
diff --git a/app/javascript/shared/helpers/vuex/mutationHelpers.js b/app/javascript/shared/helpers/vuex/mutationHelpers.js
index a965c8f8a..577d02bef 100644
--- a/app/javascript/shared/helpers/vuex/mutationHelpers.js
+++ b/app/javascript/shared/helpers/vuex/mutationHelpers.js
@@ -25,6 +25,15 @@ export const update = (state, data) => {
   });
 };
 
+/* when you don't want to overwrite the whole object */
+export const updateAttributes = (state, data) => {
+  state.records.forEach((element, index) => {
+    if (element.id === data.id) {
+      Vue.set(state.records, index, { ...state.records[index], ...data });
+    }
+  });
+};
+
 export const destroy = (state, id) => {
   state.records = state.records.filter(record => record.id !== id);
 };
diff --git a/app/models/integrations/app.rb b/app/models/integrations/app.rb
index 324b34b98..645ff3d92 100644
--- a/app/models/integrations/app.rb
+++ b/app/models/integrations/app.rb
@@ -25,12 +25,39 @@ class Integrations::App
     params[:fields]
   end
 
-  def button
-    params[:button]
+  def action
+    case params[:id]
+    when 'slack'
+      "#{params[:action]}&client_id=#{ENV['SLACK_CLIENT_ID']}&redirect_uri=#{self.class.slack_integration_url}"
+    else
+      params[:action]
+    end
+  end
+
+  def active?
+    case params[:id]
+    when 'slack'
+      ENV['SLACK_CLIENT_SECRET'].present?
+    else
+      true
+    end
   end
 
   def enabled?(account)
-    account.hooks.where(app_id: id).exists?
+    case params[:id]
+    when 'slack'
+      account.hooks.where(app_id: id).exists?
+    else
+      true
+    end
+  end
+
+  def hooks
+    Current.account.hooks.where(app_id: id)
+  end
+
+  def self.slack_integration_url
+    "#{ENV['FRONTEND_URL']}/app/accounts/#{Current.account.id}/settings/integrations/slack"
   end
 
   class << self
diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb
index bd9768624..82796a2f5 100644
--- a/app/models/integrations/hook.rb
+++ b/app/models/integrations/hook.rb
@@ -31,6 +31,6 @@ class Integrations::Hook < ApplicationRecord
   end
 
   def slack?
-    app_id == 'cw_slack'
+    app_id == 'slack'
   end
 end
diff --git a/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder b/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
index dc314f008..dca7a4fdc 100644
--- a/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
+++ b/app/views/api/v1/accounts/integrations/apps/index.json.jbuilder
@@ -1,7 +1,10 @@
-json.array! @apps do |app|
-  json.id app.id
-  json.name app.name
-  json.logo app.logo
-  json.enabled app.enabled?(@current_account)
-  json.button app.button
+json.payload do
+  json.array! @apps do |app|
+    json.id app.id
+    json.name app.name
+    json.description app.description
+    json.logo app.logo
+    json.enabled app.enabled?(@current_account)
+    json.action app.action
+  end
 end
diff --git a/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder b/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
index 9970e9b0d..93d139e9a 100644
--- a/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
+++ b/app/views/api/v1/accounts/integrations/apps/show.json.jbuilder
@@ -4,4 +4,4 @@ json.logo @app.logo
 json.description @app.description
 json.fields @app.fields
 json.enabled @app.enabled?(@current_account)
-json.button @app.button
+json.button @app.action
diff --git a/app/views/api/v1/accounts/integrations/slack/create.json.jbuilder b/app/views/api/v1/accounts/integrations/slack/create.json.jbuilder
new file mode 100644
index 000000000..0e96489fd
--- /dev/null
+++ b/app/views/api/v1/accounts/integrations/slack/create.json.jbuilder
@@ -0,0 +1,2 @@
+json.id @hook.app_id
+json.enabled true
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 29018c894..1dbfa63ef 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -50,4 +50,5 @@ Rails.application.configure do
 
   # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
+  config.log_level = ENV.fetch('LOG_LEVEL', 'debug').to_sym
 end
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index b95d5e16b..30397e6bb 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -1,6 +1,13 @@
 slack:
-  id: cw_slack
+  id: slack
   name: Slack
-  logo: https://a.slack-edge.com/80588/marketing/img/media-kit/img-logos@2x.png
-  description: "'Be less busy' -  Slack is the chat tool that brings all your communication together in one place. By integrating Slack with SupportBee, you can get notified in your Slack channels for important events in your support desk"
-  button: <a href="https://slack.com/oauth/v2/authorize?scope=incoming-webhook,commands,chat:write&client_id=706921004289.1094198503990"><img alt=""Add to Slack"" height="40" width="139" src="https://platform.slack-edge.com/img/add_to_slack.png" srcset="https://platform.slack-edge.com/img/add_to_slack.png 1x, https://platform.slack-edge.com/img/add_to_slack@2x.png 2x" /></a>
\ No newline at end of file
+  logo: slack.png
+  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."
+  action: https://slack.com/oauth/v2/authorize?scope=commands,chat:write,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize 
+webhooks: 
+  id: webhook
+  name: Webhooks
+  logo: cable.svg
+  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.
+  action: /webhook
+   
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index c4b6aeb62..7c41848a4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -90,7 +90,7 @@ Rails.application.routes.draw do
           resources :webhooks, except: [:show]
           namespace :integrations do
             resources :apps, only: [:index, :show]
-            resources :slack, only: [:create, :update, :destroy]
+            resource :slack, only: [:create, :update, :destroy], controller: 'slack'
           end
         end
       end
diff --git a/db/seeds.rb b/db/seeds.rb
index 1a169c966..62eddc327 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,4 +1,5 @@
 # loading installation configs
+GlobalConfig.clear_cache
 ConfigLoader.new.process
 
 account = Account.create!(
diff --git a/docs/development/project-setup/slack-integration-setup.md b/docs/development/project-setup/slack-integration-setup.md
new file mode 100644
index 000000000..75e0ed0fa
--- /dev/null
+++ b/docs/development/project-setup/slack-integration-setup.md
@@ -0,0 +1,39 @@
+---
+path: "/docs/slack-integration-setup"
+title: "Setting Up Slack Intergration"
+---
+
+### Register A Facebook App
+
+To use Slack Integration, you have to create an Slack app in developer portal. You can find more details about creating Slack apps [here](https://api.slack.com/)
+
+Once you register your Slack App, you will have to obtain the `Client Id` and `Client Secret` . These values will be available in the app settings and will be required while setting up Chatwoot environment variables.
+
+### Configure the Slack App
+
+1) Create a slack app and add it to your development workspace. 
+2) Obtain the `Client Id` and `Client Secret` for the app and configure it in your Chatwoot environment variables.
+3) Head over to the `oauth & permissions` section under `features` tab. 
+4) In the redirect urls, Add your Chatwoot installation base url. 
+5) In the scopes section configure the given scopes for bot token scopes.
+ `commands,chat:write,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize`
+6) Head over to the `events subscriptions` section under `features` tab.
+7) Enable events and configure the the given request url `{chatwoot installation url}/api/v1/integrations/webhooks`
+8) Subscribe to the following bot events `message.channels` , `message.groups`, `message.im`, `message.mpim`
+9) Connect slack integration on Chatwoot app and  get productive. 
+
+### Configuring the Environment Variables in Chatwoot
+
+Configure the following Chatwoot environment variables with the values you have obtained during the slack app setup.
+
+```bash
+SLACK_CLIENT_ID=
+SLACK_CLIENT_SECRET=
+```
+
+### Test your Setup
+
+1. Ensure that you are recieving the Chatwoot messages in `customer-conversations` channel
+2. Add a message to that thread and ensure its coming back on to Chatwoot
+3. Add `note:` or `private:` in front on the slack message see if its coming out as private notes
+4. If your slack member email matches their email on Chatwoot, the messages will be associated with their Chatwoot user account.
diff --git a/lib/integrations/slack/channel_builder.rb b/lib/integrations/slack/channel_builder.rb
index e5d7e6679..79e167598 100644
--- a/lib/integrations/slack/channel_builder.rb
+++ b/lib/integrations/slack/channel_builder.rb
@@ -6,7 +6,7 @@ class Integrations::Slack::ChannelBuilder
   end
 
   def perform
-    create_channel
+    find_or_create_channel
     update_reference_id
   end
 
@@ -23,11 +23,12 @@ class Integrations::Slack::ChannelBuilder
     Slack::Web::Client.new
   end
 
-  def create_channel
-    @channel = slack_client.conversations_create(name: params[:channel])
+  def find_or_create_channel
+    exisiting_channel = slack_client.conversations_list.channels.find { |channel| channel['name'] == params[:channel] }
+    @channel = exisiting_channel || slack_client.conversations_create(name: params[:channel])['channel']
   end
 
   def update_reference_id
-    @hook.reference_id = channel['channel']['id']
+    @hook.update(reference_id: channel['id'])
   end
 end
diff --git a/lib/integrations/slack/hook_builder.rb b/lib/integrations/slack/hook_builder.rb
index 8900b2a5a..93bff9656 100644
--- a/lib/integrations/slack/hook_builder.rb
+++ b/lib/integrations/slack/hook_builder.rb
@@ -13,7 +13,7 @@ class Integrations::Slack::HookBuilder
       status: 'enabled',
       inbox_id: params[:inbox_id],
       hook_type: hook_type,
-      app_id: 'cw_slack'
+      app_id: 'slack'
     )
 
     hook.save!
@@ -32,11 +32,12 @@ class Integrations::Slack::HookBuilder
 
   def fetch_access_token
     client = Slack::Web::Client.new
-
-    client.oauth_access(
+    slack_access = client.oauth_v2_access(
       client_id: ENV.fetch('SLACK_CLIENT_ID', 'TEST_CLIENT_ID'),
       client_secret: ENV.fetch('SLACK_CLIENT_SECRET', 'TEST_CLIENT_SECRET'),
-      code: params[:code]
-    )['bot']['bot_access_token']
+      code: params[:code],
+      redirect_uri: Integrations::App.slack_integration_url
+    )
+    slack_access['access_token']
   end
 end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index 3236739ba..3b46db3d8 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -34,7 +34,7 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def supported_message?
-    SUPPORTED_MESSAGE_TYPES.include?(message[:type])
+    SUPPORTED_MESSAGE_TYPES.include?(message[:type]) if message.present?
   end
 
   def hook_verification?
@@ -46,7 +46,7 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def message
-    params[:event][:blocks].first
+    params[:event][:blocks]&.first
   end
 
   def verify_hook
@@ -56,23 +56,42 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def integration_hook
-    @integration_hook ||= Integrations::Hook.where(reference_id: params[:event][:channel])
+    @integration_hook ||= Integrations::Hook.find_by(reference_id: params[:event][:channel])
   end
 
   def conversation
     @conversation ||= Conversation.where(identifier: params[:event][:thread_ts]).first
   end
 
+  def sender
+    user_email = slack_client.users_info(user: params[:event][:user])[:user][:profile][:email]
+    conversation.account.users.find_by(email: user_email)
+  end
+
+  def private_note?
+    params[:event][:text].strip.starts_with?('note:', 'private:')
+  end
+
   def create_message
     return unless conversation
 
     conversation.messages.create(
-      message_type: 0,
+      message_type: :outgoing,
       account_id: conversation.account_id,
       inbox_id: conversation.inbox_id,
-      content: message[:elements].first[:elements].first[:text]
+      content: params[:event][:text],
+      source_id: "slack_#{params[:event][:ts]}",
+      private: private_note?,
+      user: sender
     )
 
     { status: 'success' }
   end
+
+  def slack_client
+    Slack.configure do |config|
+      config.token = integration_hook.access_token
+    end
+    Slack::Web::Client.new
+  end
 end
diff --git a/lib/integrations/slack/outgoing_message_builder.rb b/lib/integrations/slack/outgoing_message_builder.rb
index 61754d816..d3bbfb952 100644
--- a/lib/integrations/slack/outgoing_message_builder.rb
+++ b/lib/integrations/slack/outgoing_message_builder.rb
@@ -11,6 +11,8 @@ class Integrations::Slack::OutgoingMessageBuilder
   end
 
   def perform
+    return if message.source_id.present?
+
     send_message
     update_reference_id
   end
@@ -25,12 +27,32 @@ class Integrations::Slack::OutgoingMessageBuilder
     @contact ||= conversation.contact
   end
 
+  def agent
+    @agent ||= message.user
+  end
+
+  def message_content
+    if conversation.identifier.present?
+      message.content
+    else
+      "*Inbox: #{message.inbox.name}* \n\n #{message.content}"
+    end
+  end
+
+  def avatar_url(sender)
+    sender.try(:avatar_url) || "#{ENV['FRONTEND_URL']}/admin/avatar_square.png"
+  end
+
   def send_message
+    sender = message.outgoing? ? agent : contact
+    sender_type = sender.class == Contact ? 'Contact' : 'Agent'
+
     @slack_message = slack_client.chat_postMessage(
       channel: hook.reference_id,
-      text: message.content,
-      username: contact.try(:name),
-      thread_ts: conversation.identifier
+      text: message_content,
+      username: "#{sender_type}: #{sender.try(:name)}",
+      thread_ts: conversation.identifier,
+      icon_url: avatar_url(sender)
     )
   end
 
diff --git a/public/admin/avatar_square.png b/public/admin/avatar_square.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9eb765c9cedd10a6e69932c952868493d10ef6d
GIT binary patch
literal 4514
zcmb_geRLC57N0^xfl{)9oQMU+vx>E_I_n49<D!`Z3qrTh@Oio(u(JzWdqgpO2oc+v
zlqk&+geo5!p)OgdrC^mD?6QbJrZHBwpms~uQm`fi1X3u?w1i|jc{ADjCWRJ`?&6;P
zBk8+$e)o6pd+*Nsz4Xmlxzo}H-#eHfh_vkKQ|1sve}q2+`-A68>(qMqlUz7y<|KkR
zP?n1Rqysx?<(z4giTz)XY6C+*YsS2(@HcyJbo!o1JRaZoU2N0C6_w!X_sX2yxy16>
z@4U5{Anv+9d&;DFub#QudiLe>3s*lgd-nIC_?LmMT_;Lk`oqVo?u(A9SvmZbUnDO{
z<2H2ZFD#Sx6g<0WbL87CX9HsSCyt0R@IK~TyjV6)cwtyPm?KqCLW6q>Ezj9O$L7rC
z_0xA`MaIf4j$k2k`EvB|^qGor#J+t#pY;Be)Yvd(6PH;mrE~k9RN8Z9E5@{aYrx9<
ztzt|CS1GeTmp4sblFJK@-A#J_?z+&*w|7{2t+{XSw($B%OU_xY=QJK6xj|g^SY+&<
zDW3}6|F++e%s(KF^-$myb8O5owD}HPcZ$1}?PsOv8~QV=>k0kIiMftHv2%gx-YX~h
z^TTb-we3v9*K-MO<}OZIJ|;=5zNC6b`fJ``9*w?CNCzqD%F-46YF+mg8wfP+WRxgj
z7Hs8zn4k)Iv)ziFdA1vQUHgkwp}Bv6-r;VxO7lmt*Yy0S6=r~}4tLs_<uX7XVUdvc
z7o#eU&mpbSw#qUZoj7%z<O<r(>-mqv@r(3tq;2n;0rVY!s(-J6OaM9qp!sdFR+3wF
zHQg$Ws02*2?xUIlfG&${q|vyuSrB09g1!H&CKR?a1+gzk?s_gK3wf_b{tC}t@=0FT
z5B0#d<ZKnm=}a62-la}Xntu=n%#Ve=uJ252*h@v)>`rAH=V>r1HYY3V;-7Dv;G~jJ
zdlMzKR54<a558(lyuZ+ARy7123#W3CHiHH^w1pO%^mME%h1TF08C^_bE?OR>!SW@H
zExKwzn>blV$A(%xp&%v=iJD6=fJ+Jlq0j>%(avn*U}C4idQu*(iYI}dKW&k`p<qT!
z*lU&wWFZUfCb>vJwEG$<cq$kaF`cvH5}~qbJfthdBd=N3@j{kj^NBE-G~UYqOdGY?
z89;a`KtT3AB<JZnXl^tq;PWQ95d<BMLC(i;mhBu6&7e^!0|;p*@3&m{V(ufo+y*3;
zbDq#;J9b%ke-`RV;HZX>0;yFIQ}GlRDk4-6>adfT^*P0cQ(9;QPr+Id_3Ck={hUWn
zBd|i3fmkDi0FNGLEDAslU@!nm($T0xOG|QO5)7rlWerFpn=gk(T_=DBQUG<=sh%N(
z<aY-u!3iVrWUHRf)3RZh=Ak$-c1+*b$8`=zP`0F;*7N=zeq68s#bNg@l4Hkg6ruJT
zPj8U*f&^T3FQ8BO9X|;m`sybu-7EU?+)SiivEQ#%19a+0QmZXiXTsQ{T{jc+3`)kc
z4zV{$LI&EUt&xt0V-wc6XF2ftL6t6TYXpZwn{Ix$-~g1Q<6&E2n_)2y%Yr3}=c(;9
zUR@bB0k>kpl|bb|(?rt~i|T8|+lu=`&sQ_zkysk^3+@ltCfE=&#I@m7#@*DxLG3em
zm=tb3Er*34LZdxQDG6;2525j46Y_8)jKs}}ANqi-$qZGtWkDlA&x0Q_l|!#d(9||3
z9vr)#4xK5d(a_{Tw!Jr#4+tR~$|%JCX}6?v2zDpVG+JE*6@-G(t80B>n3)M)Ni@_N
zfut6gJWfx8Y>5+53rrSXTB)rNTcZ_m15PzcZTC_#SSN)BBiik2{85*eY4@7=(~z=z
zb#3UNll7SB7}OsDa;|+i;=+p=v8loBue#-t`p*oB+(t_W^t95R$~k&tE*Vg`CQ-|c
zFur`i4NCQB;!&)np}wbJ1<DT>wHi>a72-B(Oc}77ayjcUqZT_8p4crI)aOaA(Hyyb
zP-aByufZaY?XJ-Co8?A3GgDO;zs_W1e8P#qnXLxBt_Q4PA#XD+i{tA_R+@joWJI6p
z<7?gitavb$yJo_J=sUnTSk8c8Ws9D-sY{LM%+~lMxBn7Z><J|;ds@2SbzP;2(mDg$
zNeqDFqTlHvkFRLJTN}O@QzT6g=K7mbJXd%DG_kMv-l=NeDeksw#?QWcG;EB<<v8Oy
zrbJ0~taNasJL99pY_Tbx_ufUCl2&DQM*m(_KR1bE3)qJ*t|6?mVjsA6>fFB+`-igq
zlZg1v`nm0o64nz>9XRybU<qC|7G?Tl1LDtob1gWMps#lgEFp{5B-b_^>j)1Nb?f5K
zbaZwlmpF^o^sCjopCbI1^2ZS3>y)05ESco?`Z0vNNh~i;De-5)U4YsW(h*!&9URr{
z;kb~&TqHFsm}-^k4XRi{slqfy@|L+pJIM-qT0S!ioabTi8Oep$(dfumh6Uk_&T>|8
zeqQDdn$Hz7QbuP5C6`Mr&3c=!3_Yfb<!mF!>~7G#sc^1D1BIZspnElxEEF<fZ-X0M
zPPzHKeFG=8I7r1$Q}KmPjWL|nSwp#$*~neBn}5@HXx`BHgP@f&tatOFy)&%CdGlVt
zS;8j;vMv<MZ1R1MrM5z1Cl){*pm`X$2Ls_OC_5MZYHOSM92P}jbl89qjw^^<kO|86
zXZd$<e%a{tKFgdA^}&RaCR+#b=J&r>#2nEs9+3kbcE-lP;fu}&sTwP30VG!sC+#rQ
zbUwQDZY1X9%Ywu29IYM0JRH`W8RU2PAr9YZAxPPNa|pm&RRu7bhP@a~gVQSjhv>7~
zv5i&gHkrZDgPlJSkI(MrN78>H49<A*MF$+-y=tc(d7^lPjt@BehhQo&TQBuoMN&e0
zF&q;n#8N9GMD{4^j}!%PjUh#hO~Yb^jYC%k-sIvy`TG<WX)V!&#2LGh$Ki`<(*j`w
zZMv~QzMNhi1b6h5wjywa80+<ULzN)T)L}UX?kTV^_20sFN|%m<yA&+Z0UA{xRpXnF
zomp`mn{`ICxq@EjYo)woomnn`<sM=k4EK{#Xn^oZF|V_nJD}$;1SwF*9uortLD#t~
zWf8sJ2{*lJEFwJMHz*Hra$p?{1u9YvSI5|V1kQ1sD*-*g)PV@N&Q&q(d7VudqFlHY
zDA#c#Xa&feobuuMyEqvNRDYl%LKTxAg|8bbvZfWJ1PY_O>+3-q7Li;P{~m&?Vok!L
z)D>M`Gb+G=?cPw>AdBf%tRh`GBq+dkR@%sa$)(fE`UdVET75n~kX9axiLq8w5W*m-
zl*&qN4pR0XXW)pJ*Cjlih8W}s3&)wDw~YUn-TL@)n-P5hDX>Lacj;+$GRdKva9KRx
z2ToewxfRfD=uQAg*3&?D+em9z7eCm24K(8-V{w2;pmf$##y1+Y0fzWo@vjqLr?pEk
z#4mU$wcgGkkda4Nf|y}MLkY+d??-Za81N}2wRWGW<U!DEVusrvB?v}r=pydPWj&!}
z7#9&Gl=O5`tpRbmcRf!_V)g3&%k=zf(}<`z{?%j{a%+-@6al9HUcjW)=8F@P$9xDP
zbp73`+LC;+XvnWA=~~0u@y0><YIFBOp;;X>z+CqF<2wh1)D(8vo&Qk%Z$Ab9<Impz
zMFll=`@ae33zTGVuATSNT1KP1cpTo`%$6iBa|66y6I`5BIS%fc-yD@^^7BUDW;Ib$
z;jWqUE&Sq{^9sD60FWy`VD0?YrvUy<AFIvrS)|SJ!7U%9&a~qnfn|SV7LnFLtXz4N
zMU~^=^DCuLML98t^+{H({1937L>cjdy@OvDPkHEF|Ej#T>`M6O36VWDcgp_Bf3*D@
DxyJlg

literal 0
HcmV?d00001

diff --git a/app/javascript/dashboard/assets/images/integrations/cable.svg b/public/assets/dashboard/integrations/cable.svg
similarity index 100%
rename from app/javascript/dashboard/assets/images/integrations/cable.svg
rename to public/assets/dashboard/integrations/cable.svg
diff --git a/public/assets/dashboard/integrations/slack.png b/public/assets/dashboard/integrations/slack.png
new file mode 100644
index 0000000000000000000000000000000000000000..41fc5e45c6a3e1e89ee498a22e199c5537f0aac6
GIT binary patch
literal 1320
zcmV+@1=sqCP)<h;3K|Lk000e1NJLTq004Xd004Xl0{{R3oWLZE00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px#W>8F2MF0Q*;2&8nw|(uhE$*=|Ew+8&9a%HKx9qYl
zHOBBY#qi)AS~0n^>Ucsn#qsR2F5w<pF1CH(9$7ZU@GiD};T>7*vM%hhE-toxHpTGZ
z9$GfV@aT3zGQGDhwte6pS~kV-?6NN6%%P<K0016zQchC<AXQi+zrP{GzG7Yy6O*K%
zq1`{+Kk|Hc*?jL_*o*x?CjbBhHc3Q5RA}Dqnc23gFbsyFfMuRR(6tcW|0R#QK?^jU
zC~z+PFD>>XY1$^iFvNum-!Cvc9%6(LHg-@E-}|@Pm^y#hINe)ihBTwG*At4@4>TPi
zN2~e%y`QOF%#O=$E{(?f{Ze!KirsaMw&m{EYC~eV*KBRJhj$9R_r4Eg9ZjJYc-&J}
zOyh{k?lLWbPG^5jcj)jA?-FgJ#>qo~ttI9>2<}sMIH^(t9AZyLO$Na`4Y3ZwJsv#V
zE#5wG2ZZDOE#DJvoC^2Og!^a0@tJVwY(EB0zts+cQ}6S`;6ThB1YhNFhr$=x>%nj$
zZ$AS*RxE^yL*aD&;6J!3Jj7gWgNK-&*J0ng_X29;LJf|`0={gPFBQhUxV%Ch9+F9J
zHp3V9UP`en9F<@V>-Vzq<lqRdpyk;lT>y^Y`W@dD;8Ue00>_L|uU8TlhSQ&L7)g?F
z&~f2F^Wg3HSP|Zbf^evke6=p_s&HQrUc&V|R%K6q=fN>!yx1F#z;UFs$)$3*li(p2
zzS-@(o(u~fZiVx@QHZrHttz}Q*wLJE;N^xxrkxJ=l5v8u;0>b!7QR`4*&Txe4^?ke
z!f?oR#DS09(RRa%gR9<f95XdXal66k!2FKEhL@jAL!R!>^H0QRwj(xMGI?Ep-&uWS
zY1nS*vU&Pmi03n{Ps{s>{B)ifui*}&R1LAmSG=ql$f_W7oGe3&q69glvaC6vg!}2I
z|5#>_rWaDx;(_4y98Yf*G=Y6h5|^hWx!S9LR+q<8!R*!2&+mCaLtE}3D%YC*GfE#1
zCOnvp<mSq1ar8?`M3|L7*zlC;m8aSDASc&mvk5@Tc8ffF80v{mXMg9v(MAc++w$zE
z?Tonzctst}zi@X@(e)i{4-Wjoag3$J9_ol;_%wS34CmVn|1&-3z*A^^JZ)@6_G{Ha
zuTOCB<!*oDS5^36gI@i>!SVEOJW+;Qi?eGDhdp!IA8zvC?glvQ_DT%C#d32id`rNA
z(LC;BF5FUO*NlCf3c`(A5uPwkuu2r3C@(p9c286D;Zd!6z=6}7!f>@!pDy%(b!Q2{
zl^k!;Gc@Ad7KAI%uSD*egGrJQTz0e97MQ-KWO6D7mrGxhW$JF;{-Qp=&GTYG_^W0R
z<GYlq;cdSetqU1Z_<I7Ir%0}fl7VY4;ePNRe087CWgiM(?(RCV&V$bi;1l4Bv-@E9
z?AAISK3HeM>*z%IJ2^cKKG<i%uV=#DGvULj@aRnV_K1tr+aelvx;k9LM!#^nQPz&p
z4mSzM{65-opMw#1;dLOjT<R&ac>uN`b)4-_zvhf^14FLXl+Dl@Cpoc?B6qL*oL;}r
zzp_wD)T?3aMPGj5S<-8L3G6H6FZ8~}w>wbpk-dHvJ{{w3S-?*VKb7Y?^LEnwDhMi*
eu`O)Lisc_YTc7LDS|8m20000<MNUMnLSTXm29KHm

literal 0
HcmV?d00001

diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index 78c72db7e..37b6dc254 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -20,9 +20,9 @@ RSpec.describe 'Integration Apps API', type: :request do
             as: :json
 
         expect(response).to have_http_status(:success)
-        app = JSON.parse(response.body).first
-        expect(app['id']).to eql('cw_slack')
-        expect(app['name']).to eql('Slack')
+        app = JSON.parse(response.body)['payload'].first
+        expect(app['id']).to eql('webhook')
+        expect(app['name']).to eql('Webhooks')
       end
     end
   end
@@ -30,7 +30,7 @@ RSpec.describe 'Integration Apps API', type: :request do
   describe 'GET /api/v1/integrations/apps/:id' do
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
-        get api_v1_account_integrations_app_url(account_id: account.id, id: 'cw_slack')
+        get api_v1_account_integrations_app_url(account_id: account.id, id: 'slack')
         expect(response).to have_http_status(:unauthorized)
       end
     end
@@ -39,13 +39,13 @@ RSpec.describe 'Integration Apps API', type: :request do
       let(:agent) { create(:user, account: account, role: :agent) }
 
       it 'returns details of the app' do
-        get api_v1_account_integrations_app_url(account_id: account.id, id: 'cw_slack'),
+        get api_v1_account_integrations_app_url(account_id: account.id, id: 'slack'),
             headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
         app = JSON.parse(response.body)
-        expect(app['id']).to eql('cw_slack')
+        expect(app['id']).to eql('slack')
         expect(app['name']).to eql('Slack')
       end
     end
diff --git a/spec/factories/integrations/hooks.rb b/spec/factories/integrations/hooks.rb
index 6d6ed4a1b..6af74af9c 100644
--- a/spec/factories/integrations/hooks.rb
+++ b/spec/factories/integrations/hooks.rb
@@ -3,7 +3,7 @@ FactoryBot.define do
     status { 1 }
     inbox_id { 1 }
     account_id { 1 }
-    app_id { 'cw_slack' }
+    app_id { 'slack' }
     settings { 'MyText' }
     hook_type { 1 }
     access_token { SecureRandom.hex }
diff --git a/spec/lib/integrations/slack/hook_builder_spec.rb b/spec/lib/integrations/slack/hook_builder_spec.rb
index 948b14fae..c3670b723 100644
--- a/spec/lib/integrations/slack/hook_builder_spec.rb
+++ b/spec/lib/integrations/slack/hook_builder_spec.rb
@@ -10,7 +10,7 @@ describe Integrations::Slack::HookBuilder do
       hooks_count = account.hooks.count
 
       builder = described_class.new(account: account, code: code)
-      builder.stub(:fetch_access_token) { token }
+      allow(builder).to receive(:fetch_access_token).and_return(token)
 
       builder.perform
       expect(account.hooks.count).to eql(hooks_count + 1)
diff --git a/spec/lib/integrations/slack/incoming_message_builder_spec.rb b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
index 7d38a9ac7..fbbffb687 100644
--- a/spec/lib/integrations/slack/incoming_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/incoming_message_builder_spec.rb
@@ -5,7 +5,7 @@ describe Integrations::Slack::IncomingMessageBuilder do
   let(:message_params) { slack_message_stub }
   let(:verification_params) { slack_url_verification_stub }
 
-  let(:hook) { create(:integrations_hook, account: account, reference_id: message_params[:event][:channel]) }
+  let!(:hook) { create(:integrations_hook, account: account, reference_id: message_params[:event][:channel]) }
   let!(:conversation) { create(:conversation, identifier: message_params[:event][:thread_ts]) }
 
   describe '#perform' do
@@ -19,8 +19,10 @@ describe Integrations::Slack::IncomingMessageBuilder do
 
     context 'when message creation' do
       it 'creates message' do
+        expect(hook).not_to eq nil
         messages_count = conversation.messages.count
         builder = described_class.new(message_params)
+        allow(builder).to receive(:sender).and_return(nil)
         builder.perform
         expect(conversation.messages.count).to eql(messages_count + 1)
       end
diff --git a/spec/lib/integrations/slack/outgoing_message_builder_spec.rb b/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
index d52ed33aa..47fd5ba41 100644
--- a/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
@@ -14,15 +14,16 @@ describe Integrations::Slack::OutgoingMessageBuilder do
       builder = described_class.new(hook, message)
       stub_request(:post, 'https://slack.com/api/chat.postMessage')
         .to_return(status: 200, body: '', headers: {})
+      slack_client = double
+      expect(builder).to receive(:slack_client).and_return(slack_client)
 
-      # rubocop:disable RSpec/AnyInstance
-      allow_any_instance_of(Slack::Web::Client).to receive(:chat_postMessage).with(
+      expect(slack_client).to receive(:chat_postMessage).with(
         channel: hook.reference_id,
         text: message.content,
-        username: contact.name,
-        thread_ts: conversation.identifier
+        username: "Contact: #{contact.name}",
+        thread_ts: conversation.identifier,
+        icon_url: anything
       )
-      # rubocop:enable RSpec/AnyInstance
 
       builder.perform
     end
diff --git a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
index 71f8c1d18..e68eabf73 100644
--- a/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
+++ b/spec/requests/api/v1/accounts/integrations/slack_request_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
   let(:account) { create(:account) }
   let(:agent) { create(:user, account: account, role: :agent) }
-  let(:hook) { create(:integrations_hook, account: account) }
+  let!(:hook) { create(:integrations_hook, account: account) }
 
   describe 'POST /api/v1/accounts/{account.id}/integrations/slack' do
     context 'when it is an unauthenticated user' do
@@ -16,24 +16,27 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
     context 'when it is an authenticated user' do
       it 'creates hook' do
         hook_builder = Integrations::Slack::HookBuilder.new(account: account, code: SecureRandom.hex)
-        hook_builder.stub(:fetch_access_token) { SecureRandom.hex }
-
+        expect(hook_builder).to receive(:fetch_access_token).and_return(SecureRandom.hex)
         expect(Integrations::Slack::HookBuilder).to receive(:new).and_return(hook_builder)
 
+        channel_builder = Integrations::Slack::ChannelBuilder.new(hook: hook, channel: 'channel')
+        expect(channel_builder).to receive(:perform)
+        expect(Integrations::Slack::ChannelBuilder).to receive(:new).and_return(channel_builder)
+
         post "/api/v1/accounts/#{account.id}/integrations/slack",
              params: { code: SecureRandom.hex },
              headers: agent.create_new_auth_token
 
         expect(response).to have_http_status(:success)
         json_response = JSON.parse(response.body)
-        expect(json_response['app_id']).to eql('cw_slack')
+        expect(json_response['id']).to eql('slack')
       end
     end
 
-    describe 'PUT /api/v1/accounts/{account.id}/integrations/slack/{id}' do
+    describe 'PUT /api/v1/accounts/{account.id}/integrations/slack/' do
       context 'when it is an unauthenticated user' do
         it 'returns unauthorized' do
-          put "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}", params: {}
+          put "/api/v1/accounts/#{account.id}/integrations/slack/", params: {}
           expect(response).to have_http_status(:unauthorized)
         end
       end
@@ -41,32 +44,32 @@ RSpec.describe 'Api::V1::Accounts::Integrations::Slacks', type: :request do
       context 'when it is an authenticated user' do
         it 'updates hook' do
           channel_builder = Integrations::Slack::ChannelBuilder.new(hook: hook, channel: 'channel')
-          channel_builder.stub(:perform)
+          expect(channel_builder).to receive(:perform)
 
           expect(Integrations::Slack::ChannelBuilder).to receive(:new).and_return(channel_builder)
 
-          put "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}",
+          put "/api/v1/accounts/#{account.id}/integrations/slack",
               params: { channel: SecureRandom.hex },
               headers: agent.create_new_auth_token
 
           expect(response).to have_http_status(:success)
           json_response = JSON.parse(response.body)
-          expect(json_response['app_id']).to eql('cw_slack')
+          expect(json_response['app_id']).to eql('slack')
         end
       end
     end
 
-    describe 'DELETE /api/v1/accounts/{account.id}/integrations/slack/{id}' do
+    describe 'DELETE /api/v1/accounts/{account.id}/integrations/slack' do
       context 'when it is an unauthenticated user' do
         it 'returns unauthorized' do
-          delete "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}", params: {}
+          delete "/api/v1/accounts/#{account.id}/integrations/slack", params: {}
           expect(response).to have_http_status(:unauthorized)
         end
       end
 
       context 'when it is an authenticated user' do
         it 'deletes hook' do
-          delete "/api/v1/accounts/#{account.id}/integrations/slack/#{hook.id}",
+          delete "/api/v1/accounts/#{account.id}/integrations/slack",
                  headers: agent.create_new_auth_token
           expect(response).to have_http_status(:success)
           expect(Integrations::Hook.find_by(id: hook.id)).to be nil
diff --git a/spec/requests/api/v1/integrations/webhooks_request_spec.rb b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
index 1a29f2695..ea870d45c 100644
--- a/spec/requests/api/v1/integrations/webhooks_request_spec.rb
+++ b/spec/requests/api/v1/integrations/webhooks_request_spec.rb
@@ -4,7 +4,7 @@ RSpec.describe 'Api::V1::Integrations::Webhooks', type: :request do
   describe 'POST /api/v1/integrations/webhooks' do
     it 'consumes webhook' do
       builder = Integrations::Slack::IncomingMessageBuilder.new({})
-      builder.stub(:perform) { true }
+      expect(builder).to receive(:perform).and_return(true)
 
       expect(Integrations::Slack::IncomingMessageBuilder).to receive(:new).and_return(builder)
 
diff --git a/spec/support/slack_stubs.rb b/spec/support/slack_stubs.rb
index 971803f4e..18af884ed 100644
--- a/spec/support/slack_stubs.rb
+++ b/spec/support/slack_stubs.rb
@@ -7,41 +7,12 @@ module SlackStubs
     }
   end
 
-  # rubocop:disable  Metrics/MethodLength
   def slack_message_stub
     {
       "token": '[FILTERED]',
       "team_id": 'TLST3048H',
       "api_app_id": 'A012S5UETV4',
-      "event": {
-        "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
-        "type": 'message',
-        "text": 'this is test',
-        "user": 'ULYPAKE5S',
-        "ts": '1588623033.006000',
-        "team": 'TLST3048H',
-        "blocks": [
-          {
-            "type": 'rich_text',
-            "block_id": 'jaIv3',
-            "elements": [
-              {
-                "type": 'rich_text_section',
-                "elements": [
-                  {
-                    "type": 'text',
-                    "text": 'this is test'
-                  }
-                ]
-              }
-            ]
-          }
-        ],
-        "thread_ts": '1588623023.005900',
-        "channel": 'G01354F6A6Q',
-        "event_ts": '1588623033.006000',
-        "channel_type": 'group'
-      },
+      "event": message_event,
       "type": 'event_callback',
       "event_id": 'Ev013QUX3WV6',
       "event_time": 1_588_623_033,
@@ -49,5 +20,38 @@ module SlackStubs
       "webhook": {}
     }
   end
-  # rubocop:enable  Metrics/MethodLength
+
+  def message_event
+    { "client_msg_id": 'ffc6e64e-6f0c-4a3d-b594-faa6b44e48ab',
+      "type": 'message',
+      "text": 'this is test',
+      "user": 'ULYPAKE5S',
+      "ts": '1588623033.006000',
+      "team": 'TLST3048H',
+      "blocks": message_blocks,
+      "thread_ts": '1588623023.005900',
+      "channel": 'G01354F6A6Q',
+      "event_ts": '1588623033.006000',
+      "channel_type": 'group' }
+  end
+
+  def message_blocks
+    [
+      {
+        "type": 'rich_text',
+        "block_id": 'jaIv3',
+        "elements": [
+          {
+            "type": 'rich_text_section',
+            "elements": [
+              {
+                "type": 'text',
+                "text": 'this is test'
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  end
 end

From 8b61452d567c7b24c53237a76734c2f16c24b5c5 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 22 Jun 2020 13:40:31 +0530
Subject: [PATCH 29/50] Chore: Fix typo in Slack documentation (#977)

- Fix typo in slack-integration-setup.md
---
 .../project-setup/slack-integration-setup.md  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/development/project-setup/slack-integration-setup.md b/docs/development/project-setup/slack-integration-setup.md
index 75e0ed0fa..010b9ff01 100644
--- a/docs/development/project-setup/slack-integration-setup.md
+++ b/docs/development/project-setup/slack-integration-setup.md
@@ -3,26 +3,26 @@ path: "/docs/slack-integration-setup"
 title: "Setting Up Slack Intergration"
 ---
 
-### Register A Facebook App
+### Register a Slack app
 
-To use Slack Integration, you have to create an Slack app in developer portal. You can find more details about creating Slack apps [here](https://api.slack.com/)
+To use Slack Integration, you have to create a Slack app in the developer portal. You can find more details about creating Slack apps [here](https://api.slack.com/)
 
-Once you register your Slack App, you will have to obtain the `Client Id` and `Client Secret` . These values will be available in the app settings and will be required while setting up Chatwoot environment variables.
+Once you register your Slack App, you will have to obtain the `Client Id` and `Client Secret`. These values will be available in the app settings and will be required while setting up Chatwoot environment variables.
 
-### Configure the Slack App
+### Configure the Slack app
 
-1) Create a slack app and add it to your development workspace. 
+1) Create a slack app and add it to your development workspace.
 2) Obtain the `Client Id` and `Client Secret` for the app and configure it in your Chatwoot environment variables.
-3) Head over to the `oauth & permissions` section under `features` tab. 
-4) In the redirect urls, Add your Chatwoot installation base url. 
+3) Head over to the `OAuth & permissions` section under `features` tab.
+4) In the redirect URLs, Add your Chatwoot installation base url.
 5) In the scopes section configure the given scopes for bot token scopes.
  `commands,chat:write,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize`
 6) Head over to the `events subscriptions` section under `features` tab.
 7) Enable events and configure the the given request url `{chatwoot installation url}/api/v1/integrations/webhooks`
 8) Subscribe to the following bot events `message.channels` , `message.groups`, `message.im`, `message.mpim`
-9) Connect slack integration on Chatwoot app and  get productive. 
+9) Connect slack integration on Chatwoot app and get productive.
 
-### Configuring the Environment Variables in Chatwoot
+### Configuring the environment variables in Chatwoot
 
 Configure the following Chatwoot environment variables with the values you have obtained during the slack app setup.
 
@@ -31,9 +31,9 @@ SLACK_CLIENT_ID=
 SLACK_CLIENT_SECRET=
 ```
 
-### Test your Setup
+### Test your setup
 
-1. Ensure that you are recieving the Chatwoot messages in `customer-conversations` channel
-2. Add a message to that thread and ensure its coming back on to Chatwoot
-3. Add `note:` or `private:` in front on the slack message see if its coming out as private notes
-4. If your slack member email matches their email on Chatwoot, the messages will be associated with their Chatwoot user account.
+1. Ensure that you are receiving the Chatwoot messages in the `customer-conversations` channel.
+2. Add a message to that thread and ensure it is coming back on to Chatwoot
+3. Add `note:` or `private:` in front on the Slack message see if it is coming out as private notes
+4. If your Slack member's email matches their email on Chatwoot, the messages will be associated with their Chatwoot user account.

From 97ad39713bcb72cf71a511199d56e4935e44afe9 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Thu, 25 Jun 2020 21:04:03 +0530
Subject: [PATCH 30/50] Feature: Improve label experience (#975)

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../dashboard/api/inbox/conversation.js       |   6 +-
 app/javascript/dashboard/api/labels.js        |   9 +
 .../dashboard/api/specs/labels.spec.js        |  14 ++
 .../assets/scss/_foundation-custom.scss       |   7 +-
 .../assets/scss/_foundation-settings.scss     |   2 +-
 .../dashboard/assets/scss/widgets/_modal.scss |   4 +
 .../dashboard/components/ChatList.vue         |  66 ++++--
 app/javascript/dashboard/components/index.js  |   2 +
 .../dashboard/components/layout/Sidebar.vue   |  25 +++
 .../components/layout/SidebarItem.vue         |  22 +-
 .../dashboard/components/widgets/Label.vue    |  91 ++++++++
 .../widgets/conversation/ConversationCard.vue |  11 +-
 app/javascript/dashboard/helper/URLHelper.js  |  13 +-
 .../dashboard/helper/specs/URLHelper.spec.js  |  21 +-
 .../dashboard/i18n/default-sidebar.js         |  12 +-
 .../dashboard/i18n/locale/en/contact.json     |  18 +-
 .../dashboard/i18n/locale/en/index.js         |   3 +-
 .../dashboard/i18n/locale/en/labelsMgmt.json  |  68 ++++++
 .../dashboard/i18n/locale/en/settings.json    |   3 +-
 .../conversation/ContactDetailsItem.vue       |  31 ++-
 .../dashboard/conversation/ContactPanel.vue   |  16 +-
 .../conversation/ConversationLabels.vue       | 173 ---------------
 .../conversation/ConversationView.vue         |  63 +++---
 .../conversation/conversation.routes.js       |  19 ++
 .../labels/AddLabelToConversation.vue         | 133 ++++++++++++
 .../conversation/labels/LabelBox.vue          | 160 ++++++++++++++
 .../dashboard/settings/labels/AddLabel.vue    | 123 +++++++++++
 .../dashboard/settings/labels/EditLabel.vue   | 129 +++++++++++
 .../dashboard/settings/labels/Index.vue       | 201 ++++++++++++++++++
 .../settings/labels/labels.routes.js          |  31 +++
 .../settings/labels/specs/validations.spec.js |  10 +
 .../dashboard/settings/labels/validations.js  |  16 ++
 .../dashboard/settings/settings.routes.js     |  10 +-
 app/javascript/dashboard/store/index.js       |   4 +-
 .../dashboard/store/modules/contacts.js       |  10 +-
 .../store/modules/conversationLabels.js       |  11 +
 .../store/modules/conversations/actions.js    |   3 +-
 .../store/modules/conversations/index.js      |   6 +-
 .../dashboard/store/modules/labels.js         |  97 +++++++++
 .../specs/conversationLabels/actions.spec.js  |  29 +++
 .../conversationLabels/mutations.spec.js      |  22 +-
 .../specs/conversations/actions.spec.js       |   2 +-
 .../modules/specs/labels/actions.spec.js      |  94 ++++++++
 .../store/modules/specs/labels/fixtures.js    |  37 ++++
 .../modules/specs/labels/getters.spec.js      |  30 +++
 .../modules/specs/labels/mutations.spec.js    |  39 ++++
 .../dashboard/store/mutation-types.js         |   8 +
 app/models/label.rb                           |  13 +-
 app/policies/label_policy.rb                  |   6 +-
 .../partials/_conversation.json.jbuilder      |   1 +
 ..._migrate_and_add_unique_index_to_labels.rb |  20 ++
 db/schema.rb                                  |   3 +-
 lib/regex_helper.rb                           |   8 +
 .../api/v1/accounts/labels_controller_spec.rb |   4 +-
 spec/factories/labels.rb                      |   2 +-
 spec/models/label_spec.rb                     |  35 +++
 56 files changed, 1712 insertions(+), 284 deletions(-)
 create mode 100644 app/javascript/dashboard/api/labels.js
 create mode 100644 app/javascript/dashboard/api/specs/labels.spec.js
 create mode 100644 app/javascript/dashboard/components/widgets/Label.vue
 create mode 100644 app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
 delete mode 100644 app/javascript/dashboard/routes/dashboard/conversation/ConversationLabels.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/labels.routes.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/specs/validations.spec.js
 create mode 100644 app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
 create mode 100644 app/javascript/dashboard/store/modules/labels.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/labels/actions.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/labels/fixtures.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/labels/getters.spec.js
 create mode 100644 app/javascript/dashboard/store/modules/specs/labels/mutations.spec.js
 create mode 100644 db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb
 create mode 100644 lib/regex_helper.rb

diff --git a/app/javascript/dashboard/api/inbox/conversation.js b/app/javascript/dashboard/api/inbox/conversation.js
index d3942efea..3f1b2e199 100644
--- a/app/javascript/dashboard/api/inbox/conversation.js
+++ b/app/javascript/dashboard/api/inbox/conversation.js
@@ -6,13 +6,14 @@ class ConversationApi extends ApiClient {
     super('conversations', { accountScoped: true });
   }
 
-  get({ inboxId, status, assigneeType, page }) {
+  get({ inboxId, status, assigneeType, page, labels }) {
     return axios.get(this.url, {
       params: {
         inbox_id: inboxId,
         status,
         assignee_type: assigneeType,
         page,
+        labels,
       },
     });
   }
@@ -44,12 +45,13 @@ class ConversationApi extends ApiClient {
     return axios.post(`${this.url}/${conversationId}/mute`);
   }
 
-  meta({ inboxId, status, assigneeType }) {
+  meta({ inboxId, status, assigneeType, labels }) {
     return axios.get(`${this.url}/meta`, {
       params: {
         inbox_id: inboxId,
         status,
         assignee_type: assigneeType,
+        labels,
       },
     });
   }
diff --git a/app/javascript/dashboard/api/labels.js b/app/javascript/dashboard/api/labels.js
new file mode 100644
index 000000000..8a088e840
--- /dev/null
+++ b/app/javascript/dashboard/api/labels.js
@@ -0,0 +1,9 @@
+import ApiClient from './ApiClient';
+
+class LabelsAPI extends ApiClient {
+  constructor() {
+    super('labels', { accountScoped: true });
+  }
+}
+
+export default new LabelsAPI();
diff --git a/app/javascript/dashboard/api/specs/labels.spec.js b/app/javascript/dashboard/api/specs/labels.spec.js
new file mode 100644
index 000000000..f43c807c0
--- /dev/null
+++ b/app/javascript/dashboard/api/specs/labels.spec.js
@@ -0,0 +1,14 @@
+import labels from '../labels';
+import ApiClient from '../ApiClient';
+
+describe('#LabelsAPI', () => {
+  it('creates correct instance', () => {
+    expect(labels).toBeInstanceOf(ApiClient);
+    expect(labels).toHaveProperty('get');
+    expect(labels).toHaveProperty('show');
+    expect(labels).toHaveProperty('create');
+    expect(labels).toHaveProperty('update');
+    expect(labels).toHaveProperty('delete');
+    expect(labels.url).toBe('/api/v1/labels');
+  });
+});
diff --git a/app/javascript/dashboard/assets/scss/_foundation-custom.scss b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
index a544ae883..900dd4d9d 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-custom.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-custom.scss
@@ -1,6 +1,6 @@
 .button {
-  font-weight: $font-weight-medium;
   font-family: $body-font-family;
+  font-weight: $font-weight-medium;
 
   &.round {
     border-radius: 1000px;
@@ -20,10 +20,11 @@
 }
 
 .tooltip {
-  max-width: 15rem;
-  padding: $space-smaller $space-small;
   border-radius: $space-smaller;
   font-size: $font-size-mini;
+  max-width: 15rem;
+  padding: $space-smaller $space-small;
+  z-index: 9999;
 }
 
 code {
diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index 169198dae..afa81cd80 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -382,7 +382,7 @@ $label-color: $primary-color;
 $label-color-alt: $black;
 $label-palette: $foundation-palette;
 $label-font-size: $font-size-micro;
-$label-padding: $space-micro $space-smaller;
+$label-padding: $space-smaller $space-small;
 $label-radius: $space-micro;
 
 // 21. Media Object
diff --git a/app/javascript/dashboard/assets/scss/widgets/_modal.scss b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
index 0ae8ecf21..8c4e656c4 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_modal.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_modal.scss
@@ -67,6 +67,10 @@
     font-size: $font-size-small;
   }
 
+  .content {
+    @include padding($space-large);
+  }
+
   form {
     @include padding($space-large);
     align-self: center;
diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue
index 9adb05dcc..5ca82a407 100644
--- a/app/javascript/dashboard/components/ChatList.vue
+++ b/app/javascript/dashboard/components/ChatList.vue
@@ -3,7 +3,7 @@
     <div class="chat-list__top">
       <h1 class="page-title">
         <woot-sidemenu-icon />
-        {{ inbox.name || $t('CHAT_LIST.TAB_HEADING') }}
+        {{ pageTitle }}
       </h1>
       <chat-filter @statusFilterChange="updateStatusType" />
     </div>
@@ -15,14 +15,15 @@
       @chatTabChange="updateAssigneeTab"
     />
 
-    <p v-if="!chatListLoading && !getChatsForTab().length" class="content-box">
+    <p v-if="!chatListLoading && !conversationList.length" class="content-box">
       {{ $t('CHAT_LIST.LIST.404') }}
     </p>
 
     <div class="conversations-list">
       <conversation-card
-        v-for="chat in getChatsForTab()"
+        v-for="chat in conversationList"
         :key="chat.id"
+        :active-label="label"
         :chat="chat"
       />
 
@@ -40,7 +41,7 @@
 
       <p
         v-if="
-          getChatsForTab().length &&
+          conversationList.length &&
             hasCurrentPageEndReached &&
             !chatListLoading
         "
@@ -72,7 +73,16 @@ export default {
     ChatFilter,
   },
   mixins: [timeMixin, conversationMixin],
-  props: ['conversationInbox'],
+  props: {
+    conversationInbox: {
+      type: [String, Number],
+      default: 0,
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+  },
   data() {
     return {
       activeAssigneeTab: wootConstants.ASSIGNEE_TYPE.ME,
@@ -119,18 +129,51 @@ export default {
         assigneeType: this.activeAssigneeTab,
         status: this.activeStatus,
         page: this.currentPage + 1,
+        labels: this.label ? [this.label] : undefined,
       };
     },
+    pageTitle() {
+      if (this.inbox.name) {
+        return this.inbox.name;
+      }
+      if (this.label) {
+        return `#${this.label}`;
+      }
+      return this.$t('CHAT_LIST.TAB_HEADING');
+    },
+    conversationList() {
+      let conversationList = [];
+      if (this.activeAssigneeTab === 'me') {
+        conversationList = this.mineChatsList.slice();
+      } else if (this.activeAssigneeTab === 'unassigned') {
+        conversationList = this.unAssignedChatsList.slice();
+      } else {
+        conversationList = this.allChatList.slice();
+      }
+
+      if (!this.label) {
+        return conversationList;
+      }
+
+      return conversationList.filter(conversation => {
+        const labels = this.$store.getters[
+          'conversationLabels/getConversationLabels'
+        ](conversation.id);
+        return labels.includes(this.label);
+      });
+    },
   },
   watch: {
     conversationInbox() {
       this.resetAndFetchData();
     },
+    label() {
+      this.resetAndFetchData();
+    },
   },
   mounted() {
     this.$store.dispatch('setChatFilter', this.activeStatus);
     this.resetAndFetchData();
-    this.$store.dispatch('agents/get');
 
     bus.$on('fetch_conversation_stats', () => {
       this.$store.dispatch('conversationStats/get', this.conversationFilters);
@@ -159,17 +202,6 @@ export default {
         this.resetAndFetchData();
       }
     },
-    getChatsForTab() {
-      let copyList = [];
-      if (this.activeAssigneeTab === 'me') {
-        copyList = this.mineChatsList.slice();
-      } else if (this.activeAssigneeTab === 'unassigned') {
-        copyList = this.unAssignedChatsList.slice();
-      } else {
-        copyList = this.allChatList.slice();
-      }
-      return copyList;
-    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/components/index.js b/app/javascript/dashboard/components/index.js
index 24a81ee20..4fbfa5338 100644
--- a/app/javascript/dashboard/components/index.js
+++ b/app/javascript/dashboard/components/index.js
@@ -6,6 +6,7 @@ import Code from './Code';
 import ColorPicker from './widgets/ColorPicker';
 import DeleteModal from './widgets/modal/DeleteModal.vue';
 import Input from './widgets/forms/Input.vue';
+import Label from './widgets/Label.vue';
 import LoadingState from './widgets/LoadingState';
 import Modal from './Modal';
 import ModalHeader from './ModalHeader';
@@ -25,6 +26,7 @@ const WootUIKit = {
   DeleteModal,
   Input,
   LoadingState,
+  Label,
   Modal,
   ModalHeader,
   ReportStatsCard,
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 88578e635..4ec6c239f 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -18,6 +18,11 @@
           :key="inboxSection.toState"
           :menu-item="inboxSection"
         />
+        <sidebar-item
+          v-if="shouldShowInboxes"
+          :key="labelSection.toState"
+          :menu-item="labelSection"
+        />
       </transition-group>
     </div>
 
@@ -125,6 +130,7 @@ export default {
       inboxes: 'inboxes/getInboxes',
       accountId: 'getCurrentAccountId',
       currentRole: 'getCurrentRole',
+      accountLabels: 'labels/getLabelsOnSidebar',
     }),
     sidemenuItems() {
       return getSidebarItems(this.accountId);
@@ -170,6 +176,25 @@ export default {
         })),
       };
     },
+    labelSection() {
+      return {
+        icon: 'ion-pound',
+        label: 'LABELS',
+        hasSubMenu: true,
+        key: 'label',
+        cssClass: 'menu-title align-justify',
+        toState: frontendURL(`accounts/${this.accountId}/settings/labels`),
+        toStateName: 'labels_list',
+        children: this.accountLabels.map(label => ({
+          id: label.id,
+          label: label.title,
+          color: label.color,
+          toState: frontendURL(
+            `accounts/${this.accountId}/label/${label.title}`
+          ),
+        })),
+      };
+    },
     dashboardPath() {
       return frontendURL(`accounts/${this.accountId}/dashboard`);
     },
diff --git a/app/javascript/dashboard/components/layout/SidebarItem.vue b/app/javascript/dashboard/components/layout/SidebarItem.vue
index 35356a685..7ef2dfa88 100644
--- a/app/javascript/dashboard/components/layout/SidebarItem.vue
+++ b/app/javascript/dashboard/components/layout/SidebarItem.vue
@@ -36,7 +36,13 @@
               v-if="computedInboxClass(child)"
               class="inbox-icon"
               :class="computedInboxClass(child)"
-            ></i>
+            />
+            <span
+              v-if="child.color"
+              class="label-color--display"
+              :style="{ backgroundColor: child.color }"
+            />
+
             {{ child.label }}
           </div>
         </a>
@@ -126,8 +132,22 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+@import '~dashboard/assets/scss/variables';
+
 .sub-menu-title {
   display: flex;
   justify-content: space-between;
 }
+
+.wrap {
+  display: flex;
+  align-items: center;
+}
+
+.label-color--display {
+  border-radius: $space-smaller;
+  height: $space-normal;
+  margin-right: $space-small;
+  width: $space-normal;
+}
 </style>
diff --git a/app/javascript/dashboard/components/widgets/Label.vue b/app/javascript/dashboard/components/widgets/Label.vue
new file mode 100644
index 000000000..9b56a4c91
--- /dev/null
+++ b/app/javascript/dashboard/components/widgets/Label.vue
@@ -0,0 +1,91 @@
+<template>
+  <div
+    :class="labelClass"
+    :style="{ background: bgColor, color: textColor }"
+    :title="description"
+  >
+    <span v-if="!href">{{ title }}</span>
+    <a v-else :href="href" :style="{ color: textColor }">{{ title }}</a>
+    <i v-if="showIcon" class="label--icon" :class="icon" @click="onClick" />
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      required: true,
+    },
+    description: {
+      type: String,
+      default: '',
+    },
+    href: {
+      type: String,
+      default: '',
+    },
+    bgColor: {
+      type: String,
+      default: '#1f93ff',
+    },
+    small: {
+      type: Boolean,
+      default: false,
+    },
+    showIcon: {
+      type: Boolean,
+      default: false,
+    },
+    icon: {
+      type: String,
+      default: 'ion-close',
+    },
+  },
+  computed: {
+    textColor() {
+      const color = this.bgColor.replace('#', '');
+      const r = parseInt(color.slice(0, 2), 16);
+      const g = parseInt(color.slice(2, 4), 16);
+      const b = parseInt(color.slice(4, 6), 16);
+      // http://stackoverflow.com/a/3943023/112731
+      return r * 0.299 + g * 0.587 + b * 0.114 > 186 ? '#000000' : '#FFFFFF';
+    },
+    labelClass() {
+      return `label ${this.small ? 'small' : ''}`;
+    },
+  },
+  methods: {
+    onClick() {
+      this.$emit('click', this.title);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '~dashboard/assets/scss/variables';
+
+.label {
+  display: inline-block;
+  font-size: $font-size-small;
+  line-height: 1;
+  margin: $space-micro;
+
+  &.small {
+    font-size: $font-size-mini;
+  }
+
+  a {
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
+
+.label--icon {
+  cursor: pointer;
+  font-size: $font-size-micro;
+  line-height: 1.5;
+  margin-left: $space-smaller;
+}
+</style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index d63940127..0f3a2cd66 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -57,6 +57,10 @@ export default {
 
   mixins: [timeMixin, conversationMixin],
   props: {
+    activeLabel: {
+      type: String,
+      default: '',
+    },
     chat: {
       type: Object,
       default: () => {},
@@ -116,7 +120,12 @@ export default {
   methods: {
     cardClick(chat) {
       const { activeInbox } = this;
-      const path = conversationUrl(this.accountId, activeInbox, chat.id);
+      const path = conversationUrl({
+        accountId: this.accountId,
+        activeInbox,
+        id: chat.id,
+        label: this.activeLabel,
+      });
       router.push({ path: frontendURL(path) });
     },
     inboxName(inboxId) {
diff --git a/app/javascript/dashboard/helper/URLHelper.js b/app/javascript/dashboard/helper/URLHelper.js
index 5e6cae568..97744e43b 100644
--- a/app/javascript/dashboard/helper/URLHelper.js
+++ b/app/javascript/dashboard/helper/URLHelper.js
@@ -5,11 +5,14 @@ export const frontendURL = (path, params) => {
   return `/app/${path}${stringifiedParams}`;
 };
 
-export const conversationUrl = (accountId, activeInbox, id) => {
-  const path = activeInbox
-    ? `accounts/${accountId}/inbox/${activeInbox}/conversations/${id}`
-    : `accounts/${accountId}/conversations/${id}`;
-  return path;
+export const conversationUrl = ({ accountId, activeInbox, id, label }) => {
+  if (activeInbox) {
+    return `accounts/${accountId}/inbox/${activeInbox}/conversations/${id}`;
+  }
+  if (label) {
+    return `accounts/${accountId}/label/${label}/conversations/${id}`;
+  }
+  return `accounts/${accountId}/conversations/${id}`;
 };
 
 export const accountIdFromPathname = pathname => {
diff --git a/app/javascript/dashboard/helper/specs/URLHelper.spec.js b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
index 5c45cf269..354cffcd6 100644
--- a/app/javascript/dashboard/helper/specs/URLHelper.spec.js
+++ b/app/javascript/dashboard/helper/specs/URLHelper.spec.js
@@ -7,15 +7,20 @@ import {
 describe('#URL Helpers', () => {
   describe('conversationUrl', () => {
     it('should return direct conversation URL if activeInbox is nil', () => {
-      expect(conversationUrl(1, undefined, 1)).toBe(
+      expect(conversationUrl({ accountId: 1, id: 1 })).toBe(
         'accounts/1/conversations/1'
       );
     });
-    it('should return ibox conversation URL if activeInbox is not nil', () => {
-      expect(conversationUrl(1, 2, 1)).toBe(
+    it('should return inbox conversation URL if activeInbox is not nil', () => {
+      expect(conversationUrl({ accountId: 1, id: 1, activeInbox: 2 })).toBe(
         'accounts/1/inbox/2/conversations/1'
       );
     });
+    it('should return correct conversation URL if label is active', () => {
+      expect(
+        conversationUrl({ accountId: 1, label: 'customer-support', id: 1 })
+      ).toBe('accounts/1/label/customer-support/conversations/1');
+    });
   });
 
   describe('frontendURL', () => {
@@ -27,16 +32,6 @@ describe('#URL Helpers', () => {
     });
   });
 
-  /* 
-  
-  export const accountIdFromPathname = pathname => {
-  const isInsideAccountScopedURLs = pathname.includes('/app/accounts');
-  const accountId = isInsideAccountScopedURLs ? pathname.split('/')[3] : '';
-  return Number(accountId);
-};
-
-  */
-
   describe('accountIdFromPathname', () => {
     it('should return account id if accont scoped url is passed', () => {
       expect(accountIdFromPathname('/app/accounts/1/settings/general')).toBe(1);
diff --git a/app/javascript/dashboard/i18n/default-sidebar.js b/app/javascript/dashboard/i18n/default-sidebar.js
index 4b479f5f6..246bc0af2 100644
--- a/app/javascript/dashboard/i18n/default-sidebar.js
+++ b/app/javascript/dashboard/i18n/default-sidebar.js
@@ -10,6 +10,8 @@ export const getSidebarItems = accountId => ({
       'settings_account_reports',
       'profile_settings',
       'profile_settings_index',
+      'label_conversations',
+      'conversations_through_label',
     ],
     menuItems: {
       assignedToMe: {
@@ -40,9 +42,8 @@ export const getSidebarItems = accountId => ({
   settings: {
     routes: [
       'agent_list',
-      'agent_new',
       'canned_list',
-      'canned_new',
+      'labels_list',
       'settings_inbox',
       'settings_inbox_new',
       'settings_inbox_list',
@@ -78,6 +79,13 @@ export const getSidebarItems = accountId => ({
         toState: frontendURL(`accounts/${accountId}/settings/inboxes/list`),
         toStateName: 'settings_inbox_list',
       },
+      labels: {
+        icon: 'ion-pricetags',
+        label: 'LABELS',
+        hasSubMenu: false,
+        toState: frontendURL(`accounts/${accountId}/settings/labels/list`),
+        toStateName: 'labels_list',
+      },
       cannedResponses: {
         icon: 'ion-chatbox-working',
         label: 'CANNED_RESPONSES',
diff --git a/app/javascript/dashboard/i18n/locale/en/contact.json b/app/javascript/dashboard/i18n/locale/en/contact.json
index eb7b2d354..e5c3ec25d 100644
--- a/app/javascript/dashboard/i18n/locale/en/contact.json
+++ b/app/javascript/dashboard/i18n/locale/en/contact.json
@@ -11,11 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Conversation Labels",
-      "UPDATE_BUTTON": "Update Labels",
-      "UPDATE_ERROR": "Couldn't update labels, try again.",
-      "TAG_PLACEHOLDER": "Add new label",
-      "PLACEHOLDER": "Search or add a label"
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
-    "MUTE_CONTACT": "Mute Contact"
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/en/index.js b/app/javascript/dashboard/i18n/locale/en/index.js
index 558cc9b3a..5dfc44e4b 100644
--- a/app/javascript/dashboard/i18n/locale/en/index.js
+++ b/app/javascript/dashboard/i18n/locale/en/index.js
@@ -1,5 +1,5 @@
-/* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -23,6 +23,7 @@ export default {
   ..._inboxMgmt,
   ..._login,
   ..._report,
+  ..._labelsMgmt,
   ..._resetPassword,
   ..._setNewPassword,
   ..._settings,
diff --git a/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/en/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 38f5a4aac..67470727f 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -103,6 +103,7 @@
     "INBOXES": "Inboxes",
     "CANNED_RESPONSES": "Canned Responses",
     "INTEGRATIONS": "Integrations",
-    "ACCOUNT_SETTINGS": "Account Settings"
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
index 41068876f..fda504c35 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactDetailsItem.vue
@@ -1,8 +1,13 @@
 <template>
   <div class="conv-details--item">
     <h4 class="conv-details--item__label">
-      <i v-if="icon" :class="icon" class="conv-details--item__icon"></i>
-      {{ title }}
+      <div>
+        <i v-if="icon" :class="icon" class="conv-details--item__icon"></i>
+        {{ title }}
+      </div>
+      <button v-if="showEdit" @click="onEdit">
+        {{ $t('CONTACT_PANEL.EDIT_LABEL') }}
+      </button>
     </h4>
     <div v-if="value" class="conv-details--item__value">
       {{ value }}
@@ -16,6 +21,12 @@ export default {
     title: { type: String, required: true },
     icon: { type: String, default: '' },
     value: { type: [String, Number], default: '' },
+    showEdit: { type: Boolean, default: false },
+  },
+  methods: {
+    onEdit() {
+      this.$emit('edit');
+    },
   },
 };
 </script>
@@ -31,14 +42,18 @@ export default {
     padding-bottom: 0;
   }
 
-  .conv-details--item__icon {
-    padding-right: $space-smaller;
-  }
-
   .conv-details--item__label {
-    font-weight: $font-weight-medium;
-    margin-bottom: $space-micro;
+    align-items: center;
+    display: flex;
     font-size: $font-size-small;
+    font-weight: $font-weight-medium;
+    justify-content: space-between;
+    margin-bottom: $space-micro;
+
+    button {
+      cursor: pointer;
+      color: $color-body;
+    }
   }
 
   .conv-details--item__value {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index d653eb1cf..74a86070a 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -2,7 +2,7 @@
   <div class="medium-3 bg-white contact--panel">
     <div class="contact--profile">
       <span class="close-button" @click="onPanelToggle">
-        <i class="ion-close-round"></i>
+        <i class="ion-chevron-right" />
       </span>
       <div class="contact--info">
         <thumbnail
@@ -107,7 +107,7 @@ import { mapGetters } from 'vuex';
 import Thumbnail from 'dashboard/components/widgets/Thumbnail.vue';
 import ContactConversations from './ContactConversations.vue';
 import ContactDetailsItem from './ContactDetailsItem.vue';
-import ConversationLabels from './ConversationLabels.vue';
+import ConversationLabels from './labels/LabelBox.vue';
 
 export default {
   components: {
@@ -168,12 +168,15 @@ export default {
   watch: {
     conversationId(newConversationId, prevConversationId) {
       if (newConversationId && newConversationId !== prevConversationId) {
-        this.$store.dispatch('contacts/show', { id: this.contactId });
+        this.getContactDetails();
       }
     },
+    contactId() {
+      this.getContactDetails();
+    },
   },
   mounted() {
-    this.$store.dispatch('contacts/show', { id: this.contactId });
+    this.getContactDetails();
   },
   methods: {
     onPanelToggle() {
@@ -182,6 +185,11 @@ export default {
     mute() {
       this.$store.dispatch('muteConversation', this.conversationId);
     },
+    getContactDetails() {
+      if (this.contactId) {
+        this.$store.dispatch('contacts/show', { id: this.contactId });
+      }
+    },
   },
 };
 </script>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationLabels.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationLabels.vue
deleted file mode 100644
index 728815a0e..000000000
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationLabels.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <div
-    class="contact-conversation--panel sidebar-labels-wrap"
-    :class="hasEditedClass"
-  >
-    <div
-      v-if="!conversationUiFlags.isFetching"
-      class="contact-conversation--list"
-    >
-      <label class="select-tags">
-        <contact-details-item
-          :title="$t('CONTACT_PANEL.LABELS.TITLE')"
-          icon="ion-pricetags"
-        />
-        <multiselect
-          v-model="selectedLabels"
-          :options="savedLabels"
-          :tag-placeholder="$t('CONTACT_PANEL.LABELS.TAG_PLACEHOLDER')"
-          :placeholder="$t('CONTACT_PANEL.LABELS.PLACEHOLDER')"
-          :multiple="true"
-          :taggable="true"
-          hide-selected
-          :show-labels="false"
-          @tag="addLabel"
-        />
-      </label>
-      <div class="row align-middle align-justify">
-        <span v-if="labelUiFlags.isError" class="error">{{
-          $t('CONTACT_PANEL.LABELS.UPDATE_ERROR')
-        }}</span>
-        <button
-          v-if="hasEdited"
-          type="button"
-          class="button nice tiny"
-          @click="onUpdateLabels"
-        >
-          <spinner v-if="labelUiFlags.isUpdating" size="tiny" />
-          {{
-            labelUiFlags.isUpdating
-              ? 'saving...'
-              : $t('CONTACT_PANEL.LABELS.UPDATE_BUTTON')
-          }}
-        </button>
-      </div>
-    </div>
-    <spinner v-else></spinner>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import ContactDetailsItem from './ContactDetailsItem';
-import Spinner from 'shared/components/Spinner';
-
-export default {
-  components: {
-    ContactDetailsItem,
-    Spinner,
-  },
-  props: {
-    conversationId: {
-      type: [String, Number],
-      required: true,
-    },
-  },
-  data() {
-    return {
-      isSearching: false,
-      selectedLabels: [],
-    };
-  },
-  computed: {
-    hasEdited() {
-      if (this.selectedLabels.length !== this.savedLabels.length) {
-        return true;
-      }
-      const isSame = this.selectedLabels.every(label =>
-        this.savedLabels.includes(label)
-      );
-      return !isSame;
-    },
-    savedLabels() {
-      const saved = this.$store.getters[
-        'conversationLabels/getConversationLabels'
-      ](this.conversationId);
-      return saved;
-    },
-    hasEditedClass() {
-      return this.hasEdited ? 'has-edited' : '';
-    },
-    ...mapGetters({
-      conversationUiFlags: 'contactConversations/getUIFlags',
-      labelUiFlags: 'conversationLabels/getUIFlags',
-    }),
-  },
-  watch: {
-    conversationId(newConversationId, prevConversationId) {
-      if (newConversationId && newConversationId !== prevConversationId) {
-        this.fetchLabels(newConversationId);
-      }
-    },
-  },
-  mounted() {
-    const { conversationId } = this;
-    this.fetchLabels(conversationId);
-  },
-  methods: {
-    addLabel(label) {
-      this.selectedLabels = [...this.selectedLabels, label];
-    },
-    onUpdateLabels() {
-      this.$store.dispatch('conversationLabels/update', {
-        conversationId: this.conversationId,
-        labels: this.selectedLabels,
-      });
-    },
-    async fetchLabels(conversationId) {
-      try {
-        await this.$store.dispatch('conversationLabels/get', conversationId);
-        this.selectedLabels = [...this.savedLabels];
-        // eslint-disable-next-line no-empty
-      } catch (error) {}
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import '~dashboard/assets/scss/variables';
-@import '~dashboard/assets/scss/mixins';
-
-.contact-conversation--panel {
-  padding: $space-normal;
-}
-
-.conversation--label {
-  color: $color-white;
-  margin-right: $space-small;
-  font-size: $font-size-small;
-  padding: $space-smaller;
-}
-
-.select-tags {
-  .multiselect {
-    &:hover {
-      cursor: pointer;
-    }
-    transition: $transition-ease-in;
-    margin-bottom: 0;
-  }
-}
-
-.button {
-  margin-top: $space-small;
-  margin-left: auto;
-}
-
-.no-results-wrap {
-  padding: 0 $space-small;
-}
-
-.no-results {
-  margin: $space-normal 0 0 0;
-  color: $color-gray;
-  font-weight: $font-weight-normal;
-}
-
-.error {
-  color: $alert-color;
-  font-size: $font-size-mini;
-  font-weight: $font-weight-medium;
-}
-</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
index c51053c19..e073965f6 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ConversationView.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="app-content columns">
-    <chat-list :conversation-inbox="inboxId"></chat-list>
+    <chat-list :conversation-inbox="inboxId" :label="label"></chat-list>
     <conversation-box
       :inbox-id="inboxId"
       :is-contact-panel-open="isContactPanelOpen"
@@ -30,19 +30,34 @@ export default {
     ContactPanel,
     ConversationBox,
   },
+  props: {
+    inboxId: {
+      type: [String, Number],
+      default: 0,
+    },
+    conversationId: {
+      type: [String, Number],
+      default: 0,
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+  },
 
   data() {
     return {
-      panelToggleState: false,
+      panelToggleState: true,
     };
   },
   computed: {
     ...mapGetters({
       chatList: 'getAllConversations',
+      currentChat: 'getSelectedChat',
     }),
     isContactPanelOpen: {
       get() {
-        if (this.conversationId) {
+        if (this.currentChat.id) {
           return this.panelToggleState;
         }
         return false;
@@ -52,9 +67,11 @@ export default {
       },
     },
   },
-  props: ['inboxId', 'conversationId'],
 
   mounted() {
+    this.$store.dispatch('labels/get');
+    this.$store.dispatch('agents/get');
+
     this.initialize();
     this.$watch('$store.state.route', () => this.initialize());
     this.$watch('chatList.length', () => {
@@ -65,26 +82,8 @@ export default {
 
   methods: {
     initialize() {
-      switch (this.$store.state.route.name) {
-        case 'inbox_conversation':
-          this.setActiveChat();
-          break;
-        case 'inbox_dashboard':
-          if (this.inboxId) {
-            this.$store.dispatch('setActiveInbox', this.inboxId);
-          }
-          break;
-        case 'conversation_through_inbox':
-          if (this.inboxId) {
-            this.$store.dispatch('setActiveInbox', this.inboxId);
-          }
-          this.setActiveChat();
-          break;
-        default:
-          this.$store.dispatch('setActiveInbox', null);
-          this.$store.dispatch('clearSelectedState');
-          break;
-      }
+      this.$store.dispatch('setActiveInbox', this.inboxId);
+      this.setActiveChat();
     },
 
     fetchConversation() {
@@ -103,11 +102,17 @@ export default {
     },
 
     setActiveChat() {
-      const chat = this.findConversation();
-      if (!chat) return;
-      this.$store.dispatch('setActiveChat', chat).then(() => {
-        bus.$emit('scrollToMessage');
-      });
+      if (this.conversationId) {
+        const chat = this.findConversation();
+        if (!chat) {
+          return;
+        }
+        this.$store.dispatch('setActiveChat', chat).then(() => {
+          bus.$emit('scrollToMessage');
+        });
+      } else {
+        this.$store.dispatch('clearSelectedState');
+      }
     },
     onToggleContactPanel() {
       this.isContactPanelOpen = !this.isContactPanelOpen;
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
index 0a51c24c2..a9e172183 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/conversation/conversation.routes.js
@@ -45,5 +45,24 @@ export default {
         };
       },
     },
+    {
+      path: frontendURL('accounts/:accountId/label/:label'),
+      name: 'label_conversations',
+      roles: ['administrator', 'agent'],
+      component: ConversationView,
+      props: route => ({ label: route.params.label }),
+    },
+    {
+      path: frontendURL(
+        'accounts/:accountId/label/:label/conversations/:conversation_id'
+      ),
+      name: 'conversations_through_label',
+      roles: ['administrator', 'agent'],
+      component: ConversationView,
+      props: route => ({
+        conversationId: route.params.conversation_id,
+        label: route.params.label,
+      }),
+    },
   ],
 };
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue
new file mode 100644
index 000000000..d83bf6870
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/AddLabelToConversation.vue
@@ -0,0 +1,133 @@
+<template>
+  <woot-modal :show.sync="show" :on-close="onClose">
+    <div class="column content-box">
+      <woot-modal-header
+        :header-title="
+          $t('CONTACT_PANEL.LABELS.MODAL.TITLE') + ' #' + conversationId
+        "
+      />
+      <div class="content">
+        <div class="label-content--block">
+          <div class="label-content--title">
+            {{ $t('CONTACT_PANEL.LABELS.MODAL.ACTIVE_LABELS') }}
+            <span v-tooltip.bottom="$t('CONTACT_PANEL.LABELS.MODAL.REMOVE')">
+              <i class="ion-ios-help-outline" />
+            </span>
+          </div>
+          <div v-if="activeList.length">
+            <woot-label
+              v-for="label in activeList"
+              :key="label.id"
+              :title="label.title"
+              :description="label.description"
+              :bg-color="label.color"
+              :show-icon="true"
+              @click="onRemove"
+            />
+          </div>
+          <p v-else>
+            {{ $t('CONTACT_PANEL.LABELS.NO_AVAILABLE_LABELS') }}
+          </p>
+        </div>
+
+        <div class="label-content--block">
+          <div class="label-content--title">
+            {{ $t('CONTACT_PANEL.LABELS.MODAL.INACTIVE_LABELS') }}
+            <span v-tooltip.bottom="$t('CONTACT_PANEL.LABELS.MODAL.ADD')">
+              <i class="ion-ios-help-outline" />
+            </span>
+          </div>
+          <div v-if="inactiveList.length">
+            <woot-label
+              v-for="label in inactiveList"
+              :key="label.id"
+              :title="label.title"
+              :description="label.description"
+              :bg-color="label.color"
+              :show-icon="true"
+              icon="ion-plus"
+              @click="onAdd"
+            />
+          </div>
+          <p v-else>
+            {{ $t('CONTACT_PANEL.LABELS.NO_LABELS_TO_ADD') }}
+          </p>
+        </div>
+      </div>
+    </div>
+  </woot-modal>
+</template>
+<script>
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: false,
+    },
+    conversationId: {
+      type: [String, Number],
+      default: '',
+    },
+    accountLabels: {
+      type: Array,
+      default: () => [],
+    },
+    savedLabels: {
+      type: Array,
+      default: () => [],
+    },
+    onClose: {
+      type: Function,
+      default: () => [],
+    },
+    updateLabels: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  computed: {
+    activeList() {
+      return this.accountLabels.filter(accountLabel =>
+        this.savedLabels.includes(accountLabel.title)
+      );
+    },
+    inactiveList() {
+      return this.accountLabels.filter(
+        accountLabel => !this.savedLabels.includes(accountLabel.title)
+      );
+    },
+  },
+  methods: {
+    onAdd(label) {
+      const activeLabels = this.activeList.map(
+        activeLabel => activeLabel.title
+      );
+      this.updateLabels([...activeLabels, label]);
+    },
+
+    onRemove(label) {
+      const activeLabels = this.activeList
+        .filter(activeLabel => activeLabel.title !== label)
+        .map(activeLabel => activeLabel.title);
+      this.updateLabels(activeLabels);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '~dashboard/assets/scss/variables';
+
+.label-content--block {
+  margin-bottom: $space-normal;
+}
+
+.label-content--title {
+  font-weight: $font-weight-bold;
+  margin-bottom: $space-small;
+}
+
+.content {
+  padding-top: $space-normal;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
new file mode 100644
index 000000000..1a2353899
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/conversation/labels/LabelBox.vue
@@ -0,0 +1,160 @@
+<template>
+  <div class="contact-conversation--panel sidebar-labels-wrap">
+    <div
+      v-if="!conversationUiFlags.isFetching"
+      class="contact-conversation--list"
+    >
+      <contact-details-item
+        :title="$t('CONTACT_PANEL.LABELS.TITLE')"
+        icon="ion-pricetags"
+        :show-edit="true"
+        @edit="onEdit"
+      />
+      <woot-label
+        v-for="label in activeLabels"
+        :key="label.id"
+        :title="label.title"
+        :description="label.description"
+        :bg-color="label.color"
+      />
+      <div v-if="!activeLabels.length">
+        {{ $t('CONTACT_PANEL.LABELS.NO_AVAILABLE_LABELS') }}
+      </div>
+      <add-label-to-conversation
+        v-if="isEditing"
+        :conversation-id="conversationId"
+        :account-labels="accountLabels"
+        :saved-labels="savedLabels"
+        :show.sync="isEditing"
+        :on-close="closeEditModal"
+        :update-labels="onUpdateLabels"
+      />
+    </div>
+    <spinner v-else></spinner>
+  </div>
+</template>
+
+<script>
+/* global bus */
+import { mapGetters } from 'vuex';
+import AddLabelToConversation from './AddLabelToConversation';
+import ContactDetailsItem from '../ContactDetailsItem';
+import Spinner from 'shared/components/Spinner';
+
+export default {
+  components: {
+    AddLabelToConversation,
+    ContactDetailsItem,
+    Spinner,
+  },
+  props: {
+    conversationId: {
+      type: [String, Number],
+      required: true,
+    },
+  },
+  data() {
+    return {
+      isEditing: false,
+      selectedLabels: [],
+    };
+  },
+  computed: {
+    savedLabels() {
+      return this.$store.getters['conversationLabels/getConversationLabels'](
+        this.conversationId
+      );
+    },
+    ...mapGetters({
+      conversationUiFlags: 'contactConversations/getUIFlags',
+      labelUiFlags: 'conversationLabels/getUIFlags',
+      accountLabels: 'labels/getLabels',
+    }),
+    activeLabels() {
+      return this.accountLabels.filter(({ title }) =>
+        this.savedLabels.includes(title)
+      );
+    },
+  },
+  watch: {
+    conversationId(newConversationId, prevConversationId) {
+      if (newConversationId && newConversationId !== prevConversationId) {
+        this.fetchLabels(newConversationId);
+      }
+    },
+  },
+  mounted() {
+    const { conversationId } = this;
+    this.fetchLabels(conversationId);
+  },
+  methods: {
+    async onUpdateLabels(selectedLabels) {
+      try {
+        await this.$store.dispatch('conversationLabels/update', {
+          conversationId: this.conversationId,
+          labels: selectedLabels,
+        });
+      } catch (error) {
+        // Ignore error
+      }
+    },
+    onEdit() {
+      this.isEditing = true;
+    },
+    closeEditModal() {
+      bus.$emit('fetch_conversation_stats');
+      this.isEditing = false;
+    },
+    async fetchLabels(conversationId) {
+      this.$store.dispatch('conversationLabels/get', conversationId);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '~dashboard/assets/scss/variables';
+@import '~dashboard/assets/scss/mixins';
+
+.contact-conversation--panel {
+  padding: $space-normal;
+}
+
+.conversation--label {
+  color: $color-white;
+  margin-right: $space-small;
+  font-size: $font-size-small;
+  padding: $space-smaller;
+}
+
+.select-tags {
+  .multiselect {
+    &:hover {
+      cursor: pointer;
+    }
+    transition: $transition-ease-in;
+    margin-bottom: 0;
+  }
+}
+
+.button {
+  margin-top: $space-small;
+  margin-left: auto;
+}
+
+.no-results-wrap {
+  padding: 0 $space-small;
+}
+
+.no-results {
+  margin: $space-normal 0 0 0;
+  color: $color-gray;
+  font-weight: $font-weight-normal;
+}
+
+.error {
+  color: $alert-color;
+  font-size: $font-size-mini;
+  font-weight: $font-weight-medium;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
new file mode 100644
index 000000000..a7ea01e6b
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/AddLabel.vue
@@ -0,0 +1,123 @@
+<template>
+  <modal :show.sync="show" :on-close="onClose">
+    <div class="column content-box">
+      <woot-modal-header
+        :header-title="$t('LABEL_MGMT.ADD.TITLE')"
+        :header-content="$t('LABEL_MGMT.ADD.DESC')"
+      />
+      <form class="row" @submit.prevent="addLabel">
+        <woot-input
+          v-model.trim="title"
+          :class="{ error: $v.title.$error }"
+          class="medium-12 columns"
+          :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
+          :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
+          @input="$v.title.$touch"
+        />
+
+        <woot-input
+          v-model.trim="description"
+          :class="{ error: $v.description.$error }"
+          class="medium-12 columns"
+          :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
+          :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
+          @input="$v.description.$touch"
+        />
+
+        <div class="medium-12">
+          <label>
+            {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
+            <woot-color-picker v-model="color" />
+          </label>
+        </div>
+        <div class="medium-12">
+          <input v-model="showOnSidebar" type="checkbox" :value="true" />
+          <label for="conversation_creation">
+            {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
+          </label>
+        </div>
+        <div class="modal-footer">
+          <div class="medium-12 columns">
+            <woot-submit-button
+              :disabled="$v.title.$invalid || uiFlags.isCreating"
+              :button-text="$t('LABEL_MGMT.FORM.CREATE')"
+              :loading="uiFlags.isCreating"
+            />
+            <button class="button clear" @click.prevent="onClose">
+              {{ $t('LABEL_MGMT.FORM.CANCEL') }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </modal>
+</template>
+
+<script>
+import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import Modal from '../../../../components/Modal';
+import alertMixin from 'shared/mixins/alertMixin';
+import { mapGetters } from 'vuex';
+import validations from './validations';
+
+export default {
+  components: {
+    WootSubmitButton,
+    Modal,
+  },
+  mixins: [alertMixin],
+  props: {
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      color: '#000',
+      description: '',
+      title: '',
+      showOnSidebar: true,
+    };
+  },
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'labels/getUIFlags',
+    }),
+  },
+  mounted() {
+    this.color = this.getRandomColor();
+  },
+  methods: {
+    getRandomColor() {
+      const letters = '0123456789ABCDEF';
+      let color = '#';
+      for (let i = 0; i < 6; i += 1) {
+        color += letters[Math.floor(Math.random() * 16)];
+      }
+      return color;
+    },
+    addLabel() {
+      this.$store
+        .dispatch('labels/create', {
+          color: this.color,
+          description: this.description,
+          title: this.title,
+          show_on_sidebar: this.showOnSidebar,
+        })
+        .then(() => {
+          this.showAlert(this.$t('LABEL_MGMT.ADD.API.SUCCESS_MESSAGE'));
+          this.onClose();
+        })
+        .catch(() => {
+          this.showAlert(this.$t('LABEL_MGMT.ADD.API.ERROR_MESSAGE'));
+        });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
new file mode 100644
index 000000000..43e75de64
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/EditLabel.vue
@@ -0,0 +1,129 @@
+<template>
+  <modal :show.sync="show" :on-close="onClose">
+    <div class="column content-box">
+      <woot-modal-header :header-title="pageTitle" />
+      <form class="row" @submit.prevent="editLabel">
+        <woot-input
+          v-model.trim="title"
+          :class="{ error: $v.title.$error }"
+          class="medium-12 columns"
+          :label="$t('LABEL_MGMT.FORM.NAME.LABEL')"
+          :placeholder="$t('LABEL_MGMT.FORM.NAME.PLACEHOLDER')"
+          @input="$v.title.$touch"
+        />
+
+        <woot-input
+          v-model.trim="description"
+          :class="{ error: $v.description.$error }"
+          class="medium-12 columns"
+          :label="$t('LABEL_MGMT.FORM.DESCRIPTION.LABEL')"
+          :placeholder="$t('LABEL_MGMT.FORM.DESCRIPTION.PLACEHOLDER')"
+          @input="$v.description.$touch"
+        />
+
+        <div class="medium-12">
+          <label>
+            {{ $t('LABEL_MGMT.FORM.COLOR.LABEL') }}
+            <woot-color-picker v-model="color" />
+          </label>
+        </div>
+        <div class="medium-12">
+          <input v-model="showOnSidebar" type="checkbox" :value="true" />
+          <label for="conversation_creation">
+            {{ $t('LABEL_MGMT.FORM.SHOW_ON_SIDEBAR.LABEL') }}
+          </label>
+        </div>
+        <div class="modal-footer">
+          <div class="medium-12 columns">
+            <woot-submit-button
+              :disabled="$v.title.$invalid || uiFlags.isUpdating"
+              :button-text="$t('LABEL_MGMT.FORM.EDIT')"
+              :loading="uiFlags.isUpdating"
+            />
+            <button class="button clear" @click.prevent="onClose">
+              {{ $t('LABEL_MGMT.FORM.CANCEL') }}
+            </button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </modal>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import alertMixin from 'shared/mixins/alertMixin';
+
+import WootSubmitButton from '../../../../components/buttons/FormSubmitButton';
+import Modal from '../../../../components/Modal';
+import validations from './validations';
+
+export default {
+  components: {
+    WootSubmitButton,
+    Modal,
+  },
+  mixins: [alertMixin],
+  props: {
+    show: {
+      type: Boolean,
+      default: () => {},
+    },
+    selectedResponse: {
+      type: Object,
+      default: () => {},
+    },
+    onClose: {
+      type: Function,
+      default: () => {},
+    },
+  },
+  data() {
+    return {
+      title: '',
+      description: '',
+      showOnSidebar: true,
+      color: '',
+    };
+  },
+  validations,
+  computed: {
+    ...mapGetters({
+      uiFlags: 'labels/getUIFlags',
+    }),
+    pageTitle() {
+      return `${this.$t('LABEL_MGMT.EDIT.TITLE')} - ${
+        this.selectedResponse.title
+      }`;
+    },
+  },
+  mounted() {
+    this.setFormValues();
+  },
+  methods: {
+    setFormValues() {
+      this.title = this.selectedResponse.title;
+      this.description = this.selectedResponse.description;
+      this.showOnSidebar = this.selectedResponse.show_on_sidebar;
+      this.color = this.selectedResponse.color;
+    },
+    editLabel() {
+      this.$store
+        .dispatch('labels/update', {
+          id: this.selectedResponse.id,
+          color: this.color,
+          description: this.description,
+          title: this.title,
+          show_on_sidebar: this.showOnSidebar,
+        })
+        .then(() => {
+          this.showAlert(this.$t('LABEL_MGMT.EDIT.API.SUCCESS_MESSAGE'));
+          setTimeout(() => this.onClose(), 10);
+        })
+        .catch(() => {
+          this.showAlert(this.$t('LABEL_MGMT.EDIT.API.ERROR_MESSAGE'));
+        });
+    },
+  },
+};
+</script>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
new file mode 100644
index 000000000..a28362c5a
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/Index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div class="column content-box">
+    <button
+      class="button nice icon success button--fixed-right-top"
+      @click="openAddPopup"
+    >
+      <i class="icon ion-android-add-circle"></i>
+      {{ $t('LABEL_MGMT.HEADER_BTN_TXT') }}
+    </button>
+    <div class="row">
+      <div class="small-8 columns">
+        <p
+          v-if="!uiFlags.isFetching && !records.length"
+          class="no-items-error-message"
+        >
+          {{ $t('LABEL_MGMT.LIST.404') }}
+        </p>
+        <woot-loading-state
+          v-if="uiFlags.isFetching"
+          :message="$t('LABEL_MGMT.LOADING')"
+        />
+        <table v-if="!uiFlags.isFetching && records.length" class="woot-table">
+          <thead>
+            <th
+              v-for="thHeader in $t('LABEL_MGMT.LIST.TABLE_HEADER')"
+              :key="thHeader"
+            >
+              {{ thHeader }}
+            </th>
+          </thead>
+          <tbody>
+            <tr v-for="(label, index) in records" :key="label.title">
+              <td>{{ label.title }}</td>
+              <td>{{ label.description }}</td>
+              <td>
+                <div class="label-color--container">
+                  <span
+                    class="label-color--display"
+                    :style="{ backgroundColor: label.color }"
+                  />
+                  {{ label.color }}
+                </div>
+              </td>
+              <td class="button-wrapper">
+                <woot-submit-button
+                  :button-text="$t('LABEL_MGMT.FORM.EDIT')"
+                  icon-class="ion-edit"
+                  button-class="link hollow grey-btn"
+                  @click="openEditPopup(label)"
+                />
+
+                <woot-submit-button
+                  :button-text="$t('LABEL_MGMT.FORM.DELETE')"
+                  :loading="loading[label.id]"
+                  icon-class="ion-close-circled"
+                  button-class="link hollow grey-btn"
+                  @click="openDeletePopup(label, index)"
+                />
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+
+      <div class="small-4 columns">
+        <span v-html="$t('LABEL_MGMT.SIDEBAR_TXT')"></span>
+      </div>
+    </div>
+
+    <add-label
+      v-if="showAddPopup"
+      :show.sync="showAddPopup"
+      :on-close="hideAddPopup"
+    />
+
+    <edit-label
+      v-if="showEditPopup"
+      :show.sync="showEditPopup"
+      :selected-response="selectedResponse"
+      :on-close="hideEditPopup"
+    />
+
+    <woot-delete-modal
+      :show.sync="showDeleteConfirmationPopup"
+      :on-close="closeDeletePopup"
+      :on-confirm="confirmDeletion"
+      :title="$t('LABEL_MGMT.DELETE.CONFIRM.TITLE')"
+      :message="deleteMessage"
+      :confirm-text="deleteConfirmText"
+      :reject-text="deleteRejectText"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex';
+
+import AddLabel from './AddLabel';
+import EditLabel from './EditLabel';
+import alertMixin from 'shared/mixins/alertMixin';
+
+export default {
+  components: {
+    AddLabel,
+    EditLabel,
+  },
+  mixins: [alertMixin],
+  data() {
+    return {
+      loading: {},
+      showAddPopup: false,
+      showEditPopup: false,
+      showDeleteConfirmationPopup: false,
+      selectedResponse: {},
+    };
+  },
+  computed: {
+    ...mapGetters({
+      records: 'labels/getLabels',
+      uiFlags: 'labels/getUIFlags',
+    }),
+    // Delete Modal
+    deleteConfirmText() {
+      return `${this.$t('LABEL_MGMT.DELETE.CONFIRM.YES')} ${
+        this.selectedResponse.title
+      }`;
+    },
+    deleteRejectText() {
+      return `${this.$t('LABEL_MGMT.DELETE.CONFIRM.NO')} ${
+        this.selectedResponse.title
+      }`;
+    },
+    deleteMessage() {
+      return `${this.$t('LABEL_MGMT.DELETE.CONFIRM.MESSAGE')} ${
+        this.selectedResponse.title
+      } ?`;
+    },
+  },
+  mounted() {
+    this.$store.dispatch('labels/get');
+  },
+  methods: {
+    openAddPopup() {
+      this.showAddPopup = true;
+    },
+    hideAddPopup() {
+      this.showAddPopup = false;
+    },
+
+    openEditPopup(response) {
+      this.showEditPopup = true;
+      this.selectedResponse = response;
+    },
+    hideEditPopup() {
+      this.showEditPopup = false;
+    },
+
+    openDeletePopup(response) {
+      this.showDeleteConfirmationPopup = true;
+      this.selectedResponse = response;
+    },
+    closeDeletePopup() {
+      this.showDeleteConfirmationPopup = false;
+    },
+
+    confirmDeletion() {
+      this.loading[this.selectedResponse.id] = true;
+      this.closeDeletePopup();
+      this.deleteLabel(this.selectedResponse.id);
+    },
+    deleteLabel(id) {
+      this.$store
+        .dispatch('labels/delete', id)
+        .then(() => {
+          this.showAlert(this.$t('LABEL_MGMT.DELETE.API.SUCCESS_MESSAGE'));
+        })
+        .catch(() => {
+          this.showAlert(this.$t('LABEL_MGMT.DELETE.API.ERROR_MESSAGE'));
+        })
+        .finally(() => {
+          this.loading[this.selectedResponse.id] = false;
+        });
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+@import '~dashboard/assets/scss/variables';
+
+.label-color--container {
+  display: flex;
+  align-items: center;
+}
+
+.label-color--display {
+  border-radius: $space-smaller;
+  height: $space-normal;
+  margin-right: $space-smaller;
+  width: $space-normal;
+}
+</style>
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/labels.routes.js b/app/javascript/dashboard/routes/dashboard/settings/labels/labels.routes.js
new file mode 100644
index 000000000..eef8d301d
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/labels.routes.js
@@ -0,0 +1,31 @@
+import SettingsContent from '../Wrapper';
+import Index from './Index';
+import { frontendURL } from '../../../../helper/URLHelper';
+
+export default {
+  routes: [
+    {
+      path: frontendURL('accounts/:accountId/settings/labels'),
+      component: SettingsContent,
+      props: {
+        headerTitle: 'LABEL_MGMT.HEADER',
+        icon: 'ion-pricetags',
+        showNewButton: false,
+      },
+      children: [
+        {
+          path: '',
+          name: 'labels_wrapper',
+          roles: ['administrator'],
+          redirect: 'list',
+        },
+        {
+          path: 'list',
+          name: 'labels_list',
+          roles: ['administrator'],
+          component: Index,
+        },
+      ],
+    },
+  ],
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validations.spec.js b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validations.spec.js
new file mode 100644
index 000000000..47c8c21df
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/specs/validations.spec.js
@@ -0,0 +1,10 @@
+import { validLabelCharacters } from '../validations';
+
+describe('#validLabelCharacters', () => {
+  it('validates the label', () => {
+    expect(validLabelCharacters('')).toEqual(false);
+    expect(validLabelCharacters('str str')).toEqual(false);
+    expect(validLabelCharacters('str_str')).toEqual(true);
+    expect(validLabelCharacters('str-str')).toEqual(true);
+  });
+});
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js b/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
new file mode 100644
index 000000000..aacd9c6eb
--- /dev/null
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
@@ -0,0 +1,16 @@
+import { required, minLength } from 'vuelidate/lib/validators';
+
+export const validLabelCharacters = (str = '') => /^[\w-_]+$/g.test(str);
+
+export default {
+  title: {
+    required,
+    minLength: minLength(2),
+    validLabelCharacters,
+  },
+  description: {},
+  color: {
+    required,
+  },
+  showOnSidebar: {},
+};
diff --git a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
index f2f0d186c..c82f5dfe4 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/settings.routes.js
@@ -1,11 +1,12 @@
 import { frontendURL } from '../../../helper/URLHelper';
+import account from './account/account.routes';
 import agent from './agents/agent.routes';
 import canned from './canned/canned.routes';
 import inbox from './inbox/inbox.routes';
+import integrations from './integrations/integrations.routes';
+import labels from './labels/labels.routes';
 import profile from './profile/profile.routes';
 import reports from './reports/reports.routes';
-import integrations from './integrations/integrations.routes';
-import account from './account/account.routes';
 import store from '../../../store';
 
 export default {
@@ -21,12 +22,13 @@ export default {
         return frontendURL('accounts/:accountId/settings/canned-response');
       },
     },
+    ...account.routes,
     ...agent.routes,
     ...canned.routes,
     ...inbox.routes,
+    ...integrations.routes,
+    ...labels.routes,
     ...profile.routes,
     ...reports.routes,
-    ...integrations.routes,
-    ...account.routes,
   ],
 };
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index de33bddb4..0f9194002 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -18,6 +18,7 @@ import globalConfig from 'shared/store/globalConfig';
 import inboxes from './modules/inboxes';
 import inboxMembers from './modules/inboxMembers';
 import integrations from './modules/integrations';
+import labels from './modules/labels';
 import reports from './modules/reports';
 import userNotificationSettings from './modules/userNotificationSettings';
 import webhooks from './modules/webhooks';
@@ -35,13 +36,14 @@ export default new Vuex.Store({
     conversationLabels,
     conversationMetadata,
     conversationPage,
-    conversationStats,
     conversations,
+    conversationStats,
     conversationTypingStatus,
     globalConfig,
     inboxes,
     inboxMembers,
     integrations,
+    labels,
     reports,
     userNotificationSettings,
     webhooks,
diff --git a/app/javascript/dashboard/store/modules/contacts.js b/app/javascript/dashboard/store/modules/contacts.js
index 01323d7d1..ba2ca8484 100644
--- a/app/javascript/dashboard/store/modules/contacts.js
+++ b/app/javascript/dashboard/store/modules/contacts.js
@@ -71,12 +71,18 @@ export const mutations = {
 
   [types.default.SET_CONTACTS]: ($state, data) => {
     data.forEach(contact => {
-      Vue.set($state.records, contact.id, contact);
+      Vue.set($state.records, contact.id, {
+        ...($state.records[contact.id] || {}),
+        ...contact,
+      });
     });
   },
 
   [types.default.SET_CONTACT_ITEM]: ($state, data) => {
-    Vue.set($state.records, data.id, data);
+    Vue.set($state.records, data.id, {
+      ...($state.records[data.id] || {}),
+      ...data,
+    });
   },
 
   [types.default.EDIT_CONTACT]: ($state, data) => {
diff --git a/app/javascript/dashboard/store/modules/conversationLabels.js b/app/javascript/dashboard/store/modules/conversationLabels.js
index ceed8d89b..89db64c7d 100644
--- a/app/javascript/dashboard/store/modules/conversationLabels.js
+++ b/app/javascript/dashboard/store/modules/conversationLabels.js
@@ -64,6 +64,12 @@ export const actions = {
       });
     }
   },
+  setBulkConversationLabels({ commit }, conversations) {
+    commit(types.default.SET_BULK_CONVERSATION_LABELS, conversations);
+  },
+  setConversationLabel({ commit }, { id, data }) {
+    commit(types.default.SET_CONVERSATION_LABELS, { id, data });
+  },
 };
 
 export const mutations = {
@@ -76,6 +82,11 @@ export const mutations = {
   [types.default.SET_CONVERSATION_LABELS]: ($state, { id, data }) => {
     Vue.set($state.records, id, data);
   },
+  [types.default.SET_BULK_CONVERSATION_LABELS]: ($state, conversations) => {
+    conversations.forEach(conversation => {
+      Vue.set($state.records, conversation.id, conversation.labels);
+    });
+  },
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index 72b46e850..e7784a13a 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -8,7 +8,7 @@ const actions = {
   getConversation: async ({ commit }, conversationId) => {
     try {
       const response = await ConversationApi.show(conversationId);
-      commit(types.default.ADD_CONVERSATION, response.data);
+      commit(types.default.UPDATE_CONVERSATION, response.data);
       commit(
         `contacts/${types.default.SET_CONTACT_ITEM}`,
         response.data.meta.sender
@@ -26,6 +26,7 @@ const actions = {
       const { payload: chatList, meta: metaData } = data;
       commit(types.default.SET_ALL_CONVERSATION, chatList);
       dispatch('conversationStats/set', metaData);
+      dispatch('conversationLabels/setBulkConversationLabels', chatList);
       commit(types.default.CLEAR_LIST_LOADING_STATUS);
       commit(
         `contacts/${types.default.SET_CONTACTS}`,
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 5896405ec..949894adf 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -142,13 +142,15 @@ const mutations = {
     if (currentConversationIndex > -1) {
       const currentConversation = {
         ...allConversations[currentConversationIndex],
-        status: conversation.status,
+        ...conversation,
       };
       Vue.set(allConversations, currentConversationIndex, currentConversation);
       if (_state.selectedChat.id === conversation.id) {
         _state.selectedChat.status = conversation.status;
         window.bus.$emit('scrollToMessage');
       }
+    } else {
+      _state.allConversations.push(conversation);
     }
   },
 
@@ -190,7 +192,7 @@ const mutations = {
   },
 
   [types.default.SET_ACTIVE_INBOX](_state, inboxId) {
-    _state.currentInbox = inboxId;
+    _state.currentInbox = inboxId ? parseInt(inboxId, 10) : null;
   },
 };
 
diff --git a/app/javascript/dashboard/store/modules/labels.js b/app/javascript/dashboard/store/modules/labels.js
new file mode 100644
index 000000000..4597ec947
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/labels.js
@@ -0,0 +1,97 @@
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
+import types from '../mutation-types';
+import LabelsAPI from '../../api/labels';
+
+export const state = {
+  records: [],
+  uiFlags: {
+    isFetching: false,
+    isFetchingItem: false,
+    isCreating: false,
+    isDeleting: false,
+  },
+};
+
+export const getters = {
+  getLabels(_state) {
+    return _state.records;
+  },
+  getUIFlags(_state) {
+    return _state.uiFlags;
+  },
+  getLabelsOnSidebar(_state) {
+    return _state.records.filter(record => record.show_on_sidebar);
+  },
+};
+
+export const actions = {
+  get: async function getLabels({ commit }) {
+    commit(types.SET_LABEL_UI_FLAG, { isFetching: true });
+    try {
+      const response = await LabelsAPI.get();
+      commit(types.SET_LABELS, response.data.payload);
+    } catch (error) {
+      // Ignore error
+    } finally {
+      commit(types.SET_LABEL_UI_FLAG, { isFetching: false });
+    }
+  },
+
+  create: async function createLabels({ commit }, cannedObj) {
+    commit(types.SET_LABEL_UI_FLAG, { isCreating: true });
+    try {
+      const response = await LabelsAPI.create(cannedObj);
+      commit(types.ADD_LABEL, response.data);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_LABEL_UI_FLAG, { isCreating: false });
+    }
+  },
+
+  update: async function updateLabels({ commit }, { id, ...updateObj }) {
+    commit(types.SET_LABEL_UI_FLAG, { isUpdating: true });
+    try {
+      const response = await LabelsAPI.update(id, updateObj);
+      commit(types.EDIT_LABEL, response.data);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_LABEL_UI_FLAG, { isUpdating: false });
+    }
+  },
+
+  delete: async function deleteLabels({ commit }, id) {
+    commit(types.SET_LABEL_UI_FLAG, { isDeleting: true });
+    try {
+      await LabelsAPI.delete(id);
+      commit(types.DELETE_LABEL, id);
+    } catch (error) {
+      throw new Error(error);
+    } finally {
+      commit(types.SET_LABEL_UI_FLAG, { isDeleting: false });
+    }
+  },
+};
+
+export const mutations = {
+  [types.SET_LABEL_UI_FLAG](_state, data) {
+    _state.uiFlags = {
+      ..._state.uiFlags,
+      ...data,
+    };
+  },
+
+  [types.SET_LABELS]: MutationHelpers.set,
+  [types.ADD_LABEL]: MutationHelpers.create,
+  [types.EDIT_LABEL]: MutationHelpers.update,
+  [types.DELETE_LABEL]: MutationHelpers.destroy,
+};
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  actions,
+  mutations,
+};
diff --git a/app/javascript/dashboard/store/modules/specs/conversationLabels/actions.spec.js b/app/javascript/dashboard/store/modules/specs/conversationLabels/actions.spec.js
index 33d1dcc44..e37d5d644 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationLabels/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationLabels/actions.spec.js
@@ -74,4 +74,33 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#setBulkConversationLabels', () => {
+    it('it send correct mutations', () => {
+      actions.setBulkConversationLabels({ commit }, [
+        { id: 1, labels: ['customer-support'] },
+      ]);
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.SET_BULK_CONVERSATION_LABELS,
+          [{ id: 1, labels: ['customer-support'] }],
+        ],
+      ]);
+    });
+  });
+
+  describe('#setBulkConversationLabels', () => {
+    it('it send correct mutations', () => {
+      actions.setConversationLabel(
+        { commit },
+        { id: 1, data: ['customer-support'] }
+      );
+      expect(commit.mock.calls).toEqual([
+        [
+          types.default.SET_CONVERSATION_LABELS,
+          { id: 1, data: ['customer-support'] },
+        ],
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/modules/specs/conversationLabels/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/conversationLabels/mutations.spec.js
index c22bc40f5..7f27c323f 100644
--- a/app/javascript/dashboard/store/modules/specs/conversationLabels/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversationLabels/mutations.spec.js
@@ -15,7 +15,7 @@ describe('#mutations', () => {
   });
 
   describe('#SET_CONVERSATION_LABELS', () => {
-    it('set contact conversation records', () => {
+    it('set contact labels', () => {
       const state = { records: {} };
       mutations[types.default.SET_CONVERSATION_LABELS](state, {
         id: 1,
@@ -26,4 +26,24 @@ describe('#mutations', () => {
       });
     });
   });
+
+  describe('#SET_BULK_CONVERSATION_LABELS', () => {
+    it('set contact labels in bulk', () => {
+      const state = { records: {} };
+      mutations[types.default.SET_BULK_CONVERSATION_LABELS](state, [
+        {
+          id: 1,
+          labels: ['customer-success', 'on-hold'],
+        },
+        {
+          id: 2,
+          labels: ['customer-success'],
+        },
+      ]);
+      expect(state.records).toEqual({
+        1: ['customer-success', 'on-hold'],
+        2: ['customer-success'],
+      });
+    });
+  });
 });
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 5c14a9e27..815beb081 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -15,7 +15,7 @@ describe('#actions', () => {
       await actions.getConversation({ commit }, 1);
       expect(commit.mock.calls).toEqual([
         [
-          types.default.ADD_CONVERSATION,
+          types.default.UPDATE_CONVERSATION,
           { id: 1, meta: { sender: { id: 1, name: 'Contact 1' } } },
         ],
         ['contacts/SET_CONTACT_ITEM', { id: 1, name: 'Contact 1' }],
diff --git a/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js b/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js
new file mode 100644
index 000000000..d6d7e63a9
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/labels/actions.spec.js
@@ -0,0 +1,94 @@
+import axios from 'axios';
+import { actions } from '../../labels';
+import * as types from '../../../mutation-types';
+import labelsList from './fixtures';
+
+const commit = jest.fn();
+global.axios = axios;
+jest.mock('axios');
+
+describe('#actions', () => {
+  describe('#get', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.get.mockResolvedValue({ data: { payload: labelsList } });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isFetching: true }],
+        [types.default.SET_LABELS, labelsList],
+        [types.default.SET_LABEL_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.get.mockRejectedValue({ message: 'Incorrect header' });
+      await actions.get({ commit });
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isFetching: true }],
+        [types.default.SET_LABEL_UI_FLAG, { isFetching: false }],
+      ]);
+    });
+  });
+
+  describe('#create', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.post.mockResolvedValue({ data: labelsList[0] });
+      await actions.create({ commit }, labelsList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isCreating: true }],
+        [types.default.ADD_LABEL, labelsList[0]],
+        [types.default.SET_LABEL_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.post.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.create({ commit })).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isCreating: true }],
+        [types.default.SET_LABEL_UI_FLAG, { isCreating: false }],
+      ]);
+    });
+  });
+
+  describe('#update', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.patch.mockResolvedValue({ data: labelsList[0] });
+      await actions.update({ commit }, labelsList[0]);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isUpdating: true }],
+        [types.default.EDIT_LABEL, labelsList[0]],
+        [types.default.SET_LABEL_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.patch.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(actions.update({ commit }, labelsList[0])).rejects.toThrow(
+        Error
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isUpdating: true }],
+        [types.default.SET_LABEL_UI_FLAG, { isUpdating: false }],
+      ]);
+    });
+  });
+
+  describe('#delete', () => {
+    it('sends correct actions if API is success', async () => {
+      axios.delete.mockResolvedValue({ data: labelsList[0] });
+      await actions.delete({ commit }, labelsList[0].id);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isDeleting: true }],
+        [types.default.DELETE_LABEL, labelsList[0].id],
+        [types.default.SET_LABEL_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+    it('sends correct actions if API is error', async () => {
+      axios.delete.mockRejectedValue({ message: 'Incorrect header' });
+      await expect(
+        actions.delete({ commit }, labelsList[0].id)
+      ).rejects.toThrow(Error);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_LABEL_UI_FLAG, { isDeleting: true }],
+        [types.default.SET_LABEL_UI_FLAG, { isDeleting: false }],
+      ]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/labels/fixtures.js b/app/javascript/dashboard/store/modules/specs/labels/fixtures.js
new file mode 100644
index 000000000..de865d233
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/labels/fixtures.js
@@ -0,0 +1,37 @@
+export default [
+  {
+    id: 1,
+    title: 'customer-support',
+    description: 'Customer support queries',
+    color: '#0076FF',
+    show_on_sidebar: true,
+  },
+  {
+    id: 4,
+    title: 'saas-customer',
+    description: 'Customers who have account on app.chatwoot.com',
+    color: '#A8DBCB',
+    show_on_sidebar: false,
+  },
+  {
+    id: 5,
+    title: 'hosted-customer',
+    description: 'Customers who have self-hosted instance',
+    color: '#F50471',
+    show_on_sidebar: false,
+  },
+  {
+    id: 6,
+    title: 'enterprise',
+    description: 'Customers who are using enterprise',
+    color: '#A90CFD',
+    show_on_sidebar: false,
+  },
+  {
+    id: 7,
+    title: 'billing-enquiry',
+    description: 'Queries on billing issues',
+    color: '#74B57A',
+    show_on_sidebar: false,
+  },
+];
diff --git a/app/javascript/dashboard/store/modules/specs/labels/getters.spec.js b/app/javascript/dashboard/store/modules/specs/labels/getters.spec.js
new file mode 100644
index 000000000..9a0d5a6c9
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/labels/getters.spec.js
@@ -0,0 +1,30 @@
+import { getters } from '../../labels';
+import labels from './fixtures';
+describe('#getters', () => {
+  it('getLabels', () => {
+    const state = { records: labels };
+    expect(getters.getLabels(state)).toEqual(labels);
+  });
+
+  it('getLabelsOnSidebar', () => {
+    const state = { records: labels };
+    expect(getters.getLabelsOnSidebar(state)).toEqual([labels[0]]);
+  });
+
+  it('getUIFlags', () => {
+    const state = {
+      uiFlags: {
+        isFetching: true,
+        isCreating: false,
+        isUpdating: false,
+        isDeleting: false,
+      },
+    };
+    expect(getters.getUIFlags(state)).toEqual({
+      isFetching: true,
+      isCreating: false,
+      isUpdating: false,
+      isDeleting: false,
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/modules/specs/labels/mutations.spec.js b/app/javascript/dashboard/store/modules/specs/labels/mutations.spec.js
new file mode 100644
index 000000000..f5c9be441
--- /dev/null
+++ b/app/javascript/dashboard/store/modules/specs/labels/mutations.spec.js
@@ -0,0 +1,39 @@
+import types from '../../../mutation-types';
+import { mutations } from '../../labels';
+import labels from './fixtures';
+describe('#mutations', () => {
+  describe('#SET_LABELS', () => {
+    it('set label records', () => {
+      const state = { records: [] };
+      mutations[types.SET_LABELS](state, labels);
+      expect(state.records).toEqual(labels);
+    });
+  });
+
+  describe('#ADD_LABEL', () => {
+    it('push newly created label to the store', () => {
+      const state = { records: [labels[0]] };
+      mutations[types.ADD_LABEL](state, labels[1]);
+      expect(state.records).toEqual([labels[0], labels[1]]);
+    });
+  });
+
+  describe('#EDIT_LABEL', () => {
+    it('update label record', () => {
+      const state = { records: [labels[0]] };
+      mutations[types.EDIT_LABEL](state, {
+        id: 1,
+        title: 'customer-support-queries',
+      });
+      expect(state.records[0].title).toEqual('customer-support-queries');
+    });
+  });
+
+  describe('#DELETE_LABEL', () => {
+    it('delete label record', () => {
+      const state = { records: [labels[0]] };
+      mutations[types.DELETE_LABEL](state, 1);
+      expect(state.records).toEqual([]);
+    });
+  });
+});
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index c65c4f829..d6e22726a 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -67,6 +67,13 @@ export default {
   EDIT_CANNED: 'EDIT_CANNED',
   DELETE_CANNED: 'DELETE_CANNED',
 
+  // Labels
+  SET_LABEL_UI_FLAG: 'SET_LABEL_UI_FLAG',
+  SET_LABELS: 'SET_LABELS',
+  ADD_LABEL: 'ADD_LABEL',
+  EDIT_LABEL: 'EDIT_LABEL',
+  DELETE_LABEL: 'DELETE_LABEL',
+
   // Integrations
   SET_INTEGRATIONS_UI_FLAG: 'SET_INTEGRATIONS_UI_FLAG',
   SET_INTEGRATIONS: 'SET_INTEGRATIONS',
@@ -92,6 +99,7 @@ export default {
   // Conversation Label
   SET_CONVERSATION_LABELS_UI_FLAG: 'SET_CONVERSATION_LABELS_UI_FLAG',
   SET_CONVERSATION_LABELS: 'SET_CONVERSATION_LABELS',
+  SET_BULK_CONVERSATION_LABELS: 'SET_BULK_CONVERSATION_LABELS',
 
   // Reports
   SET_ACCOUNT_REPORTS: 'SET_ACCOUNT_REPORTS',
diff --git a/app/models/label.rb b/app/models/label.rb
index 087e07637..9f59b194f 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -13,8 +13,19 @@
 #
 # Indexes
 #
-#  index_labels_on_account_id  (account_id)
+#  index_labels_on_account_id            (account_id)
+#  index_labels_on_title_and_account_id  (title,account_id) UNIQUE
 #
 class Label < ApplicationRecord
+  include RegexHelper
   belongs_to :account
+
+  validates :title,
+            presence: { message: 'must not be blank' },
+            format: { with: UNICODE_CHARACTER_NUMBER_HYPHEN_UNDERSCORE },
+            uniqueness: { scope: :account_id }
+
+  before_validation do
+    self.title = title.downcase if attribute_present?('title')
+  end
 end
diff --git a/app/policies/label_policy.rb b/app/policies/label_policy.rb
index 986044ce6..ad7ebe530 100644
--- a/app/policies/label_policy.rb
+++ b/app/policies/label_policy.rb
@@ -1,6 +1,6 @@
 class LabelPolicy < ApplicationPolicy
   def index?
-    @account_user.administrator?
+    @account_user.administrator? || @account_user.agent?
   end
 
   def update?
@@ -14,4 +14,8 @@ class LabelPolicy < ApplicationPolicy
   def create?
     @account_user.administrator?
   end
+
+  def destroy?
+    @account_user.administrator?
+  end
 end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 148996898..e0be1e610 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -24,3 +24,4 @@ json.agent_last_seen_at conversation.agent_last_seen_at.to_i
 json.unread_count conversation.unread_incoming_messages.count
 json.additional_attributes conversation.additional_attributes
 json.account_id conversation.account_id
+json.labels conversation.label_list
diff --git a/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb b/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb
new file mode 100644
index 000000000..02e9fcd49
--- /dev/null
+++ b/db/migrate/20200625124400_migrate_and_add_unique_index_to_labels.rb
@@ -0,0 +1,20 @@
+class MigrateAndAddUniqueIndexToLabels < ActiveRecord::Migration[6.0]
+  def change
+    add_index :labels, [:title, :account_id], unique: true
+    migrate_existing_tags
+  end
+
+  private
+
+  def migrate_existing_tags
+    ::ActsAsTaggableOn::Tag.all.each do |tag|
+      tag.taggings.each do |tagging|
+        ensure_label_for_account(tag.name, tagging.taggable.account)
+      end
+    end
+  end
+
+  def ensure_label_for_account(name, account)
+    account.labels.where(title: name.downcase).first_or_create
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 000d1e4b7..4f967e4e1 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: 2020_06_10_143132) do
+ActiveRecord::Schema.define(version: 2020_06_25_124400) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -280,6 +280,7 @@ ActiveRecord::Schema.define(version: 2020_06_10_143132) do
     t.datetime "created_at", precision: 6, null: false
     t.datetime "updated_at", precision: 6, null: false
     t.index ["account_id"], name: "index_labels_on_account_id"
+    t.index ["title", "account_id"], name: "index_labels_on_title_and_account_id", unique: true
   end
 
   create_table "messages", id: :serial, force: :cascade do |t|
diff --git a/lib/regex_helper.rb b/lib/regex_helper.rb
new file mode 100644
index 000000000..88f2b2835
--- /dev/null
+++ b/lib/regex_helper.rb
@@ -0,0 +1,8 @@
+module RegexHelper
+  # user https://rubular.com/ to quickly validate your regex
+
+  # the following regext needs atleast one character which should be
+  # valid unicode letter, unicode number, underscore, hyphen
+  # shouldn't start with a underscore or hyphen
+  UNICODE_CHARACTER_NUMBER_HYPHEN_UNDERSCORE = Regexp.new('\A[\p{L}\p{N}]+[\p{L}\p{N}_-]+\Z')
+end
diff --git a/spec/controllers/api/v1/accounts/labels_controller_spec.rb b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
index 3958390ab..083d1ec86 100644
--- a/spec/controllers/api/v1/accounts/labels_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/labels_controller_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe 'Label API', type: :request do
   end
 
   describe 'PATCH /api/v1/accounts/{account.id}/labels/:id' do
-    let(:valid_params) { { title: 'Test 2' }  }
+    let(:valid_params) { { title: 'Test_2' }  }
 
     context 'when it is an unauthenticated user' do
       it 'returns unauthorized' do
@@ -97,7 +97,7 @@ RSpec.describe 'Label API', type: :request do
               as: :json
 
         expect(response).to have_http_status(:success)
-        expect(label.reload.title).to eq('Test 2')
+        expect(label.reload.title).to eq('test_2')
       end
     end
   end
diff --git a/spec/factories/labels.rb b/spec/factories/labels.rb
index 4602a8d1d..67d4d572e 100644
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
@@ -3,6 +3,6 @@
 FactoryBot.define do
   factory :label do
     account
-    sequence(:title) { |n| "Label #{n}" }
+    sequence(:title) { |n| "Label_#{n}" }
   end
 end
diff --git a/spec/models/label_spec.rb b/spec/models/label_spec.rb
index f44b4e07e..215e9d5a6 100644
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
@@ -4,4 +4,39 @@ RSpec.describe Label, type: :model do
   describe 'associations' do
     it { is_expected.to belong_to(:account) }
   end
+
+  describe 'title validations' do
+    it 'would not let you start title without numbers or letters' do
+      label = FactoryBot.build(:label, title: '_12')
+      expect(label.valid?).to eq false
+    end
+
+    it 'would not let you use special characters' do
+      label = FactoryBot.build(:label, title: 'jell;;2_12')
+      expect(label.valid?).to eq false
+    end
+
+    it 'would not allow space' do
+      label = FactoryBot.build(:label, title: 'heeloo _12')
+      expect(label.valid?).to eq false
+    end
+
+    it 'allows foreign charactes' do
+      label = FactoryBot.build(:label, title: '学中文_12')
+      expect(label.valid?).to eq true
+    end
+
+    it 'converts uppercase letters to lowercase' do
+      label = FactoryBot.build(:label, title: 'Hello_World')
+      expect(label.valid?).to eq true
+      expect(label.title).to eq 'hello_world'
+    end
+
+    it 'validates uniqueness of label name for account' do
+      account = create(:account)
+      label = FactoryBot.create(:label, account: account)
+      duplicate_label = FactoryBot.build(:label, title: label.title, account: account)
+      expect(duplicate_label.valid?).to eq false
+    end
+  end
 end

From 0aab717bb3024d689364fca3cc17f5527cf23958 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Thu, 25 Jun 2020 21:33:56 +0530
Subject: [PATCH 31/50] Chore: Add default value for label color (#981)

---
 app/models/label.rb                                   |  2 +-
 .../20200625154254_add_default_value_to_color.rb      | 11 +++++++++++
 db/schema.rb                                          |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20200625154254_add_default_value_to_color.rb

diff --git a/app/models/label.rb b/app/models/label.rb
index 9f59b194f..edecf5922 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -3,7 +3,7 @@
 # Table name: labels
 #
 #  id              :bigint           not null, primary key
-#  color           :string
+#  color           :string           default("#1f93ff"), not null
 #  description     :text
 #  show_on_sidebar :boolean
 #  title           :string
diff --git a/db/migrate/20200625154254_add_default_value_to_color.rb b/db/migrate/20200625154254_add_default_value_to_color.rb
new file mode 100644
index 000000000..9257cc3ae
--- /dev/null
+++ b/db/migrate/20200625154254_add_default_value_to_color.rb
@@ -0,0 +1,11 @@
+class AddDefaultValueToColor < ActiveRecord::Migration[6.0]
+  def up
+    Label.where(color: nil).find_each { |u| u.update(color: '#1f93ff') }
+
+    change_column :labels, :color, :string, default: '#1f93ff', null: false
+  end
+
+  def down
+    change_column :labels, :color, :string, default: nil, null: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4f967e4e1..b3820f7c2 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: 2020_06_25_124400) do
+ActiveRecord::Schema.define(version: 2020_06_25_154254) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -274,7 +274,7 @@ ActiveRecord::Schema.define(version: 2020_06_25_124400) do
   create_table "labels", force: :cascade do |t|
     t.string "title"
     t.text "description"
-    t.string "color"
+    t.string "color", default: "#1f93ff", null: false
     t.boolean "show_on_sidebar"
     t.bigint "account_id"
     t.datetime "created_at", precision: 6, null: false

From 4f83d5451ebfa4eac865588f5b1b8c07e2201bf9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Thu, 25 Jun 2020 23:35:16 +0530
Subject: [PATCH 32/50] Chore: Routine Bugfixes and enhancements (#979)

- Fix slack scopes
- Docs for authentication
Fixes: #704 , #973
---
 .circleci/config.yml                          |  2 +-
 Gemfile.lock                                  | 36 ++++-----
 .../api/v1/accounts/labels_controller.rb      |  2 +-
 app/controllers/application_controller.rb     | 12 ++-
 app/controllers/widgets_controller.rb         |  5 ++
 app/finders/conversation_finder.rb            |  2 +-
 .../dashboard/settings/labels/validations.js  |  2 +-
 app/jobs/hook_job.rb                          |  2 +-
 app/models/message.rb                         |  6 +-
 app/services/base/send_on_channel_service.rb  | 55 ++++++++++++++
 ...service.rb => send_on_facebook_service.rb} | 33 ++-------
 ...e_service.rb => send_on_twilio_service.rb} | 19 ++---
 ..._service.rb => send_on_twitter_service.rb} | 32 +++-----
 .../partials/_conversation.json.jbuilder      |  2 +-
 config/application.rb                         |  4 -
 config/initializers/redis.rb                  |  4 +
 config/integration/apps.yml                   |  2 +-
 .../project-setup/slack-integration-setup.md  |  2 +-
 lib/integrations/slack/channel_builder.rb     |  8 +-
 .../slack/incoming_message_builder.rb         |  5 +-
 ...ge_builder.rb => send_on_slack_service.rb} | 44 +++++------
 .../integrations/apps_controller_spec.rb      |  9 ++-
 ..._spec.rb => send_on_slack_service_spec.rb} |  4 +-
 ...ec.rb => send_on_facebook_service_spec.rb} |  2 +-
 ...spec.rb => send_on_twilio_service_spec.rb} |  2 +-
 ...pec.rb => send_on_twitter_service_spec.rb} |  2 +-
 spec/spec_helper.rb                           |  2 -
 swagger/index.yml                             | 18 +++++
 .../paths/conversation/index_or_create.yml    |  3 +
 .../conversation/messages/index_create.yml    |  3 +
 swagger/paths/conversation/toggle_status.yml  |  3 +
 swagger/swagger.json                          | 74 ++++++++++++++++++-
 32 files changed, 254 insertions(+), 147 deletions(-)
 create mode 100644 app/services/base/send_on_channel_service.rb
 rename app/services/facebook/{send_reply_service.rb => send_on_facebook_service.rb} (69%)
 rename app/services/twilio/{outgoing_message_service.rb => send_on_twilio_service.rb} (65%)
 rename app/services/twitter/{send_reply_service.rb => send_on_twitter_service.rb} (71%)
 rename lib/integrations/slack/{outgoing_message_builder.rb => send_on_slack_service.rb} (51%)
 rename spec/lib/integrations/slack/{outgoing_message_builder_spec.rb => send_on_slack_service_spec.rb} (89%)
 rename spec/services/facebook/{send_reply_service_spec.rb => send_on_facebook_service_spec.rb} (98%)
 rename spec/services/twilio/{outgoing_message_service_spec.rb => send_on_twilio_service_spec.rb} (98%)
 rename spec/services/twitter/{send_reply_service_spec.rb => send_on_twitter_service_spec.rb} (98%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07f4a7991..18a7a0af9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,7 +98,7 @@ jobs:
       - run:
           name: Run backend tests
           command: |
-            bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
+            bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings) --profile=10
             ~/tmp/cc-test-reporter format-coverage -t simplecov -o ~/tmp/codeclimate.backend.json coverage/backend/.resultset.json
       - persist_to_workspace:
           root: ~/tmp
diff --git a/Gemfile.lock b/Gemfile.lock
index a71da76b2..40e05f084 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,10 +93,10 @@ GEM
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
     attr_extras (6.2.4)
-    autoprefixer-rails (9.7.6)
+    autoprefixer-rails (9.8.2)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.329.0)
+    aws-partitions (1.332.0)
     aws-sdk-core (3.100.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -105,12 +105,12 @@ GEM
     aws-sdk-kms (1.34.1)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.68.1)
+    aws-sdk-s3 (1.69.1)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -163,7 +163,7 @@ GEM
       devise (> 3.5.2, < 5)
       rails (>= 4.2.0, < 6.1)
       sprockets (= 3.7.2)
-    diff-lcs (1.3)
+    diff-lcs (1.4)
     digest-crc (0.5.1)
     docile (1.3.2)
     domain_name (0.5.20190701)
@@ -178,11 +178,11 @@ GEM
     facebook-messenger (1.5.0)
       httparty (~> 0.13, >= 0.13.7)
       rack (>= 1.4.5)
-    factory_bot (5.2.0)
-      activesupport (>= 4.2.0)
-    factory_bot_rails (5.2.0)
-      factory_bot (~> 5.2.0)
-      railties (>= 4.2.0)
+    factory_bot (6.0.2)
+      activesupport (>= 5.0.0)
+    factory_bot_rails (6.0.0)
+      factory_bot (~> 6.0.0)
+      railties (>= 5.0.0)
     faker (2.12.0)
       i18n (>= 1.6, < 2)
     faraday (1.0.1)
@@ -197,7 +197,7 @@ GEM
     gli (2.19.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-api-client (0.40.2)
+    google-api-client (0.41.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
@@ -218,7 +218,7 @@ GEM
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.12.0)
+    googleauth (0.13.0)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -306,8 +306,8 @@ GEM
     orm_adapter (0.5.0)
     os (1.1.0)
     parallel (1.19.2)
-    parser (2.7.1.3)
-      ast (~> 2.4.0)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pg (1.2.3)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -367,7 +367,7 @@ GEM
     redis-rack-cache (2.2.1)
       rack-cache (>= 1.10, < 2)
       redis-store (>= 1.6, < 2)
-    redis-store (1.8.2)
+    redis-store (1.9.0)
       redis (>= 4, < 5)
     regexp_parser (1.7.1)
     representable (3.0.4)
@@ -401,13 +401,13 @@ GEM
       rspec-mocks (~> 3.9)
       rspec-support (~> 3.9)
     rspec-support (3.9.3)
-    rubocop (0.85.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.0.3)
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (0.0.3)
diff --git a/app/controllers/api/v1/accounts/labels_controller.rb b/app/controllers/api/v1/accounts/labels_controller.rb
index 12f0d404a..12c026e66 100644
--- a/app/controllers/api/v1/accounts/labels_controller.rb
+++ b/app/controllers/api/v1/accounts/labels_controller.rb
@@ -14,7 +14,7 @@ class Api::V1::Accounts::LabelsController < Api::V1::Accounts::BaseController
   end
 
   def update
-    @label.update(permitted_params)
+    @label.update!(permitted_params)
   end
 
   def destroy
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4b22c8d32..561a797c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -59,11 +59,19 @@ class ApplicationController < ActionController::Base
     render json: exception.to_hash, status: exception.http_status
   end
 
+  def locale_from_params
+    I18n.available_locales.map(&:to_s).include?(params[:locale]) ? params[:locale] : nil
+  end
+
+  def locale_from_account(account)
+    I18n.available_locales.map(&:to_s).include?(account.locale) ? account.locale : nil
+  end
+
   def switch_locale(account)
     # priority is for locale set in query string (mostly for widget/from js sdk)
-    locale ||= (I18n.available_locales.map(&:to_s).include?(params[:locale]) ? params[:locale] : nil)
+    locale ||= locale_from_params
     # if local is not set in param, lets try account
-    locale ||= (I18n.available_locales.map(&:to_s).include?(account.locale) ? account.locale : nil)
+    locale ||= locale_from_account(account)
     I18n.locale = locale || I18n.default_locale
   end
 
diff --git a/app/controllers/widgets_controller.rb b/app/controllers/widgets_controller.rb
index 4e784ac60..c396de4ce 100644
--- a/app/controllers/widgets_controller.rb
+++ b/app/controllers/widgets_controller.rb
@@ -4,6 +4,7 @@ class WidgetsController < ActionController::Base
   before_action :set_token
   before_action :set_contact
   before_action :build_contact
+  after_action :allow_iframe_requests
 
   def index; end
 
@@ -50,4 +51,8 @@ class WidgetsController < ActionController::Base
   def permitted_params
     params.permit(:website_token, :cw_conversation)
   end
+
+  def allow_iframe_requests
+    response.headers.delete('X-Frame-Options')
+  end
 end
diff --git a/app/finders/conversation_finder.rb b/app/finders/conversation_finder.rb
index fcc0daf98..495bddf63 100644
--- a/app/finders/conversation_finder.rb
+++ b/app/finders/conversation_finder.rb
@@ -62,7 +62,7 @@ class ConversationFinder
 
   def find_all_conversations
     @conversations = current_account.conversations.includes(
-      :assignee, :contact, :inbox
+      :assignee, :inbox, contact: [:avatar_attachment]
     ).where(inbox_id: @inbox_ids)
   end
 
diff --git a/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js b/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
index aacd9c6eb..0a2373a06 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
+++ b/app/javascript/dashboard/routes/dashboard/settings/labels/validations.js
@@ -1,6 +1,6 @@
 import { required, minLength } from 'vuelidate/lib/validators';
 
-export const validLabelCharacters = (str = '') => /^[\w-_]+$/g.test(str);
+export const validLabelCharacters = (str = '') => !!str && !str.includes(' ');
 
 export default {
   title: {
diff --git a/app/jobs/hook_job.rb b/app/jobs/hook_job.rb
index f867248d8..6fc8934d2 100644
--- a/app/jobs/hook_job.rb
+++ b/app/jobs/hook_job.rb
@@ -4,7 +4,7 @@ class HookJob < ApplicationJob
   def perform(hook, message)
     return unless hook.slack?
 
-    Integrations::Slack::OutgoingMessageBuilder.perform(hook, message)
+    Integrations::Slack::SendOnSlackService.new(message: message, hook: hook).perform
   rescue StandardError => e
     Raven.capture_exception(e)
   end
diff --git a/app/models/message.rb b/app/models/message.rb
index b8678ea0a..526131098 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -138,11 +138,11 @@ class Message < ApplicationRecord
   def send_reply
     channel_name = conversation.inbox.channel.class.to_s
     if channel_name == 'Channel::FacebookPage'
-      ::Facebook::SendReplyService.new(message: self).perform
+      ::Facebook::SendOnFacebookService.new(message: self).perform
     elsif channel_name == 'Channel::TwitterProfile'
-      ::Twitter::SendReplyService.new(message: self).perform
+      ::Twitter::SendOnTwitterService.new(message: self).perform
     elsif channel_name == 'Channel::TwilioSms'
-      ::Twilio::OutgoingMessageService.new(message: self).perform
+      ::Twilio::SendOnTwilioService.new(message: self).perform
     end
   end
 
diff --git a/app/services/base/send_on_channel_service.rb b/app/services/base/send_on_channel_service.rb
new file mode 100644
index 000000000..2aeb2df09
--- /dev/null
+++ b/app/services/base/send_on_channel_service.rb
@@ -0,0 +1,55 @@
+#######################################
+# To create an external channel reply service
+# - Inherit this as the base class.
+# - Implement `channel_class` method in your child class.
+# - Implement `perform_reply` method in your child class.
+# - Implement additional custom logic for your `perform_reply` method.
+# - When required override the validation_methods.
+# - Use Childclass.new.perform.
+######################################
+class Base::SendOnChannelService
+  pattr_initialize [:message!]
+
+  def perform
+    validate_target_channel
+    return unless outgoing_message?
+    return if invalid_message?
+
+    perform_reply
+  end
+
+  private
+
+  delegate :conversation, to: :message
+  delegate :contact, :contact_inbox, :inbox, to: :conversation
+  delegate :channel, to: :inbox
+
+  def channel_class
+    raise 'Overwrite this method in child class'
+  end
+
+  def perform_reply
+    raise 'Overwrite this method in child class'
+  end
+
+  def outgoing_message_originated_from_channel?
+    # TODO: we need to refactor this logic as more integrations comes by
+    # chatwoot messages won't have source id at the moment
+    # outgoing messages may be created in slack which should be send to the channel
+    message.source_id.present? && !message.source_id.starts_with?('slack_')
+  end
+
+  def outgoing_message?
+    message.outgoing? || message.template?
+  end
+
+  def invalid_message?
+    # private notes aren't send to the channels
+    # we should also avoid the case of message loops, when outgoing messages are created from channel
+    message.private? || outgoing_message_originated_from_channel?
+  end
+
+  def validate_target_channel
+    raise 'Invalid channel service was called' if inbox.channel.class != channel_class
+  end
+end
diff --git a/app/services/facebook/send_reply_service.rb b/app/services/facebook/send_on_facebook_service.rb
similarity index 69%
rename from app/services/facebook/send_reply_service.rb
rename to app/services/facebook/send_on_facebook_service.rb
index f80f329fd..d27dfcf4d 100644
--- a/app/services/facebook/send_reply_service.rb
+++ b/app/services/facebook/send_on_facebook_service.rb
@@ -1,37 +1,14 @@
-class Facebook::SendReplyService
-  pattr_initialize [:message!]
-
-  def perform
-    return if message.private
-    return if inbox.channel.class.to_s != 'Channel::FacebookPage'
-    return unless outgoing_message_from_chatwoot?
-
-    FacebookBot::Bot.deliver(delivery_params, access_token: message.channel_token)
-  end
-
+class Facebook::SendOnFacebookService < Base::SendOnChannelService
   private
 
-  delegate :contact, to: :conversation
-
-  def inbox
-    @inbox ||= message.inbox
+  def channel_class
+    Channel::FacebookPage
   end
 
-  def conversation
-    @conversation ||= message.conversation
+  def perform_reply
+    FacebookBot::Bot.deliver(delivery_params, access_token: message.channel_token)
   end
 
-  def outgoing_message_from_chatwoot?
-    # messages sent directly from chatwoot won't have source_id.
-    (message.outgoing? || message.template?) && !message.source_id
-  end
-
-  # def reopen_lock
-  #   if message.incoming? && conversation.locked?
-  #     conversation.unlock!
-  #   end
-  # end
-
   def fb_text_message_params
     {
       recipient: { id: contact.get_source_id(inbox.id) },
diff --git a/app/services/twilio/outgoing_message_service.rb b/app/services/twilio/send_on_twilio_service.rb
similarity index 65%
rename from app/services/twilio/outgoing_message_service.rb
rename to app/services/twilio/send_on_twilio_service.rb
index 6c4371d76..684eb31fe 100644
--- a/app/services/twilio/outgoing_message_service.rb
+++ b/app/services/twilio/send_on_twilio_service.rb
@@ -1,22 +1,15 @@
-class Twilio::OutgoingMessageService
-  pattr_initialize [:message!]
+class Twilio::SendOnTwilioService < Base::SendOnChannelService
+  private
 
-  def perform
-    return if message.private
-    return if message.source_id
-    return if inbox.channel.class.to_s != 'Channel::TwilioSms'
-    return unless outgoing_message?
+  def channel_class
+    Channel::TwilioSms
+  end
 
+  def perform_reply
     twilio_message = client.messages.create(message_params)
     message.update!(source_id: twilio_message.sid)
   end
 
-  private
-
-  delegate :conversation, to: :message
-  delegate :contact, to: :conversation
-  delegate :contact_inbox, to: :conversation
-
   def message_params
     params = {
       body: message.content,
diff --git a/app/services/twitter/send_reply_service.rb b/app/services/twitter/send_on_twitter_service.rb
similarity index 71%
rename from app/services/twitter/send_reply_service.rb
rename to app/services/twitter/send_on_twitter_service.rb
index b68b3aef6..93088fb41 100644
--- a/app/services/twitter/send_reply_service.rb
+++ b/app/services/twitter/send_on_twitter_service.rb
@@ -1,16 +1,17 @@
-class Twitter::SendReplyService
+class Twitter::SendOnTwitterService < Base::SendOnChannelService
   pattr_initialize [:message!]
 
-  def perform
-    return if message.private
-    return if message.source_id
-    return if inbox.channel.class.to_s != 'Channel::TwitterProfile'
-    return unless outgoing_message_from_chatwoot?
+  private
 
-    send_reply
+  delegate :additional_attributes, to: :contact
+
+  def channel_class
+    Channel::TwitterProfile
   end
 
-  private
+  def perform_reply
+    conversation_type == 'tweet' ? send_tweet_reply : send_direct_message
+  end
 
   def twitter_client
     Twitty::Facade.new do |config|
@@ -50,19 +51,4 @@ class Twitter::SendReplyService
       Rails.logger.info 'TWITTER_TWEET_REPLY_ERROR' + response.body
     end
   end
-
-  def send_reply
-    conversation_type == 'tweet' ? send_tweet_reply : send_direct_message
-  end
-
-  def outgoing_message_from_chatwoot?
-    (message.outgoing? || message.template?)
-  end
-
-  delegate :additional_attributes, to: :contact
-  delegate :contact, to: :conversation
-  delegate :contact_inbox, to: :conversation
-  delegate :conversation, to: :message
-  delegate :inbox, to: :conversation
-  delegate :channel, to: :inbox
 end
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index e0be1e610..187348b38 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -12,7 +12,7 @@ json.id conversation.display_id
 if conversation.unread_incoming_messages.count.zero?
   json.messages [conversation.messages.last.try(:push_event_data)]
 else
-  json.messages conversation.unread_messages.map(&:push_event_data)
+  json.messages conversation.unread_messages.includes([:user, :attachments]).map(&:push_event_data)
 end
 
 json.inbox_id conversation.inbox_id
diff --git a/config/application.rb b/config/application.rb
index 436a9392f..29943a011 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -27,10 +27,6 @@ module Chatwoot
     config.generators.javascripts = false
     config.generators.stylesheets = false
 
-    config.action_dispatch.default_headers = {
-      'X-Frame-Options' => 'ALLOWALL'
-    }
-
     # Custom chatwoot configurations
     config.x = config_for(:app).with_indifferent_access
   end
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index d893b281c..c059323aa 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -7,3 +7,7 @@ redis = Rails.env.test? ? MockRedis.new : Redis.new(app_redis_config)
 # Alfred - Used currently for round robin and conversation emails.
 # Add here as you use it for more features
 $alfred = Redis::Namespace.new('alfred', redis: redis, warning: true)
+
+# https://github.com/mperham/sidekiq/issues/4591
+# TODO once sidekiq remove we can remove this
+Redis.exists_returns_integer = false
diff --git a/config/integration/apps.yml b/config/integration/apps.yml
index 30397e6bb..a63b5f606 100644
--- a/config/integration/apps.yml
+++ b/config/integration/apps.yml
@@ -3,7 +3,7 @@ slack:
   name: Slack
   logo: slack.png
   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."
-  action: https://slack.com/oauth/v2/authorize?scope=commands,chat:write,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize 
+  action: https://slack.com/oauth/v2/authorize?scope=commands,chat:write,channels:read,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history
 webhooks: 
   id: webhook
   name: Webhooks
diff --git a/docs/development/project-setup/slack-integration-setup.md b/docs/development/project-setup/slack-integration-setup.md
index 010b9ff01..492effaa7 100644
--- a/docs/development/project-setup/slack-integration-setup.md
+++ b/docs/development/project-setup/slack-integration-setup.md
@@ -16,7 +16,7 @@ Once you register your Slack App, you will have to obtain the `Client Id` and `C
 3) Head over to the `OAuth & permissions` section under `features` tab.
 4) In the redirect URLs, Add your Chatwoot installation base url.
 5) In the scopes section configure the given scopes for bot token scopes.
- `commands,chat:write,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize`
+ `commands,chat:write,channels:read,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history`
 6) Head over to the `events subscriptions` section under `features` tab.
 7) Enable events and configure the the given request url `{chatwoot installation url}/api/v1/integrations/webhooks`
 8) Subscribe to the following bot events `message.channels` , `message.groups`, `message.im`, `message.mpim`
diff --git a/lib/integrations/slack/channel_builder.rb b/lib/integrations/slack/channel_builder.rb
index 79e167598..aa2aa992a 100644
--- a/lib/integrations/slack/channel_builder.rb
+++ b/lib/integrations/slack/channel_builder.rb
@@ -17,10 +17,7 @@ class Integrations::Slack::ChannelBuilder
   end
 
   def slack_client
-    Slack.configure do |config|
-      config.token = hook.access_token
-    end
-    Slack::Web::Client.new
+    @slack_client ||= Slack::Web::Client.new(token: hook.access_token)
   end
 
   def find_or_create_channel
@@ -29,6 +26,7 @@ class Integrations::Slack::ChannelBuilder
   end
 
   def update_reference_id
-    @hook.update(reference_id: channel['id'])
+    slack_client.conversations_join(channel: channel[:id])
+    @hook.update(reference_id: channel[:id])
   end
 end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index 3b46db3d8..ab414d21f 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -89,9 +89,6 @@ class Integrations::Slack::IncomingMessageBuilder
   end
 
   def slack_client
-    Slack.configure do |config|
-      config.token = integration_hook.access_token
-    end
-    Slack::Web::Client.new
+    @slack_client ||= Slack::Web::Client.new(token: @integration_hook.access_token)
   end
 end
diff --git a/lib/integrations/slack/outgoing_message_builder.rb b/lib/integrations/slack/send_on_slack_service.rb
similarity index 51%
rename from lib/integrations/slack/outgoing_message_builder.rb
rename to lib/integrations/slack/send_on_slack_service.rb
index d3bbfb952..2a61e13f6 100644
--- a/lib/integrations/slack/outgoing_message_builder.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -1,30 +1,23 @@
-class Integrations::Slack::OutgoingMessageBuilder
-  attr_reader :hook, :message
-
-  def self.perform(hook, message)
-    new(hook, message).perform
-  end
-
-  def initialize(hook, message)
-    @hook = hook
-    @message = message
-  end
+class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
+  pattr_initialize [:message!, :hook!]
 
   def perform
-    return if message.source_id.present?
+    # overriding the base class logic since the validations are different in this case.
+    # FIXME: for now we will only send messages from widget to slack
+    return unless channel.is_a?(Channel::WebWidget)
+    # we don't want message loop in slack
+    return if message.source_id.try(:starts_with?, 'slack_')
+    # we don't want to start slack thread from agent conversation as of now
+    return if message.outgoing? && conversation.identifier.blank?
 
-    send_message
-    update_reference_id
+    perform_reply
   end
 
   private
 
-  def conversation
-    @conversation ||= message.conversation
-  end
-
-  def contact
-    @contact ||= conversation.contact
+  def perform_reply
+    send_message
+    update_reference_id
   end
 
   def agent
@@ -32,8 +25,9 @@ class Integrations::Slack::OutgoingMessageBuilder
   end
 
   def message_content
+    private_indicator = message.private? ? 'private: ' : ''
     if conversation.identifier.present?
-      message.content
+      "#{private_indicator}#{message.content}"
     else
       "*Inbox: #{message.inbox.name}* \n\n #{message.content}"
     end
@@ -59,14 +53,10 @@ class Integrations::Slack::OutgoingMessageBuilder
   def update_reference_id
     return if conversation.identifier
 
-    conversation.identifier = @slack_message['ts']
-    conversation.save!
+    conversation.update!(identifier: @slack_message['ts'])
   end
 
   def slack_client
-    Slack.configure do |config|
-      config.token = hook.access_token
-    end
-    Slack::Web::Client.new
+    @slack_client ||= Slack::Web::Client.new(token: hook.access_token)
   end
 end
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index 37b6dc254..b1ac377bb 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -14,15 +14,16 @@ RSpec.describe 'Integration Apps API', type: :request do
     context 'when it is an authenticated user' do
       let(:agent) { create(:user, account: account, role: :agent) }
 
-      it 'returns all the apps' do
+      it 'returns all active apps' do
+        first_app = Integrations::App.all.find(&:active?)
         get api_v1_account_integrations_apps_url(account),
             headers: agent.create_new_auth_token,
             as: :json
 
         expect(response).to have_http_status(:success)
-        app = JSON.parse(response.body)['payload'].first
-        expect(app['id']).to eql('webhook')
-        expect(app['name']).to eql('Webhooks')
+        apps = JSON.parse(response.body)['payload'].first
+        expect(apps['id']).to eql(first_app.id)
+        expect(apps['name']).to eql(first_app.name)
       end
     end
   end
diff --git a/spec/lib/integrations/slack/outgoing_message_builder_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
similarity index 89%
rename from spec/lib/integrations/slack/outgoing_message_builder_spec.rb
rename to spec/lib/integrations/slack/send_on_slack_service_spec.rb
index 47fd5ba41..bf083a72a 100644
--- a/spec/lib/integrations/slack/outgoing_message_builder_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Integrations::Slack::OutgoingMessageBuilder do
+describe Integrations::Slack::SendOnSlackService do
   let(:account) { create(:account) }
   let!(:inbox) { create(:inbox, account: account) }
   let!(:contact) { create(:contact) }
@@ -11,7 +11,7 @@ describe Integrations::Slack::OutgoingMessageBuilder do
 
   describe '#perform' do
     it 'sent message to slack' do
-      builder = described_class.new(hook, message)
+      builder = described_class.new(message: message, hook: hook)
       stub_request(:post, 'https://slack.com/api/chat.postMessage')
         .to_return(status: 200, body: '', headers: {})
       slack_client = double
diff --git a/spec/services/facebook/send_reply_service_spec.rb b/spec/services/facebook/send_on_facebook_service_spec.rb
similarity index 98%
rename from spec/services/facebook/send_reply_service_spec.rb
rename to spec/services/facebook/send_on_facebook_service_spec.rb
index a74f1e826..742044abd 100644
--- a/spec/services/facebook/send_reply_service_spec.rb
+++ b/spec/services/facebook/send_on_facebook_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Facebook::SendReplyService do
+describe Facebook::SendOnFacebookService do
   subject(:send_reply_service) { described_class.new(message: message) }
 
   before do
diff --git a/spec/services/twilio/outgoing_message_service_spec.rb b/spec/services/twilio/send_on_twilio_service_spec.rb
similarity index 98%
rename from spec/services/twilio/outgoing_message_service_spec.rb
rename to spec/services/twilio/send_on_twilio_service_spec.rb
index 064f3bced..56a8283c3 100644
--- a/spec/services/twilio/outgoing_message_service_spec.rb
+++ b/spec/services/twilio/send_on_twilio_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Twilio::OutgoingMessageService do
+describe Twilio::SendOnTwilioService do
   subject(:outgoing_message_service) { described_class.new(message: message) }
 
   let(:twilio_client) { instance_double(::Twilio::REST::Client) }
diff --git a/spec/services/twitter/send_reply_service_spec.rb b/spec/services/twitter/send_on_twitter_service_spec.rb
similarity index 98%
rename from spec/services/twitter/send_reply_service_spec.rb
rename to spec/services/twitter/send_on_twitter_service_spec.rb
index 140144e83..017fcf27c 100644
--- a/spec/services/twitter/send_reply_service_spec.rb
+++ b/spec/services/twitter/send_on_twitter_service_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Twitter::SendReplyService do
+describe Twitter::SendOnTwitterService do
   subject(:send_reply_service) { described_class.new(message: message) }
 
   let(:twitter_client) { instance_double(::Twitty::Facade) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 207f3bea6..d017eb0da 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,6 +14,4 @@ RSpec.configure do |config|
   end
 
   config.shared_context_metadata_behavior = :apply_to_host_groups
-
-  # config.include Rails.application.routes.url_helpers
 end
diff --git a/swagger/index.yml b/swagger/index.yml
index 5fd289f37..b00c78da7 100644
--- a/swagger/index.yml
+++ b/swagger/index.yml
@@ -17,6 +17,24 @@ produces:
 - application/json; charset=utf-8
 consumes:
 - application/json; charset=utf-8
+securityDefinitions:
+  userApiKey:
+    type: apiKey
+    in: header
+    name: api_access_token
+    description: This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user.
+  agentBotApiKey:
+    type: apiKey
+    in: header
+    name: api_access_token
+    description: This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis.
+  superAdminApiKey:
+    type: apiKey
+    in: header
+    name: api_access_token
+    description: This token is only for the system admin or obtained via rails console. This token is to be used rarely for cases like creating a pre verified user through api from external system.
+security:
+  - userApiKey: []
 
 paths:
   $ref: ./paths/index.yml
diff --git a/swagger/paths/conversation/index_or_create.yml b/swagger/paths/conversation/index_or_create.yml
index b1a2dbdd4..2afba74c8 100644
--- a/swagger/paths/conversation/index_or_create.yml
+++ b/swagger/paths/conversation/index_or_create.yml
@@ -45,6 +45,9 @@ post:
   operationId: newConversation
   summary: Create New Conversation
   description: Create conversation
+  security:
+    - userApiKey: []
+    - agentBotApiKey: []
   parameters:
     - name: data
       in: body
diff --git a/swagger/paths/conversation/messages/index_create.yml b/swagger/paths/conversation/messages/index_create.yml
index a1f9e3279..d7ccf44fe 100644
--- a/swagger/paths/conversation/messages/index_create.yml
+++ b/swagger/paths/conversation/messages/index_create.yml
@@ -30,6 +30,9 @@ post:
   operationId: conversationNewMessage
   summary: Create New Message
   description: All the agent replies are created as new messages through this endpoint
+  security:
+    - userApiKey: []
+    - agentBotApiKey: []
   parameters:
     - name: id
       in: path
diff --git a/swagger/paths/conversation/toggle_status.yml b/swagger/paths/conversation/toggle_status.yml
index e9b6be822..3ec5b43ba 100644
--- a/swagger/paths/conversation/toggle_status.yml
+++ b/swagger/paths/conversation/toggle_status.yml
@@ -4,6 +4,9 @@ post:
   operationId: conversationToggleStatus
   summary: Toggle Status
   description: Toggles the status of the conversation between open and resolved
+  security:
+    - userApiKey: []
+    - agentBotApiKey: []
   parameters:
     - name: id
       in: path
diff --git a/swagger/swagger.json b/swagger/swagger.json
index 50a255d32..2ac8cc1f2 100644
--- a/swagger/swagger.json
+++ b/swagger/swagger.json
@@ -24,6 +24,33 @@
   "consumes": [
     "application/json; charset=utf-8"
   ],
+  "securityDefinitions": {
+    "userApiKey": {
+      "type": "apiKey",
+      "in": "header",
+      "name": "api_access_token",
+      "description": "This token can be obtained by visiting the profile page or via rails console. Provides access to  endpoints based on the user permissions levels. This token can be saved by an external system when user is created via API, to perform activities on behalf of the user."
+    },
+    "agentBotApiKey": {
+      "type": "apiKey",
+      "in": "header",
+      "name": "api_access_token",
+      "description": "This token should be provided by system admin or obtained via rails console. This token can be used to build bot integrations and can only access limited apis."
+    },
+    "superAdminApiKey": {
+      "type": "apiKey",
+      "in": "header",
+      "name": "api_access_token",
+      "description": "This token is only for the system admin or obtained via rails console. This token is to be used rarely for cases like creating a pre verified user through api from external system."
+    }
+  },
+  "security": [
+    {
+      "userApiKey": [
+
+      ]
+    }
+  ],
   "paths": {
     "/accounts/{account_id}/inboxes": {
       "post": {
@@ -325,6 +352,18 @@
         "operationId": "newConversation",
         "summary": "Create New Conversation",
         "description": "Create conversation",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "name": "data",
@@ -409,6 +448,18 @@
         "operationId": "conversationToggleStatus",
         "summary": "Toggle Status",
         "description": "Toggles the status of the conversation between open and resolved",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "name": "id",
@@ -428,7 +479,8 @@
                   "type": "string",
                   "enum": [
                     "open",
-                    "resolved"
+                    "resolved",
+                    "bot"
                   ],
                   "required": true,
                   "description": "The status of the conversation"
@@ -500,6 +552,18 @@
         "operationId": "conversationNewMessage",
         "summary": "Create New Message",
         "description": "All the agent replies are created as new messages through this endpoint",
+        "security": [
+          {
+            "userApiKey": [
+
+            ]
+          },
+          {
+            "agentBotApiKey": [
+
+            ]
+          }
+        ],
         "parameters": [
           {
             "name": "id",
@@ -1035,6 +1099,14 @@
           "type": "number",
           "description": "ID of the inbox"
         },
+        "name": {
+          "type": "string",
+          "description": "The name of the inbox"
+        },
+        "website_url": {
+          "type": "string",
+          "description": "Website URL"
+        },
         "channel_type": {
           "type": "string",
           "description": "The type of the inbox"

From cc026110073267e3c0910982faf0d1d9bbda8ac3 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 27 Jun 2020 21:34:53 +0530
Subject: [PATCH 33/50] Chore: Convert Message Sender to polymorphic (#740)

Fixes #680
---
 app/actions/contact_merge_action.rb           |  2 +-
 app/builders/messages/message_builder.rb      |  3 +-
 .../messages/outgoing/normal_builder.rb       |  2 +-
 .../conversations/messages_controller.rb      |  3 +-
 .../api/v1/widget/messages_controller.rb      |  2 +-
 app/mailboxes/conversation_mailbox.rb         |  2 +-
 app/models/agent_bot.rb                       |  5 ++--
 app/models/contact.rb                         |  2 +-
 app/models/message.rb                         | 28 +++++++++----------
 app/models/user.rb                            |  2 +-
 .../twilio/incoming_message_service.rb        |  2 +-
 .../twitter/direct_message_parser_service.rb  |  2 +-
 app/services/twitter/tweet_parser_service.rb  |  2 +-
 .../messages/create.json.jbuilder             |  1 +
 .../messages/index.json.jbuilder              |  2 +-
 .../v1/widget/messages/create.json.jbuilder   |  2 +-
 .../v1/widget/messages/index.json.jbuilder    |  2 +-
 .../20200418124534_add_sender_to_messages.rb  | 25 +++++++++++++++++
 db/schema.rb                                  |  8 ++----
 .../slack/incoming_message_builder.rb         |  2 +-
 .../slack/send_on_slack_service.rb            |  6 +---
 .../widget/incoming_message_builder.rb        |  3 +-
 .../widget/outgoing_message_builder.rb        |  2 +-
 spec/actions/contact_merge_action_spec.rb     |  2 +-
 spec/factories/messages.rb                    |  2 +-
 .../slack/send_on_slack_service_spec.rb       |  2 +-
 spec/models/conversation_spec.rb              |  4 +--
 27 files changed, 71 insertions(+), 49 deletions(-)
 create mode 100644 db/migrate/20200418124534_add_sender_to_messages.rb

diff --git a/app/actions/contact_merge_action.rb b/app/actions/contact_merge_action.rb
index 343e78032..f2d9b6d06 100644
--- a/app/actions/contact_merge_action.rb
+++ b/app/actions/contact_merge_action.rb
@@ -29,7 +29,7 @@ class ContactMergeAction
   end
 
   def merge_messages
-    Message.where(contact_id: @mergee_contact.id).update(contact_id: @base_contact.id)
+    Message.where(sender: @mergee_contact).update(sender: @base_contact)
   end
 
   def merge_contact_inboxes
diff --git a/app/builders/messages/message_builder.rb b/app/builders/messages/message_builder.rb
index 0eeba6b95..a8251edb4 100644
--- a/app/builders/messages/message_builder.rb
+++ b/app/builders/messages/message_builder.rb
@@ -117,7 +117,8 @@ class Messages::MessageBuilder
       inbox_id: conversation.inbox_id,
       message_type: @message_type,
       content: response.content,
-      source_id: response.identifier
+      source_id: response.identifier,
+      sender: contact
     }
   end
 
diff --git a/app/builders/messages/outgoing/normal_builder.rb b/app/builders/messages/outgoing/normal_builder.rb
index 1b15f24c0..78572b0ee 100644
--- a/app/builders/messages/outgoing/normal_builder.rb
+++ b/app/builders/messages/outgoing/normal_builder.rb
@@ -37,7 +37,7 @@ class Messages::Outgoing::NormalBuilder
       message_type: :outgoing,
       content: @content,
       private: @private,
-      user_id: @user&.id,
+      sender: @user,
       source_id: @fb_id,
       content_type: @content_type,
       items: @items
diff --git a/app/controllers/api/v1/accounts/conversations/messages_controller.rb b/app/controllers/api/v1/accounts/conversations/messages_controller.rb
index 601db872f..c4d595771 100644
--- a/app/controllers/api/v1/accounts/conversations/messages_controller.rb
+++ b/app/controllers/api/v1/accounts/conversations/messages_controller.rb
@@ -4,7 +4,8 @@ class Api::V1::Accounts::Conversations::MessagesController < Api::V1::Accounts::
   end
 
   def create
-    mb = Messages::Outgoing::NormalBuilder.new(current_user, @conversation, params)
+    user = current_user || @resource
+    mb = Messages::Outgoing::NormalBuilder.new(user, @conversation, params)
     @message = mb.perform
   end
 
diff --git a/app/controllers/api/v1/widget/messages_controller.rb b/app/controllers/api/v1/widget/messages_controller.rb
index 366aa3912..42cd313e2 100644
--- a/app/controllers/api/v1/widget/messages_controller.rb
+++ b/app/controllers/api/v1/widget/messages_controller.rb
@@ -45,7 +45,7 @@ class Api::V1::Widget::MessagesController < Api::V1::Widget::BaseController
   def message_params
     {
       account_id: conversation.account_id,
-      contact_id: @contact.id,
+      sender: @contact,
       content: permitted_params[:message][:content],
       inbox_id: conversation.inbox_id,
       message_type: :incoming
diff --git a/app/mailboxes/conversation_mailbox.rb b/app/mailboxes/conversation_mailbox.rb
index b838ef585..da8afd519 100644
--- a/app/mailboxes/conversation_mailbox.rb
+++ b/app/mailboxes/conversation_mailbox.rb
@@ -20,7 +20,7 @@ class ConversationMailbox < ApplicationMailbox
   def create_message
     @message = @conversation.messages.create(
       account_id: @conversation.account_id,
-      contact_id: @conversation.contact_id,
+      sender: @conversation.contact,
       content: processed_mail.text_content[:reply],
       inbox_id: @conversation.inbox_id,
       message_type: 'incoming',
diff --git a/app/models/agent_bot.rb b/app/models/agent_bot.rb
index 8b27f0fcc..493c0ed0b 100644
--- a/app/models/agent_bot.rb
+++ b/app/models/agent_bot.rb
@@ -17,12 +17,13 @@ class AgentBot < ApplicationRecord
 
   has_many :agent_bot_inboxes, dependent: :destroy
   has_many :inboxes, through: :agent_bot_inboxes
+  has_many :messages, as: :sender, dependent: :restrict_with_exception
 
-  def push_event_data
+  def push_event_data(inbox = nil)
     {
       id: id,
       name: name,
-      avatar_url: avatar_url,
+      avatar_url: avatar_url || inbox&.avatar_url,
       type: 'agent_bot'
     }
   end
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 9ea82ba4c..6433ffcfa 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -35,7 +35,7 @@ class Contact < ApplicationRecord
   has_many :conversations, dependent: :destroy
   has_many :contact_inboxes, dependent: :destroy
   has_many :inboxes, through: :contact_inboxes
-  has_many :messages, dependent: :destroy
+  has_many :messages, as: :sender, dependent: :destroy
 
   before_validation :downcase_email
   after_create_commit :dispatch_create_event
diff --git a/app/models/message.rb b/app/models/message.rb
index 526131098..0ec98ac2e 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -8,28 +8,23 @@
 #  content_type       :integer          default("text")
 #  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
-#  contact_id         :bigint
 #  conversation_id    :integer          not null
 #  inbox_id           :integer          not null
+#  sender_id          :bigint
 #  source_id          :string
-#  user_id            :integer
 #
 # Indexes
 #
-#  index_messages_on_account_id       (account_id)
-#  index_messages_on_contact_id       (contact_id)
-#  index_messages_on_conversation_id  (conversation_id)
-#  index_messages_on_inbox_id         (inbox_id)
-#  index_messages_on_source_id        (source_id)
-#  index_messages_on_user_id          (user_id)
-#
-# Foreign Keys
-#
-#  fk_rails_...  (contact_id => contacts.id)
+#  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)
 #
 
 class Message < ApplicationRecord
@@ -65,8 +60,11 @@ class Message < ApplicationRecord
   belongs_to :account
   belongs_to :inbox
   belongs_to :conversation, touch: true
+
+  # FIXME: phase out user and contact after 1.4 since the info is there in sender
   belongs_to :user, required: false
   belongs_to :contact, required: false
+  belongs_to :sender, polymorphic: true, required: false
 
   has_many :attachments, dependent: :destroy, autosave: true, before_add: :validate_attachments_limit
 
@@ -88,7 +86,8 @@ class Message < ApplicationRecord
       conversation_id: conversation.display_id
     )
     data.merge!(attachments: attachments.map(&:push_event_data)) if attachments.present?
-    data.merge!(sender: user.push_event_data) if user
+    data.merge!(sender: sender.push_event_data) if sender && !sender.is_a?(AgentBot)
+    data.merge!(sender: sender.push_event_data(inbox)) if sender&.is_a?(AgentBot)
     data
   end
 
@@ -105,8 +104,7 @@ class Message < ApplicationRecord
       content_type: content_type,
       content_attributes: content_attributes,
       source_id: source_id,
-      sender: user.try(:webhook_data),
-      contact: contact.try(:webhook_data),
+      sender: sender.try(:webhook_data),
       inbox: inbox.webhook_data,
       conversation: conversation.webhook_data,
       account: account.webhook_data
diff --git a/app/models/user.rb b/app/models/user.rb
index 6157767a2..aa014852a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -65,7 +65,7 @@ class User < ApplicationRecord
   has_many :assigned_conversations, foreign_key: 'assignee_id', class_name: 'Conversation', dependent: :nullify
   has_many :inbox_members, dependent: :destroy
   has_many :inboxes, through: :inbox_members, source: :inbox
-  has_many :messages
+  has_many :messages, as: :sender
   has_many :invitees, through: :account_users, class_name: 'User', foreign_key: 'inviter_id', dependent: :nullify
 
   has_many :notifications, dependent: :destroy
diff --git a/app/services/twilio/incoming_message_service.rb b/app/services/twilio/incoming_message_service.rb
index f7a7d0f0c..c50016971 100644
--- a/app/services/twilio/incoming_message_service.rb
+++ b/app/services/twilio/incoming_message_service.rb
@@ -11,7 +11,7 @@ class Twilio::IncomingMessageService
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
       message_type: :incoming,
-      contact_id: @contact.id,
+      sender: @contact,
       source_id: params[:SmsSid]
     )
     attach_files
diff --git a/app/services/twitter/direct_message_parser_service.rb b/app/services/twitter/direct_message_parser_service.rb
index bf83958ba..04e68e590 100644
--- a/app/services/twitter/direct_message_parser_service.rb
+++ b/app/services/twitter/direct_message_parser_service.rb
@@ -12,7 +12,7 @@ class Twitter::DirectMessageParserService < Twitter::WebhooksBaseService
       account_id: @inbox.account_id,
       inbox_id: @inbox.id,
       message_type: outgoing_message? ? :outgoing : :incoming,
-      contact_id: @contact.id,
+      sender: @contact,
       source_id: direct_message_data['id']
     )
   end
diff --git a/app/services/twitter/tweet_parser_service.rb b/app/services/twitter/tweet_parser_service.rb
index 84ea87ff4..def65d35e 100644
--- a/app/services/twitter/tweet_parser_service.rb
+++ b/app/services/twitter/tweet_parser_service.rb
@@ -73,7 +73,7 @@ class Twitter::TweetParserService < Twitter::WebhooksBaseService
     set_conversation
     @conversation.messages.create(
       account_id: @inbox.account_id,
-      contact_id: @contact.id,
+      sender: @contact,
       content: tweet_text,
       inbox_id: @inbox.id,
       message_type: message_type,
diff --git a/app/views/api/v1/accounts/conversations/messages/create.json.jbuilder b/app/views/api/v1/accounts/conversations/messages/create.json.jbuilder
index 0dc5b827e..4c3eff2a9 100644
--- a/app/views/api/v1/accounts/conversations/messages/create.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/messages/create.json.jbuilder
@@ -7,4 +7,5 @@ json.content_type @message.content_type
 json.content_attributes @message.content_attributes
 json.created_at @message.created_at.to_i
 json.private @message.private
+json.sender @message.sender.push_event_data
 json.attachments @message.attachments.map(&:push_event_data) if @message.attachments.present?
diff --git a/app/views/api/v1/accounts/conversations/messages/index.json.jbuilder b/app/views/api/v1/accounts/conversations/messages/index.json.jbuilder
index e04a7dd9c..a89ea7f0c 100644
--- a/app/views/api/v1/accounts/conversations/messages/index.json.jbuilder
+++ b/app/views/api/v1/accounts/conversations/messages/index.json.jbuilder
@@ -17,6 +17,6 @@ json.payload do
     json.private message.private
     json.source_id message.source_id
     json.attachments message.attachments.map(&:push_event_data) if message.attachments.present?
-    json.sender message.user.push_event_data if message.user
+    json.sender message.sender.push_event_data if message.sender
   end
 end
diff --git a/app/views/api/v1/widget/messages/create.json.jbuilder b/app/views/api/v1/widget/messages/create.json.jbuilder
index ff442b304..57276bdf1 100644
--- a/app/views/api/v1/widget/messages/create.json.jbuilder
+++ b/app/views/api/v1/widget/messages/create.json.jbuilder
@@ -7,4 +7,4 @@ json.created_at @message.created_at.to_i
 json.private @message.private
 json.source_id @message.source_id
 json.attachments @message.attachments.map(&:push_event_data) if @message.attachments.present?
-json.sender @message.user.push_event_data if @message.user
+json.sender @message.sender.push_event_data if @message.sender
diff --git a/app/views/api/v1/widget/messages/index.json.jbuilder b/app/views/api/v1/widget/messages/index.json.jbuilder
index f6491991c..a0462b545 100644
--- a/app/views/api/v1/widget/messages/index.json.jbuilder
+++ b/app/views/api/v1/widget/messages/index.json.jbuilder
@@ -7,5 +7,5 @@ json.array! @messages do |message|
   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.user.push_event_data if message.user
+  json.sender message.sender.push_event_data if message.sender
 end
diff --git a/db/migrate/20200418124534_add_sender_to_messages.rb b/db/migrate/20200418124534_add_sender_to_messages.rb
new file mode 100644
index 000000000..02efdc4a5
--- /dev/null
+++ b/db/migrate/20200418124534_add_sender_to_messages.rb
@@ -0,0 +1,25 @@
+class AddSenderToMessages < ActiveRecord::Migration[6.0]
+  def change
+    add_reference :messages, :sender, polymorphic: true, index: true
+    add_sender_from_message
+    remove_index :messages, name: 'index_messages_on_contact_id', column: 'contact_id'
+    remove_index :messages, name: 'index_messages_on_user_id', column: 'user_id'
+    remove_column :messages, :user_id, :integer # rubocop:disable Rails/BulkChangeTable
+    remove_column :messages, :contact_id, :integer
+  end
+
+  def add_sender_from_message
+    ::Message.find_in_batches do |messages_batch|
+      Rails.logger.info "migrated till #{messages_batch.first.id}\n"
+      messages_batch.each do |message|
+        # rubocop:disable Rails/SkipsModelValidations
+        message.update_columns(sender_id: message.user.id, sender_type: 'User') if message.user.present?
+        message.update_columns(sender_id: message.contact.id, sender_type: 'Contact') if message.contact.present?
+        if message.sender.nil?
+          message.update_columns(sender_id: message.conversation.contact.id, sender_type: 'Contact') if message.incoming?
+        end
+        # rubocop:enable Rails/SkipsModelValidations
+      end
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index b3820f7c2..87d6ea781 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -292,18 +292,17 @@ ActiveRecord::Schema.define(version: 2020_06_25_154254) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "private", default: false
-    t.integer "user_id"
     t.integer "status", default: 0
     t.string "source_id"
     t.integer "content_type", default: 0
     t.json "content_attributes", default: {}
-    t.bigint "contact_id"
+    t.string "sender_type"
+    t.bigint "sender_id"
     t.index ["account_id"], name: "index_messages_on_account_id"
-    t.index ["contact_id"], name: "index_messages_on_contact_id"
     t.index ["conversation_id"], name: "index_messages_on_conversation_id"
     t.index ["inbox_id"], name: "index_messages_on_inbox_id"
+    t.index ["sender_type", "sender_id"], name: "index_messages_on_sender_type_and_sender_id"
     t.index ["source_id"], name: "index_messages_on_source_id"
-    t.index ["user_id"], name: "index_messages_on_user_id"
   end
 
   create_table "notification_settings", force: :cascade do |t|
@@ -436,5 +435,4 @@ ActiveRecord::Schema.define(version: 2020_06_25_154254) do
   add_foreign_key "contact_inboxes", "contacts"
   add_foreign_key "contact_inboxes", "inboxes"
   add_foreign_key "conversations", "contact_inboxes"
-  add_foreign_key "messages", "contacts"
 end
diff --git a/lib/integrations/slack/incoming_message_builder.rb b/lib/integrations/slack/incoming_message_builder.rb
index ab414d21f..e7ebd735f 100644
--- a/lib/integrations/slack/incoming_message_builder.rb
+++ b/lib/integrations/slack/incoming_message_builder.rb
@@ -82,7 +82,7 @@ class Integrations::Slack::IncomingMessageBuilder
       content: params[:event][:text],
       source_id: "slack_#{params[:event][:ts]}",
       private: private_note?,
-      user: sender
+      sender: sender
     )
 
     { status: 'success' }
diff --git a/lib/integrations/slack/send_on_slack_service.rb b/lib/integrations/slack/send_on_slack_service.rb
index 2a61e13f6..4c5bb46c6 100644
--- a/lib/integrations/slack/send_on_slack_service.rb
+++ b/lib/integrations/slack/send_on_slack_service.rb
@@ -20,10 +20,6 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
     update_reference_id
   end
 
-  def agent
-    @agent ||= message.user
-  end
-
   def message_content
     private_indicator = message.private? ? 'private: ' : ''
     if conversation.identifier.present?
@@ -38,7 +34,7 @@ class Integrations::Slack::SendOnSlackService < Base::SendOnChannelService
   end
 
   def send_message
-    sender = message.outgoing? ? agent : contact
+    sender = message.sender
     sender_type = sender.class == Contact ? 'Contact' : 'Agent'
 
     @slack_message = slack_client.chat_postMessage(
diff --git a/lib/integrations/widget/incoming_message_builder.rb b/lib/integrations/widget/incoming_message_builder.rb
index abc14aafa..82bc303f3 100644
--- a/lib/integrations/widget/incoming_message_builder.rb
+++ b/lib/integrations/widget/incoming_message_builder.rb
@@ -51,7 +51,8 @@ class Integrations::Widget::IncomingMessageBuilder
       account_id: conversation.account_id,
       inbox_id: conversation.inbox_id,
       message_type: 0,
-      content: options[:content]
+      content: options[:content],
+      sender: contact
     }
   end
 end
diff --git a/lib/integrations/widget/outgoing_message_builder.rb b/lib/integrations/widget/outgoing_message_builder.rb
index fb76f67d6..5791ea64e 100644
--- a/lib/integrations/widget/outgoing_message_builder.rb
+++ b/lib/integrations/widget/outgoing_message_builder.rb
@@ -46,7 +46,7 @@ class Integrations::Widget::OutgoingMessageBuilder
       inbox_id: @conversation.inbox_id,
       message_type: 1,
       content: options[:content],
-      user_id: user.id
+      sender: user
     }
   end
 end
diff --git a/spec/actions/contact_merge_action_spec.rb b/spec/actions/contact_merge_action_spec.rb
index 8afbdf6b4..815518ae3 100644
--- a/spec/actions/contact_merge_action_spec.rb
+++ b/spec/actions/contact_merge_action_spec.rb
@@ -10,7 +10,7 @@ describe ::ContactMergeAction do
   before do
     2.times.each { create(:conversation, contact: base_contact) }
     2.times.each { create(:conversation, contact: mergee_contact) }
-    2.times.each { create(:message, contact: mergee_contact) }
+    2.times.each { create(:message, sender: mergee_contact) }
   end
 
   describe '#perform' do
diff --git a/spec/factories/messages.rb b/spec/factories/messages.rb
index 6f9e37a5d..236095a0a 100644
--- a/spec/factories/messages.rb
+++ b/spec/factories/messages.rb
@@ -9,7 +9,7 @@ FactoryBot.define do
     account { create(:account) }
 
     after(:build) do |message|
-      message.user ||= create(:user, account: message.account)
+      message.sender ||= create(:user, account: message.account)
       message.conversation ||= create(:conversation, account: message.account)
       message.inbox ||= create(:inbox, account: message.account)
     end
diff --git a/spec/lib/integrations/slack/send_on_slack_service_spec.rb b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
index bf083a72a..a709c2ce0 100644
--- a/spec/lib/integrations/slack/send_on_slack_service_spec.rb
+++ b/spec/lib/integrations/slack/send_on_slack_service_spec.rb
@@ -20,7 +20,7 @@ describe Integrations::Slack::SendOnSlackService do
       expect(slack_client).to receive(:chat_postMessage).with(
         channel: hook.reference_id,
         text: message.content,
-        username: "Contact: #{contact.name}",
+        username: "Agent: #{message.sender.name}",
         thread_ts: conversation.identifier,
         icon_url: anything
       )
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index c92ed10d1..629b5fbf5 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -254,7 +254,7 @@ RSpec.describe Conversation, type: :model do
         conversation: conversation,
         account: conversation.account,
         inbox: conversation.inbox,
-        user: conversation.assignee
+        sender: conversation.assignee
       }
     end
     let!(:message) do
@@ -279,7 +279,7 @@ RSpec.describe Conversation, type: :model do
         conversation: conversation,
         account: conversation.account,
         inbox: conversation.inbox,
-        user: conversation.assignee,
+        sender: conversation.assignee,
         created_at: 1.minute.ago
       }
     end

From 534409d25a2e1920102ef530f0390e601e67ecbd Mon Sep 17 00:00:00 2001
From: Mohmmd <7905931+mohmmd256@users.noreply.github.com>
Date: Wed, 1 Jul 2020 10:46:08 +0200
Subject: [PATCH 34/50] Enhancement: Use Tahoma as fallback for Arabic
 characters (#991)

---
 app/javascript/dashboard/assets/scss/_foundation-settings.scss | 1 +
 app/javascript/widget/assets/scss/_variables.scss              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/javascript/dashboard/assets/scss/_foundation-settings.scss b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
index afa81cd80..9d3650f88 100644
--- a/app/javascript/dashboard/assets/scss/_foundation-settings.scss
+++ b/app/javascript/dashboard/assets/scss/_foundation-settings.scss
@@ -67,6 +67,7 @@ BlinkMacSystemFont,
 "Segoe UI",
 Roboto,
 "Helvetica Neue",
+Tahoma,
 Arial,
 sans-serif;
 $body-antialiased: true;
diff --git a/app/javascript/widget/assets/scss/_variables.scss b/app/javascript/widget/assets/scss/_variables.scss
index 5d4154315..7c3ba1a9b 100755
--- a/app/javascript/widget/assets/scss/_variables.scss
+++ b/app/javascript/widget/assets/scss/_variables.scss
@@ -99,6 +99,7 @@ BlinkMacSystemFont,
 "Segoe UI",
 Roboto,
 "Helvetica Neue",
+Tahoma,
 Arial,
 sans-serif;
 $ionicons-font-path: '~ionicons/fonts';

From 83be2e1edb3945a064bd0a106211ac4ffa350922 Mon Sep 17 00:00:00 2001
From: WevrLabs <66124192+WevrLabs@users.noreply.github.com>
Date: Wed, 1 Jul 2020 11:10:21 +0200
Subject: [PATCH 35/50] Enhancement: Improve the UX for unread conversations
 (#986)

Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 .../dashboard/assets/scss/widgets/_conversation-card.scss     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 498a5e9d2..39e4b4464 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -120,11 +120,11 @@
     }
 
     .conversation--message {
-      font-weight: $font-weight-medium;
+      font-weight: $font-weight-bold;
     }
 
     .conversation--user {
-      font-weight: $font-weight-medium;
+      font-weight: $font-weight-bold;
     }
   }
 

From a699d7bdfe6239f8157817f9a3528a4c2be8ed67 Mon Sep 17 00:00:00 2001
From: Steven Buccini <stevenbuccini@users.noreply.github.com>
Date: Wed, 1 Jul 2020 13:32:59 -0400
Subject: [PATCH 36/50] Update documentation with Sendgrid instructions (#994)

Add information about how to integrate with Sendgrid.
---
 .../project-setup/environment-variables.md            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/development/project-setup/environment-variables.md b/docs/development/project-setup/environment-variables.md
index 899abebaf..3ec78a956 100644
--- a/docs/development/project-setup/environment-variables.md
+++ b/docs/development/project-setup/environment-variables.md
@@ -41,6 +41,17 @@ SMTP_USERNAME=
 SMTP_PASSWORD=
 ```
 
+If you would like to use Sendgrid to send your emails, use the following environment variables:
+```bash
+SMTP_ADDRESS=smtp.sendgrid.net
+SMTP_AUTHENTICATION=plain
+SMTP_DOMAIN=<your verified domain>
+SMTP_ENABLE_STARTTLS_AUTO=true
+SMTP_PASSWORD=<your Sendgrid API key>
+SMTP_PORT=587
+SMTP_USERNAME=apikey
+```
+
 ### Configure frontend URL
 
 Provide the following value as frontend url

From c0cd747f29e8acf4a0fbe6a69589af5a877abb86 Mon Sep 17 00:00:00 2001
From: Sabin <neymarsabin@users.noreply.github.com>
Date: Thu, 2 Jul 2020 12:13:02 +0545
Subject: [PATCH 37/50] Bug: Fix duplicate messages while using `enter` key on
 slow network (#987)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .../dashboard/components/widgets/conversation/ReplyBox.vue   | 5 +++--
 db/seeds.rb                                                  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index c74854ff3..b11b22057 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -212,18 +212,19 @@ export default {
       if (this.message.length > this.maxLength) {
         return;
       }
+      const newMessage = this.message;
       if (!this.showCannedResponsesList) {
+        this.clearMessage();
         try {
           await this.$store.dispatch('sendMessage', {
             conversationId: this.currentChat.id,
-            message: this.message,
+            message: newMessage,
             private: this.isPrivate,
           });
           this.$emit('scrollToMessage');
         } catch (error) {
           // Error
         }
-        this.clearMessage();
         this.hideEmojiPicker();
       }
     },
diff --git a/db/seeds.rb b/db/seeds.rb
index 62eddc327..b56da8239 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -35,3 +35,4 @@ conversation = Conversation.create!(
   additional_attributes: {}
 )
 Message.create!(content: 'Hello', account: account, inbox: inbox, conversation: conversation, message_type: :incoming)
+CannedResponse.create!(account: account, short_code: 'start', content: 'Hello welcome to chatwoot.')

From 1b1deb9626ef6d59ab3baca4edae7c7255d0178c Mon Sep 17 00:00:00 2001
From: Mohmmd <7905931+mohmmd256@users.noreply.github.com>
Date: Fri, 3 Jul 2020 19:47:39 +0200
Subject: [PATCH 38/50] Proposed Enhancements for Chat Bubble Looks in the
 Dashboard (#992)

* Update Private Note border color

* Added box-shadow to chat bubbles

* Adjustments as suggested in PR #992

Adjustments as suggested in PR #992

* Reintroduced @include border-normal; in L-253

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .../dashboard/assets/scss/widgets/_conversation-view.scss       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
index 12d0f21a9..8c615a016 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-view.scss
@@ -309,7 +309,7 @@
 
       &.is-private {
         background: lighten($warning-color, 32%);
-        border: 1px solid $color-border;
+        border: 1px solid lighten($warning-color, 15%);
         color: $color-heading;
         padding-right: $space-large;
         position: relative;

From bd879275765e12a7d7d6728a2190297a12714ec1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Fri, 3 Jul 2020 23:25:33 +0530
Subject: [PATCH 39/50] Add icon show last reply is from agent on conversation
 list #997

---
 .../assets/scss/widgets/_conversation-card.scss          | 5 +++++
 .../components/widgets/conversation/ConversationCard.vue | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
index 39e4b4464..95fcf7699 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_conversation-card.scss
@@ -78,6 +78,11 @@
       font-size: $font-size-mini;
       vertical-align: top;
     }
+
+    .message-from-agent {
+      color: $color-gray;
+      font-size: $font-size-mini;
+    }
   }
 
   .conversation--meta {
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 0f3a2cd66..4e1d631b9 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -24,6 +24,7 @@
         </span>
       </h4>
       <p v-if="lastMessageInChat" class="conversation--message">
+        <i v-if="messageByAgent" class="ion-ios-undo message-from-agent"></i>
         <span v-if="lastMessageInChat.content">
           {{ lastMessageInChat.content }}
         </span>
@@ -44,6 +45,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
+import { MESSAGE_TYPE } from 'widget/helpers/constants';
+
 import Thumbnail from '../Thumbnail';
 import conversationMixin from '../../../mixins/conversations';
 import timeMixin from '../../../mixins/time';
@@ -115,6 +118,12 @@ export default {
     lastMessageInChat() {
       return this.lastMessage(this.chat);
     },
+
+    messageByAgent() {
+      const lastMessage = this.lastMessageInChat;
+      const { message_type: messageType } = lastMessage;
+      return messageType === MESSAGE_TYPE.OUTGOING;
+    },
   },
 
   methods: {

From c98907db499563a4dd08761c69b7ead59d21be17 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 4 Jul 2020 11:42:47 +0530
Subject: [PATCH 40/50] Feature: Availability Statuses (#874)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 app/channels/room_channel.rb                  | 40 ++++++++++++--
 app/controllers/api/v1/profiles_controller.rb |  2 +-
 app/javascript/dashboard/api/auth.js          | 17 +++---
 .../dashboard/components/layout/Sidebar.vue   |  6 ++-
 .../components/widgets/Thumbnail.vue          | 25 ++++++---
 .../widgets/conversation/ConversationCard.vue |  1 +
 .../conversation/ConversationHeader.vue       |  1 +
 .../dashboard/helper/actionCable.js           |  6 +++
 .../dashboard/i18n/locale/en/settings.json    | 17 ++++++
 .../dashboard/settings/profile/Index.vue      | 29 +++++++---
 .../dashboard/store/modules/agents.js         |  8 +++
 .../dashboard/store/modules/contacts.js       | 19 +++++++
 .../modules/specs/agents/actions.spec.js      | 12 +++++
 .../modules/specs/agents/mutations.spec.js    | 36 +++++++++++++
 .../dashboard/store/mutation-types.js         |  2 +
 .../helpers/BaseActionCableConnector.js       | 13 ++++-
 .../shared/helpers/vuex/mutationHelpers.js    | 11 ++++
 app/javascript/widget/helpers/actionCable.js  |  5 ++
 app/javascript/widget/store/modules/agent.js  |  5 ++
 .../store/modules/specs/agent/actions.spec.js |  5 ++
 .../modules/specs/agent/mutations.spec.js     | 33 +++++++++++-
 .../concerns/availability_statusable.rb       | 15 ++++--
 app/models/user.rb                            | 15 +++++-
 .../v1/accounts/contacts/index.json.jbuilder  |  7 +--
 .../v1/accounts/contacts/show.json.jbuilder   |  8 +--
 .../v1/accounts/contacts/update.json.jbuilder |  7 +--
 .../api/v1/models/_contact.json.jbuilder      |  7 +++
 app/views/api/v1/models/_user.json.jbuilder   |  1 +
 config/cable.yml                              | 15 +++---
 ...20200629122646_add_availability_to_user.rb |  5 ++
 db/schema.rb                                  |  3 +-
 lib/online_status_tracker.rb                  | 53 +++++++++++++++----
 lib/redis/alfred.rb                           | 45 ++++++++++++++++
 spec/channels/room_channel_spec.rb            |  6 +--
 .../api/v1/profiles_controller_spec.rb        | 10 ++++
 35 files changed, 413 insertions(+), 77 deletions(-)
 create mode 100644 app/views/api/v1/models/_contact.json.jbuilder
 create mode 100644 db/migrate/20200629122646_add_availability_to_user.rb

diff --git a/app/channels/room_channel.rb b/app/channels/room_channel.rb
index df1a05d6b..1a0cbb434 100644
--- a/app/channels/room_channel.rb
+++ b/app/channels/room_channel.rb
@@ -1,10 +1,42 @@
 class RoomChannel < ApplicationCable::Channel
   def subscribed
-    stream_from params[:pubsub_token]
-    ::OnlineStatusTracker.add_subscription(params[:pubsub_token])
+    ensure_stream
+    current_user
+    current_account
+    update_subscription
   end
 
-  def unsubscribed
-    ::OnlineStatusTracker.remove_subscription(params[:pubsub_token])
+  def update_presence
+    update_subscription
+    data = { account_id: @current_account.id, users: ::OnlineStatusTracker.get_available_users(@current_account.id) }
+    data[:contacts] = ::OnlineStatusTracker.get_available_contacts(@current_account.id) if @current_user.is_a? User
+    ActionCable.server.broadcast(@pubsub_token, { event: 'presence.update', data: data })
+  end
+
+  private
+
+  def ensure_stream
+    @pubsub_token = params[:pubsub_token]
+    stream_from @pubsub_token
+  end
+
+  def update_subscription
+    ::OnlineStatusTracker.update_presence(@current_account.id, @current_user.class.name, @current_user.id)
+  end
+
+  def current_user
+    @current_user ||= if params[:user_id].blank?
+                        Contact.find_by!(pubsub_token: @pubsub_token)
+                      else
+                        User.find_by!(pubsub_token: @pubsub_token, id: params[:user_id])
+                      end
+  end
+
+  def current_account
+    @current_account ||= if @current_user.is_a? Contact
+                           @current_user.account
+                         else
+                           @current_user.accounts.find(params[:account_id])
+                         end
   end
 end
diff --git a/app/controllers/api/v1/profiles_controller.rb b/app/controllers/api/v1/profiles_controller.rb
index bd415ffeb..38f1a9b3b 100644
--- a/app/controllers/api/v1/profiles_controller.rb
+++ b/app/controllers/api/v1/profiles_controller.rb
@@ -16,6 +16,6 @@ class Api::V1::ProfilesController < Api::BaseController
   end
 
   def profile_params
-    params.require(:profile).permit(:email, :name, :password, :password_confirmation, :avatar)
+    params.require(:profile).permit(:email, :name, :password, :password_confirmation, :avatar, :availability)
   end
 end
diff --git a/app/javascript/dashboard/api/auth.js b/app/javascript/dashboard/api/auth.js
index f247089cd..42d1fbc41 100644
--- a/app/javascript/dashboard/api/auth.js
+++ b/app/javascript/dashboard/api/auth.js
@@ -118,21 +118,18 @@ export default {
     return axios.post(urlData.url, { email });
   },
 
-  profileUpdate({ name, email, password, password_confirmation, avatar }) {
+  profileUpdate({ password, password_confirmation, ...profileAttributes }) {
     const formData = new FormData();
-    if (name) {
-      formData.append('profile[name]', name);
-    }
-    if (email) {
-      formData.append('profile[email]', email);
-    }
+    Object.keys(profileAttributes).forEach(key => {
+      const value = profileAttributes[key];
+      if (value) {
+        formData.append(`profile[${key}]`, value);
+      }
+    });
     if (password && password_confirmation) {
       formData.append('profile[password]', password);
       formData.append('profile[password_confirmation]', password_confirmation);
     }
-    if (avatar) {
-      formData.append('profile[avatar]', avatar);
-    }
     return axios.put(endPoints('profileUpdate').url, formData);
   },
 };
diff --git a/app/javascript/dashboard/components/layout/Sidebar.vue b/app/javascript/dashboard/components/layout/Sidebar.vue
index 4ec6c239f..d6ab8a75d 100644
--- a/app/javascript/dashboard/components/layout/Sidebar.vue
+++ b/app/javascript/dashboard/components/layout/Sidebar.vue
@@ -56,7 +56,11 @@
         </div>
       </transition>
       <div class="current-user" @click.prevent="showOptions()">
-        <thumbnail :src="currentUser.avatar_url" :username="currentUser.name" />
+        <thumbnail
+          :src="currentUser.avatar_url"
+          :username="currentUser.name"
+          :status="currentUser.availability_status"
+        />
         <div class="current-user--data">
           <h3 class="current-user--name">
             {{ currentUser.name }}
diff --git a/app/javascript/dashboard/components/widgets/Thumbnail.vue b/app/javascript/dashboard/components/widgets/Thumbnail.vue
index 25b707c04..2d1c3e200 100644
--- a/app/javascript/dashboard/components/widgets/Thumbnail.vue
+++ b/app/javascript/dashboard/components/widgets/Thumbnail.vue
@@ -21,11 +21,6 @@
       :style="badgeStyle"
       src="~dashboard/assets/images/fb-badge.png"
     />
-    <div
-      v-else-if="status === 'online'"
-      class="source-badge user--online"
-      :style="statusStyle"
-    ></div>
     <img
       v-if="badge === 'Channel::TwitterProfile'"
       id="badge"
@@ -33,7 +28,6 @@
       :style="badgeStyle"
       src="~dashboard/assets/images/twitter-badge.png"
     />
-
     <img
       v-if="badge === 'Channel::TwilioSms'"
       id="badge"
@@ -41,6 +35,11 @@
       :style="badgeStyle"
       src="~dashboard/assets/images/channels/whatsapp.png"
     />
+    <div
+      v-if="showStatusIndicator"
+      :class="`source-badge user-online-status user-online-status--${status}`"
+      :style="statusStyle"
+    />
   </div>
 </template>
 <script>
@@ -89,6 +88,9 @@ export default {
     };
   },
   computed: {
+    showStatusIndicator() {
+      return this.status === 'online' || this.status === 'busy';
+    },
     avatarSize() {
       return Number(this.size.replace(/\D+/g, ''));
     },
@@ -150,8 +152,7 @@ export default {
     width: $space-slab;
   }
 
-  .user--online {
-    background: $success-color;
+  .user-online-status {
     border-radius: 50%;
     bottom: $space-micro;
 
@@ -159,5 +160,13 @@ export default {
       content: ' ';
     }
   }
+
+  .user-online-status--online {
+    background: $success-color;
+  }
+
+  .user-online-status--busy {
+    background: $warning-color;
+  }
 }
 </style>
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 4e1d631b9..301717b51 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -10,6 +10,7 @@
       :badge="currentContact.channel"
       class="columns"
       :username="currentContact.name"
+      :status="currentContact.availability_status"
       size="40px"
     />
     <div class="conversation--details columns">
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 8be30ff68..90409a1fc 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -6,6 +6,7 @@
         size="40px"
         :badge="currentContact.channel"
         :username="currentContact.name"
+        :status="currentContact.availability_status"
       />
       <div class="user--profile__meta">
         <h3 v-if="!isContactPanelOpen" class="user--name text-truncate">
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 107f85637..5d6abf359 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -18,6 +18,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'conversation.typing_on': this.onTypingOn,
       'conversation.typing_off': this.onTypingOff,
       'conversation.contact_changed': this.onConversationContactChange,
+      'presence.update': this.onPresenceUpdate,
     };
   }
 
@@ -29,6 +30,11 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('updateMessage', data);
   };
 
+  onPresenceUpdate = data => {
+    this.app.$store.dispatch('contacts/updatePresence', data.contacts);
+    this.app.$store.dispatch('agents/updatePresence', data.users);
+  };
+
   onConversationContactChange = payload => {
     const { meta = {}, id: conversationId } = payload;
     const { sender } = meta || {};
diff --git a/app/javascript/dashboard/i18n/locale/en/settings.json b/app/javascript/dashboard/i18n/locale/en/settings.json
index 67470727f..6ab397d63 100644
--- a/app/javascript/dashboard/i18n/locale/en/settings.json
+++ b/app/javascript/dashboard/i18n/locale/en/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Please enter a valid name",
         "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Your email address",
         "ERROR": "Please enter a valid email address",
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 03944cd2a..17d7ed037 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -38,6 +38,19 @@
               {{ $t('PROFILE_SETTINGS.FORM.EMAIL.ERROR') }}
             </span>
           </label>
+          <label>
+            {{ $t('PROFILE_SETTINGS.FORM.AVAILABILITY.LABEL') }}
+            <select v-model="availability">
+              <option
+                v-for="status in availabilityStatuses"
+                :key="status.key"
+                class="text-capitalize"
+                :value="status.value"
+              >
+                {{ status.label }}
+              </option>
+            </select>
+          </label>
         </div>
       </div>
       <div class="profile--settings--row row">
@@ -99,16 +112,17 @@
 </template>
 
 <script>
-/* global bus */
 import { required, minLength, email } from 'vuelidate/lib/validators';
 import { mapGetters } from 'vuex';
 import { clearCookiesOnLogout } from '../../../../store/utils/api';
 import NotificationSettings from './NotificationSettings';
+import alertMixin from 'shared/mixins/alertMixin';
 
 export default {
   components: {
     NotificationSettings,
   },
+  mixin: [alertMixin],
   data() {
     return {
       avatarFile: '',
@@ -117,7 +131,11 @@ export default {
       email: '',
       password: '',
       passwordConfirmation: '',
+      availability: 'online',
       isUpdating: false,
+      availabilityStatuses: this.$t(
+        'PROFILE_SETTINGS.FORM.AVAILABILITY.STATUSES_LIST'
+      ),
     };
   },
   validations: {
@@ -164,11 +182,12 @@ export default {
       this.name = this.currentUser.name;
       this.email = this.currentUser.email;
       this.avatarUrl = this.currentUser.avatar_url;
+      this.availability = this.currentUser.availability_status;
     },
     async updateUser() {
       this.$v.$touch();
       if (this.$v.$invalid) {
-        bus.$emit('newToastMessage', this.$t('PROFILE_SETTINGS.FORM.ERROR'));
+        this.showAlert(this.$t('PROFILE_SETTINGS.FORM.ERROR'));
         return;
       }
       this.isUpdating = true;
@@ -179,15 +198,13 @@ export default {
           email: this.email,
           avatar: this.avatarFile,
           password: this.password,
+          availability: this.availability,
           password_confirmation: this.passwordConfirmation,
         });
         this.isUpdating = false;
         if (hasEmailChanged) {
           clearCookiesOnLogout();
-          bus.$emit(
-            'newToastMessage',
-            this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED')
-          );
+          this.showAlert(this.$t('PROFILE_SETTINGS.AFTER_EMAIL_CHANGED'));
         }
       } catch (error) {
         this.isUpdating = false;
diff --git a/app/javascript/dashboard/store/modules/agents.js b/app/javascript/dashboard/store/modules/agents.js
index 6807a6c45..61be40559 100644
--- a/app/javascript/dashboard/store/modules/agents.js
+++ b/app/javascript/dashboard/store/modules/agents.js
@@ -57,6 +57,13 @@ export const actions = {
       throw new Error(error);
     }
   },
+
+  updatePresence: async ({ commit }, data) => {
+    commit(types.default.SET_AGENT_UPDATING_STATUS, true);
+    commit(types.default.UPDATE_AGENTS_PRESENCE, data);
+    commit(types.default.SET_AGENT_UPDATING_STATUS, false);
+  },
+
   delete: async ({ commit }, agentId) => {
     commit(types.default.SET_AGENT_DELETING_STATUS, true);
     try {
@@ -88,6 +95,7 @@ export const mutations = {
   [types.default.ADD_AGENT]: MutationHelpers.create,
   [types.default.EDIT_AGENT]: MutationHelpers.update,
   [types.default.DELETE_AGENT]: MutationHelpers.destroy,
+  [types.default.UPDATE_AGENTS_PRESENCE]: MutationHelpers.updatePresence,
 };
 
 export default {
diff --git a/app/javascript/dashboard/store/modules/contacts.js b/app/javascript/dashboard/store/modules/contacts.js
index ba2ca8484..8f88639ea 100644
--- a/app/javascript/dashboard/store/modules/contacts.js
+++ b/app/javascript/dashboard/store/modules/contacts.js
@@ -59,6 +59,10 @@ export const actions = {
       throw new Error(error);
     }
   },
+
+  updatePresence: ({ commit }, data) => {
+    commit(types.default.UPDATE_CONTACTS_PRESENCE, data);
+  },
 };
 
 export const mutations = {
@@ -88,6 +92,21 @@ export const mutations = {
   [types.default.EDIT_CONTACT]: ($state, data) => {
     Vue.set($state.records, data.id, data);
   },
+
+  [types.default.UPDATE_CONTACTS_PRESENCE]: ($state, data) => {
+    Object.values($state.records).forEach(element => {
+      const availabilityStatus = data[element.id];
+      if (availabilityStatus) {
+        Vue.set(
+          $state.records[element.id],
+          'availability_status',
+          availabilityStatus
+        );
+      } else {
+        Vue.delete($state.records[element.id], 'availability_status');
+      }
+    });
+  },
 };
 
 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 54d55bacf..206ae9dfe 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/actions.spec.js
@@ -93,4 +93,16 @@ 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);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_AGENT_UPDATING_STATUS, true],
+        [types.default.UPDATE_AGENTS_PRESENCE, data],
+        [types.default.SET_AGENT_UPDATING_STATUS, false],
+      ]);
+    });
+  });
 });
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 d019f337b..00b569aaf 100644
--- a/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/agents/mutations.spec.js
@@ -60,4 +60,40 @@ describe('#mutations', () => {
       expect(state.records).toEqual([]);
     });
   });
+
+  describe('#UPDATE_AGENTS_PRESENCE', () => {
+    it('updates agent presence', () => {
+      const state = {
+        records: [
+          {
+            id: 1,
+            name: 'Agent1',
+            email: 'agent1@chatwoot.com',
+            availability_status: 'offline',
+          },
+          {
+            id: 2,
+            name: 'Agent1',
+            email: 'agent1@chatwoot.com',
+            availability_status: 'online',
+          },
+        ],
+      };
+
+      mutations[types.default.UPDATE_AGENTS_PRESENCE](state, { '1': 'busy' });
+      expect(state.records).toEqual([
+        {
+          id: 1,
+          name: 'Agent1',
+          email: 'agent1@chatwoot.com',
+          availability_status: 'busy',
+        },
+        {
+          id: 2,
+          name: 'Agent1',
+          email: 'agent1@chatwoot.com',
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index d6e22726a..473304986 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -59,6 +59,7 @@ export default {
   ADD_AGENT: 'ADD_AGENT',
   EDIT_AGENT: 'EDIT_AGENT',
   DELETE_AGENT: 'DELETE_AGENT',
+  UPDATE_AGENTS_PRESENCE: 'UPDATE_AGENTS_PRESENCE',
 
   // Canned Response
   SET_CANNED_UI_FLAG: 'SET_CANNED_UI_FLAG',
@@ -91,6 +92,7 @@ export default {
   SET_CONTACT_ITEM: 'SET_CONTACT_ITEM',
   SET_CONTACTS: 'SET_CONTACTS',
   EDIT_CONTACT: 'EDIT_CONTACT',
+  UPDATE_CONTACTS_PRESENCE: 'UPDATE_CONTACTS_PRESENCE',
 
   // Contact Conversation
   SET_CONTACT_CONVERSATIONS_UI_FLAG: 'SET_CONTACT_CONVERSATIONS_UI_FLAG',
diff --git a/app/javascript/shared/helpers/BaseActionCableConnector.js b/app/javascript/shared/helpers/BaseActionCableConnector.js
index c601d4164..ed0c1bb65 100644
--- a/app/javascript/shared/helpers/BaseActionCableConnector.js
+++ b/app/javascript/shared/helpers/BaseActionCableConnector.js
@@ -1,20 +1,31 @@
 import { createConsumer } from '@rails/actioncable';
 
+const PRESENCE_INTERVAL = 60000;
+
 class BaseActionCableConnector {
   constructor(app, pubsubToken) {
     this.consumer = createConsumer();
-    this.consumer.subscriptions.create(
+    this.subscription = this.consumer.subscriptions.create(
       {
         channel: 'RoomChannel',
         pubsub_token: pubsubToken,
+        account_id: app.$store.getters.getCurrentAccountId,
+        user_id: app.$store.getters.getCurrentUserID,
       },
       {
+        updatePresence() {
+          this.perform('update_presence');
+        },
         received: this.onReceived,
       }
     );
     this.app = app;
     this.events = {};
     this.isAValidEvent = () => true;
+
+    setInterval(() => {
+      this.subscription.updatePresence();
+    }, PRESENCE_INTERVAL);
   }
 
   disconnect() {
diff --git a/app/javascript/shared/helpers/vuex/mutationHelpers.js b/app/javascript/shared/helpers/vuex/mutationHelpers.js
index 577d02bef..9822c0224 100644
--- a/app/javascript/shared/helpers/vuex/mutationHelpers.js
+++ b/app/javascript/shared/helpers/vuex/mutationHelpers.js
@@ -34,6 +34,17 @@ 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');
+    }
+  });
+};
+
 export const destroy = (state, id) => {
   state.records = state.records.filter(record => record.id !== id);
 };
diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index c4ab32b27..35ca89bfd 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -10,6 +10,7 @@ class ActionCableConnector extends BaseActionCableConnector {
       'conversation.typing_off': this.onTypingOff,
       'conversation.resolved': this.onStatusChange,
       'conversation.opened': this.onStatusChange,
+      'presence.update': this.onPresenceUpdate,
     };
   }
 
@@ -25,6 +26,10 @@ class ActionCableConnector extends BaseActionCableConnector {
     this.app.$store.dispatch('conversation/updateMessage', data);
   };
 
+  onPresenceUpdate = data => {
+    this.app.$store.dispatch('agent/updatePresence', data.users);
+  };
+
   onTypingOn = () => {
     this.clearTimer();
     this.app.$store.dispatch('conversation/toggleAgentTyping', {
diff --git a/app/javascript/widget/store/modules/agent.js b/app/javascript/widget/store/modules/agent.js
index 2cdde0e0c..85b44bac8 100644
--- a/app/javascript/widget/store/modules/agent.js
+++ b/app/javascript/widget/store/modules/agent.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import { getAvailableAgents } from 'widget/api/agent';
+import * as MutationHelpers from 'shared/helpers/vuex/mutationHelpers';
 
 const state = {
   records: [],
@@ -27,12 +28,16 @@ export const actions = {
       commit('setHasFetched', true);
     }
   },
+  updatePresence: async ({ commit }, data) => {
+    commit('updatePresence', data);
+  },
 };
 
 export const mutations = {
   setAgents($state, data) {
     Vue.set($state, 'records', data);
   },
+  updatePresence: MutationHelpers.updatePresence,
   setError($state, value) {
     Vue.set($state.uiFlags, 'isError', value);
   },
diff --git a/app/javascript/widget/store/modules/specs/agent/actions.spec.js b/app/javascript/widget/store/modules/specs/agent/actions.spec.js
index 5f1400dee..4e61b18d6 100644
--- a/app/javascript/widget/store/modules/specs/agent/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/agent/actions.spec.js
@@ -25,4 +25,9 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#updatePresence', () => {
+    actions.updatePresence({ commit }, { 1: 'online' });
+    expect(commit.mock.calls).toEqual([['updatePresence', { 1: 'online' }]]);
+  });
 });
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 77bf5ac18..5d1ddaaa7 100644
--- a/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
+++ b/app/javascript/widget/store/modules/specs/agent/mutations.spec.js
@@ -1,5 +1,5 @@
 import { mutations } from '../../agent';
-import agents from './data';
+import { agents } from './data';
 
 describe('#mutations', () => {
   describe('#setAgents', () => {
@@ -25,4 +25,35 @@ describe('#mutations', () => {
       expect(state.uiFlags.hasFetched).toEqual(true);
     });
   });
+
+  describe('#updatePresence', () => {
+    it('updates agent presence', () => {
+      const state = { records: agents };
+      mutations.updatePresence(state, { 1: 'busy', 2: 'online' });
+      expect(state.records).toEqual([
+        {
+          id: 1,
+          name: 'John',
+          avatar_url: '',
+          availability_status: 'busy',
+        },
+        {
+          id: 2,
+          name: 'Xavier',
+          avatar_url: '',
+          availability_status: 'online',
+        },
+        {
+          id: 3,
+          name: 'Pranav',
+          avatar_url: '',
+        },
+        {
+          id: 4,
+          name: 'Nithin',
+          avatar_url: '',
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/models/concerns/availability_statusable.rb b/app/models/concerns/availability_statusable.rb
index c7a3541e2..2f1589bc3 100644
--- a/app/models/concerns/availability_statusable.rb
+++ b/app/models/concerns/availability_statusable.rb
@@ -1,11 +1,20 @@
 module AvailabilityStatusable
   extend ActiveSupport::Concern
 
-  def online?
-    ::OnlineStatusTracker.subscription_count(pubsub_token) != 0
+  def online_presence?
+    ::OnlineStatusTracker.get_presence(availability_account_id, self.class.name, id)
   end
 
   def availability_status
-    online? ? 'online' : 'offline'
+    return 'offline' unless online_presence?
+    return 'online' if is_a? Contact
+
+    ::OnlineStatusTracker.get_status(availability_account_id, id) || 'online'
+  end
+
+  def availability_account_id
+    return account_id if is_a? Contact
+
+    Current.account.present? ? Current.account.id : accounts.first.id
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index aa014852a..b025fabea 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,6 +3,7 @@
 # Table name: users
 #
 #  id                     :integer          not null, primary key
+#  availability           :integer          default(0)
 #  confirmation_sent_at   :datetime
 #  confirmation_token     :string
 #  confirmed_at           :datetime
@@ -53,6 +54,8 @@ class User < ApplicationRecord
          :validatable,
          :confirmable
 
+  enum availability: { online: 0, offline: 1, busy: 2 }
+
   # The validation below has been commented out as it does not
   # work because :validatable in devise overrides this.
   # validates_uniqueness_of :email, scope: :account_id
@@ -75,6 +78,7 @@ class User < ApplicationRecord
   before_validation :set_password_and_uid, on: :create
 
   after_create :create_access_token
+  after_save :update_presence_in_redis, if: :saved_change_to_availability?
 
   def send_devise_notification(notification, *args)
     devise_mailer.send(notification, self, *args).deliver_later
@@ -126,7 +130,8 @@ class User < ApplicationRecord
       id: id,
       name: name,
       avatar_url: avatar_url,
-      type: 'user'
+      type: 'user',
+      availability_status: availability_status
     }
   end
 
@@ -138,4 +143,12 @@ class User < ApplicationRecord
       type: 'user'
     }
   end
+
+  private
+
+  def update_presence_in_redis
+    accounts.each do |account|
+      OnlineStatusTracker.set_status(account.id, id, availability)
+    end
+  end
 end
diff --git a/app/views/api/v1/accounts/contacts/index.json.jbuilder b/app/views/api/v1/accounts/contacts/index.json.jbuilder
index a162fdd82..892e5fbdd 100644
--- a/app/views/api/v1/accounts/contacts/index.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/index.json.jbuilder
@@ -1,10 +1,5 @@
 json.payload do
   json.array! @contacts do |contact|
-    json.id contact.id
-    json.name contact.name
-    json.email contact.email
-    json.phone_number contact.phone_number
-    json.thumbnail contact.avatar_url
-    json.additional_attributes contact.additional_attributes
+    json.partial! 'api/v1/models/contact.json.jbuilder', resource: contact
   end
 end
diff --git a/app/views/api/v1/accounts/contacts/show.json.jbuilder b/app/views/api/v1/accounts/contacts/show.json.jbuilder
index e4cb9b016..276a6323e 100644
--- a/app/views/api/v1/accounts/contacts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/show.json.jbuilder
@@ -1,9 +1,3 @@
 json.payload do
-  json.availability_status @contact.availability_status
-  json.email @contact.email
-  json.id @contact.id
-  json.name @contact.name
-  json.phone_number @contact.phone_number
-  json.thumbnail @contact.avatar_url
-  json.additional_attributes @contact.additional_attributes
+  json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact
 end
diff --git a/app/views/api/v1/accounts/contacts/update.json.jbuilder b/app/views/api/v1/accounts/contacts/update.json.jbuilder
index 086375760..276a6323e 100644
--- a/app/views/api/v1/accounts/contacts/update.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/update.json.jbuilder
@@ -1,8 +1,3 @@
 json.payload do
-  json.id @contact.id
-  json.name @contact.name
-  json.email @contact.email
-  json.phone_number @contact.phone_number
-  json.thumbnail @contact.avatar_url
-  json.additional_attributes @contact.additional_attributes
+  json.partial! 'api/v1/models/contact.json.jbuilder', resource: @contact
 end
diff --git a/app/views/api/v1/models/_contact.json.jbuilder b/app/views/api/v1/models/_contact.json.jbuilder
new file mode 100644
index 000000000..a9152712e
--- /dev/null
+++ b/app/views/api/v1/models/_contact.json.jbuilder
@@ -0,0 +1,7 @@
+json.additional_attributes resource.additional_attributes
+json.availability_status resource.availability_status
+json.email resource.email
+json.id resource.id
+json.name resource.name
+json.phone_number resource.phone_number
+json.thumbnail resource.avatar_url
diff --git a/app/views/api/v1/models/_user.json.jbuilder b/app/views/api/v1/models/_user.json.jbuilder
index 5638fc233..3efb6470b 100644
--- a/app/views/api/v1/models/_user.json.jbuilder
+++ b/app/views/api/v1/models/_user.json.jbuilder
@@ -11,6 +11,7 @@ json.inviter_id resource.active_account_user&.inviter_id
 json.confirmed resource.confirmed?
 json.avatar_url resource.avatar_url
 json.access_token resource.access_token.token
+json.availability_status resource.availability_status
 json.accounts do
   json.array! resource.account_users do |account_user|
     json.id account_user.account_id
diff --git a/config/cable.yml b/config/cable.yml
index cd363f0d5..6bb7a7844 100644
--- a/config/cable.yml
+++ b/config/cable.yml
@@ -1,17 +1,18 @@
-development:
+default: &default
   adapter: redis
   url: <%= ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379') %>
   password: <%= ENV.fetch('REDIS_PASSWORD', nil).presence %>
+  channel_prefix: <%= "chatwoot_#{Rails.env}_action_cable"  %>
+
+development:
+  <<: *default
 
 test:
   adapter: test
+  channel_prefix: <%= "chatwoot_#{Rails.env}_action_cable"  %>
 
 staging:
-  adapter: redis
-  url: <%= ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379') %>
-  password: <%= ENV.fetch('REDIS_PASSWORD', nil).presence %>
+  <<: *default
 
 production:
-  adapter: redis
-  url: <%= ENV.fetch('REDIS_URL', 'redis://127.0.0.1:6379') %>
-  password: <%= ENV.fetch('REDIS_PASSWORD', nil).presence %>
+  <<: *default
diff --git a/db/migrate/20200629122646_add_availability_to_user.rb b/db/migrate/20200629122646_add_availability_to_user.rb
new file mode 100644
index 000000000..dd062af15
--- /dev/null
+++ b/db/migrate/20200629122646_add_availability_to_user.rb
@@ -0,0 +1,5 @@
+class AddAvailabilityToUser < ActiveRecord::Migration[6.0]
+  def change
+    add_column :users, :availability, :integer, default: 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 87d6ea781..6db971114 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: 2020_06_25_154254) do
+ActiveRecord::Schema.define(version: 2020_06_29_122646) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"
@@ -413,6 +413,7 @@ ActiveRecord::Schema.define(version: 2020_06_25_154254) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.string "pubsub_token"
+    t.integer "availability", default: 0
     t.index ["email"], name: "index_users_on_email"
     t.index ["pubsub_token"], name: "index_users_on_pubsub_token", unique: true
     t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index fa66453ad..32069dd93 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -1,19 +1,50 @@
 module OnlineStatusTracker
-  def self.add_subscription(channel_id)
-    count = subscription_count(channel_id)
-    ::Redis::Alfred.setex(channel_id, count + 1)
+  PRESENCE_DURATION = 60.seconds
+
+  # presence : sorted set with timestamp as the score & object id as value
+
+  # obj_type: Contact | User
+  def self.update_presence(account_id, obj_type, obj_id)
+    ::Redis::Alfred.zadd(presence_key(account_id, obj_type), Time.now.to_i, obj_id)
   end
 
-  def self.remove_subscription(channel_id)
-    count = subscription_count(channel_id)
-    if count == 1
-      ::Redis::Alfred.delete(channel_id)
-    elsif count != 0
-      ::Redis::Alfred.setex(channel_id, count - 1)
+  def self.get_presence(account_id, obj_type, obj_id)
+    connected_time = ::Redis::Alfred.zscore(presence_key(account_id, obj_type), obj_id)
+    connected_time && connected_time > (Time.zone.now - PRESENCE_DURATION).to_i
+  end
+
+  def self.presence_key(account_id, type)
+    case type
+    when 'Contact'
+      Redis::Alfred::ONLINE_PRESENCE_CONTACTS % account_id
+    else
+      Redis::Alfred::ONLINE_PRESENCE_USERS % account_id
     end
   end
 
-  def self.subscription_count(channel_id)
-    ::Redis::Alfred.get(channel_id).to_i
+  # online status : online | busy | offline
+  # redis hash with obj_id key && status as value
+
+  def self.set_status(account_id, user_id, status)
+    ::Redis::Alfred.hset(status_key(account_id), user_id, status)
+  end
+
+  def self.get_status(account_id, user_id)
+    ::Redis::Alfred.hget(status_key(account_id), user_id)
+  end
+
+  def self.status_key(account_id)
+    Redis::Alfred::ONLINE_STATUS % account_id
+  end
+
+  def self.get_available_contacts(account_id)
+    contact_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'Contact'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    contact_ids.index_with { |_id| 'online' }
+  end
+
+  def self.get_available_users(account_id)
+    user_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'User'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    user_availabilities = ::Redis::Alfred.hmget(status_key(account_id), user_ids)
+    user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || 'online')] }.to_h
   end
 end
diff --git a/lib/redis/alfred.rb b/lib/redis/alfred.rb
index d811df028..e1274a59b 100644
--- a/lib/redis/alfred.rb
+++ b/lib/redis/alfred.rb
@@ -1,6 +1,13 @@
 module Redis::Alfred
   CONVERSATION_MAILER_KEY = 'CONVERSATION::%d'.freeze
 
+  # hash containing user_id key and status as value ONLINE_STATUS::%accountid
+  ONLINE_STATUS = 'ONLINE_STATUS::%s'.freeze
+  # sorted set storing online presense of account contacts : ONLINE_PRESENCE::%accountid::CONTACTS
+  ONLINE_PRESENCE_CONTACTS = 'ONLINE_PRESENCE::%s::CONTACTS'.freeze
+  # sorted set storing online presense of account users : ONLINE_PRESENCE::%accountid::USERS
+  ONLINE_PRESENCE_USERS = 'ONLINE_PRESENCE::%s::USERS'.freeze
+
   class << self
     def rpoplpush(source, destination)
       $alfred.rpoplpush(source, destination)
@@ -22,8 +29,46 @@ module Redis::Alfred
       $alfred.setex(key, expiry, value)
     end
 
+    def set(key, value)
+      $alfred.set(key, value)
+    end
+
     def get(key)
       $alfred.get(key)
     end
+
+    # hash operation
+
+    # add a key value to redis hash
+    def hset(key, field, value)
+      $alfred.hset(key, field, value)
+    end
+
+    # get value from redis hash
+    def hget(key, field)
+      $alfred.hget(key, field)
+    end
+
+    # get values of multiple keys from redis hash
+    def hmget(key, fields)
+      $alfred.hmget(key, *fields)
+    end
+
+    # sorted set functions
+
+    # add score and value for a key
+    def zadd(key, score, value)
+      $alfred.zadd(key, score, value)
+    end
+
+    # get score of a value for key
+    def zscore(key, value)
+      $alfred.zscore(key, value)
+    end
+
+    # get values by score
+    def zrangebyscore(key, range_start, range_end)
+      $alfred.zrangebyscore(key, range_start, range_end)
+    end
   end
 end
diff --git a/spec/channels/room_channel_spec.rb b/spec/channels/room_channel_spec.rb
index e50aaebe4..8cac85ce6 100644
--- a/spec/channels/room_channel_spec.rb
+++ b/spec/channels/room_channel_spec.rb
@@ -1,15 +1,15 @@
 require 'rails_helper'
 
 RSpec.describe RoomChannel, type: :channel do
-  let!(:user) { create(:user) }
+  let!(:contact) { create(:contact) }
 
   before do
     stub_connection
   end
 
   it 'subscribes to a stream when pubsub_token is provided' do
-    subscribe(pubsub_token: user.uid)
+    subscribe(pubsub_token: contact.pubsub_token)
     expect(subscription).to be_confirmed
-    expect(subscription).to have_stream_for(user.uid)
+    expect(subscription).to have_stream_for(contact.pubsub_token)
   end
 end
diff --git a/spec/controllers/api/v1/profiles_controller_spec.rb b/spec/controllers/api/v1/profiles_controller_spec.rb
index a2226d68b..b8e2b60f9 100644
--- a/spec/controllers/api/v1/profiles_controller_spec.rb
+++ b/spec/controllers/api/v1/profiles_controller_spec.rb
@@ -77,6 +77,16 @@ RSpec.describe 'Profile API', type: :request do
         agent.reload
         expect(agent.avatar.attached?).to eq(true)
       end
+
+      it 'updates the availability status' do
+        put '/api/v1/profile',
+            params: { profile: { availability: 'offline' } },
+            headers: agent.create_new_auth_token,
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        expect(::OnlineStatusTracker.get_status(account.id, agent.id)).to eq('offline')
+      end
     end
   end
 end

From 36661ea45db4266e82b8b8c6ef4e69eedd09b1f1 Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Sat, 4 Jul 2020 13:50:44 +0530
Subject: [PATCH 41/50] Enhancement: Add focus state for reply box in dashboard
 (#999)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 .scss-lint.yml                                |  2 +-
 .../assets/scss/_helper-classes.scss          |  2 +-
 .../dashboard/assets/scss/_mixins.scss        | 35 ++++++++++++-------
 .../assets/scss/widgets/_reply-box.scss       | 13 ++++---
 .../widgets/conversation/ReplyBox.vue         | 10 +++++-
 5 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/.scss-lint.yml b/.scss-lint.yml
index 481d94c70..19fae0cf1 100644
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -51,7 +51,7 @@ linters:
 
   ElsePlacement:
     enabled: true
-    style: same_line # or 'new_line'
+    style: new_line
 
   EmptyLineBetweenBlocks:
     enabled: true
diff --git a/app/javascript/dashboard/assets/scss/_helper-classes.scss b/app/javascript/dashboard/assets/scss/_helper-classes.scss
index d34d30beb..ffd9e734e 100644
--- a/app/javascript/dashboard/assets/scss/_helper-classes.scss
+++ b/app/javascript/dashboard/assets/scss/_helper-classes.scss
@@ -25,7 +25,7 @@
   width: $space-medium;
 
   &.message {
-    @include elegent-shadow;
+    @include normal-shadow;
     background: $color-white;
     border-radius: $space-large;
     left: 0;
diff --git a/app/javascript/dashboard/assets/scss/_mixins.scss b/app/javascript/dashboard/assets/scss/_mixins.scss
index e4efee5ca..9bf19e1c2 100644
--- a/app/javascript/dashboard/assets/scss/_mixins.scss
+++ b/app/javascript/dashboard/assets/scss/_mixins.scss
@@ -1,6 +1,5 @@
 @import '~widget/assets/scss/mixins';
 
-$elegant-shadow-color: rgba(49, 49, 93, 0.15);
 $spinner-before-border-color: rgba(255, 255, 255, 0.7);
 
 //borders
@@ -141,12 +140,8 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
   overflow-y: auto;
 }
 
-@mixin elegent-shadow() {
-  box-shadow: 0 10px 25px 0 $elegant-shadow-color;
-}
-
 @mixin elegant-card() {
-  @include elegent-shadow;
+  @include normal-shadow;
   border-radius: $space-small;
 }
 
@@ -194,28 +189,42 @@ $spinner-before-border-color: rgba(255, 255, 255, 0.7);
     border-bottom: $size solid $color;
     border-left: $size solid transparent;
     border-right: $size solid transparent;
-  } @else if $direction == 'right' {
+  }
+
+  @else if $direction == 'right' {
     border-bottom: $size solid transparent;
     border-left: $size solid $color;
     border-top: $size solid transparent;
-  } @else if $direction == 'bottom' {
+  }
+
+  @else if $direction == 'bottom' {
     border-left: $size solid transparent;
     border-right: $size solid transparent;
     border-top: $size solid $color;
-  } @else if $direction == 'left' {
+  }
+
+  @else if $direction == 'left' {
     border-bottom: $size solid transparent;
     border-right: $size solid $color;
     border-top: $size solid transparent;
-  } @else if $direction == 'top-left' {
+  }
+
+  @else if $direction == 'top-left' {
     border-right: $size solid transparent;
     border-top: $size solid $color;
-  } @else if $direction == 'top-right' {
+  }
+
+  @else if $direction == 'top-right' {
     border-left: $size solid transparent;
     border-top: $size solid $color;
-  } @else if $direction == 'bottom-left' {
+  }
+
+  @else if $direction == 'bottom-left' {
     border-bottom: $size solid $color;
     border-right: $size solid transparent;
-  } @else if $direction == 'bottom-right' {
+  }
+
+  @else if $direction == 'bottom-right' {
     border-bottom: $size solid $color;
     border-left: $size solid transparent;
   }
diff --git a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
index f5322ac92..29ba3c66c 100644
--- a/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
+++ b/app/javascript/dashboard/assets/scss/widgets/_reply-box.scss
@@ -1,10 +1,15 @@
 .reply-box {
-  @include elegant-card;
+  @include light-shadow;
   border-bottom: 0;
+  border-radius: $space-small;
   margin: $space-normal;
   margin-top: 0;
   max-height: $space-mega * 3;
-  transition: height 2s $ease-in-out-cubic;
+  transition: box-shadow .35s $ease-in-out-cubic, height 2s $ease-in-out-cubic;
+
+  &.is-focused {
+    @include normal-shadow;
+  }
 
   .reply-box__top {
     @include flex;
@@ -42,7 +47,7 @@
     &.is-private {
       background: lighten($warning-color, 38%);
 
-      >input {
+      > input {
         background: lighten($warning-color, 38%);
       }
     }
@@ -58,7 +63,7 @@
       }
     }
 
-    .file-uploads>label {
+    .file-uploads > label {
       cursor: pointer;
     }
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index b11b22057..c1aa4c718 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="reply-box">
+  <div class="reply-box" :class="replyBoxClass">
     <div class="reply-box__top" :class="{ 'is-private': isPrivate }">
       <canned-response
         v-if="showCannedResponsesList"
@@ -106,6 +106,7 @@ export default {
     return {
       message: '',
       isPrivate: false,
+      isFocused: false,
       showEmojiPicker: false,
       showCannedResponsesList: false,
       isUploading: {
@@ -158,6 +159,11 @@ export default {
       }
       return this.$t('CONVERSATION.REPLYBOX.SEND');
     },
+    replyBoxClass() {
+      return {
+        'is-focused': this.isFocused,
+      };
+    },
   },
   watch: {
     message(val) {
@@ -262,9 +268,11 @@ export default {
     },
 
     onBlur() {
+      this.isFocused = false;
       this.toggleTyping('off');
     },
     onFocus() {
+      this.isFocused = true;
       this.toggleTyping('on');
     },
 

From 461249492321b1fcc950b8167111c3bcadc9b633 Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Sat, 4 Jul 2020 19:46:17 +0530
Subject: [PATCH 42/50] Chore: Fix issues with conversation data models (#1000)

Co-authored-by: Sojan <sojan@pepalo.com>
---
 .../widgets/conversation/ConversationCard.vue |  8 +-
 .../conversation/ConversationHeader.vue       |  8 +-
 .../widgets/conversation/MessagesView.vue     | 17 ----
 .../widgets/conversation/ReplyBox.vue         | 12 +--
 .../dashboard/conversation/ContactPanel.vue   |  5 +-
 .../dashboard/store/modules/contacts.js       |  4 +
 .../store/modules/conversations/actions.js    | 19 ++--
 .../store/modules/conversations/index.js      |  3 +-
 .../modules/specs/contacts/actions.spec.js    | 20 +++--
 .../specs/conversations/actions.spec.js       | 88 +++++++++++++++++++
 app/models/notification.rb                    |  3 +-
 .../conversations/event_data_presenter.rb     |  3 +-
 .../partials/_conversation.json.jbuilder      |  6 +-
 spec/models/conversation_spec.rb              |  1 +
 .../event_data_presenter_spec.rb              |  1 +
 15 files changed, 147 insertions(+), 51 deletions(-)

diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
index 301717b51..9c7c78959 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationCard.vue
@@ -7,7 +7,7 @@
     <Thumbnail
       v-if="!hideThumbnail"
       :src="currentContact.thumbnail"
-      :badge="currentContact.channel"
+      :badge="chatMetadata.channel"
       class="columns"
       :username="currentContact.name"
       :status="currentContact.availability_status"
@@ -88,9 +88,13 @@ export default {
       accountId: 'getCurrentAccountId',
     }),
 
+    chatMetadata() {
+      return this.chat.meta;
+    },
+
     currentContact() {
       return this.$store.getters['contacts/getContact'](
-        this.chat.meta.sender.id
+        this.chatMetadata.sender.id
       );
     },
 
diff --git a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
index 90409a1fc..7783e8c94 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ConversationHeader.vue
@@ -4,7 +4,7 @@
       <Thumbnail
         :src="currentContact.thumbnail"
         size="40px"
-        :badge="currentContact.channel"
+        :badge="chatMetadata.channel"
         :username="currentContact.name"
         :status="currentContact.availability_status"
       />
@@ -29,7 +29,7 @@
           :allow-empty="true"
           deselect-label="Remove"
           placeholder="Select Agent"
-          selected-label=""
+          selected-label
           select-label="Assign"
           track-by="id"
           @select="assignAgent"
@@ -81,6 +81,10 @@ export default {
       currentChat: 'getSelectedChat',
     }),
 
+    chatMetadata() {
+      return this.chat.meta;
+    },
+
     currentContact() {
       return this.$store.getters['contacts/getContact'](
         this.chat.meta.sender.id
diff --git a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
index 69d711955..7a67b4e46 100644
--- a/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/MessagesView.vue
@@ -121,23 +121,6 @@ export default {
       );
       return chat;
     },
-    // Get current FB Page ID
-    getPageId() {
-      let stateInbox;
-      if (this.inboxId) {
-        const inboxId = Number(this.inboxId);
-        [stateInbox] = this.inboxesList.filter(
-          inbox => inbox.channel_id === inboxId
-        );
-      } else {
-        [stateInbox] = this.inboxesList;
-      }
-      return !stateInbox ? 0 : stateInbox.page_id;
-    },
-    // Get current FB Page ID link
-    linkToMessage() {
-      return `https://m.me/${this.getPageId}`;
-    },
     getReadMessages() {
       const chat = this.getMessages;
       return chat === undefined ? null : this.readMessages(chat);
diff --git a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
index c1aa4c718..499394184 100644
--- a/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
+++ b/app/javascript/dashboard/components/widgets/conversation/ReplyBox.vue
@@ -121,12 +121,7 @@ export default {
       currentChat: 'getSelectedChat',
     }),
     channelType() {
-      const {
-        meta: {
-          sender: { channel },
-        },
-      } = this.currentChat;
-      return channel;
+      return this.currentChat.meta.channel;
     },
     conversationType() {
       const { additional_attributes: additionalAttributes } = this.currentChat;
@@ -145,10 +140,7 @@ export default {
       return 10000;
     },
     showFileUpload() {
-      return (
-        this.channelType === 'Channel::WebWidget' ||
-        this.channelType === 'Channel::TwilioSms'
-      );
+      return this.channelType === 'Channel::WebWidget';
     },
     replyButtonLabel() {
       if (this.isPrivate) {
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
index 74a86070a..e9ed6b71b 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/ContactPanel.vue
@@ -8,7 +8,7 @@
         <thumbnail
           :src="contact.thumbnail"
           size="64px"
-          :badge="contact.channel"
+          :badge="channelType"
           :username="contact.name"
           :status="contact.availability_status"
         />
@@ -158,6 +158,9 @@ export default {
       } = this.browser;
       return `${platformName || ''} ${platformVersion || ''}`;
     },
+    channelType() {
+      return this.currentChat.meta?.channel;
+    },
     contactId() {
       return this.currentChat.meta?.sender?.id;
     },
diff --git a/app/javascript/dashboard/store/modules/contacts.js b/app/javascript/dashboard/store/modules/contacts.js
index 8f88639ea..ef2525cad 100644
--- a/app/javascript/dashboard/store/modules/contacts.js
+++ b/app/javascript/dashboard/store/modules/contacts.js
@@ -63,6 +63,10 @@ export const actions = {
   updatePresence: ({ commit }, data) => {
     commit(types.default.UPDATE_CONTACTS_PRESENCE, data);
   },
+
+  setContact({ commit }, data) {
+    commit(types.default.SET_CONTACT_ITEM, data);
+  },
 };
 
 export const mutations = {
diff --git a/app/javascript/dashboard/store/modules/conversations/actions.js b/app/javascript/dashboard/store/modules/conversations/actions.js
index e7784a13a..937d25afd 100644
--- a/app/javascript/dashboard/store/modules/conversations/actions.js
+++ b/app/javascript/dashboard/store/modules/conversations/actions.js
@@ -156,19 +156,24 @@ const actions = {
     commit(types.default.ADD_MESSAGE, message);
   },
 
-  addConversation({ commit, state }, conversation) {
+  addConversation({ commit, state, dispatch }, conversation) {
     const { currentInbox } = state;
-    if (!currentInbox || Number(currentInbox) === conversation.inbox_id) {
+    const {
+      inbox_id: inboxId,
+      meta: { sender },
+    } = conversation;
+    if (!currentInbox || Number(currentInbox) === inboxId) {
       commit(types.default.ADD_CONVERSATION, conversation);
-      commit(
-        `contacts/${types.default.SET_CONTACT_ITEM}`,
-        conversation.meta.sender
-      );
+      dispatch('contacts/setContact', sender);
     }
   },
 
-  updateConversation({ commit }, conversation) {
+  updateConversation({ commit, dispatch }, conversation) {
+    const {
+      meta: { sender },
+    } = conversation;
     commit(types.default.UPDATE_CONVERSATION, conversation);
+    dispatch('contacts/setContact', sender);
   },
 
   markMessagesRead: async ({ commit }, data) => {
diff --git a/app/javascript/dashboard/store/modules/conversations/index.js b/app/javascript/dashboard/store/modules/conversations/index.js
index 949894adf..af6a77307 100644
--- a/app/javascript/dashboard/store/modules/conversations/index.js
+++ b/app/javascript/dashboard/store/modules/conversations/index.js
@@ -140,9 +140,10 @@ const mutations = {
       c => c.id === conversation.id
     );
     if (currentConversationIndex > -1) {
+      const { messages, ...conversationAttributes } = conversation;
       const currentConversation = {
         ...allConversations[currentConversationIndex],
-        ...conversation,
+        ...conversationAttributes,
       };
       Vue.set(allConversations, currentConversationIndex, currentConversation);
       if (_state.selectedChat.id === conversation.id) {
diff --git a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
index 4defdadde..21c20e74e 100644
--- a/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/contacts/actions.spec.js
@@ -9,7 +9,7 @@ jest.mock('axios');
 
 describe('#actions', () => {
   describe('#get', () => {
-    it('sends correct actions if API is success', async () => {
+    it('sends correct mutations if API is success', async () => {
       axios.get.mockResolvedValue({ data: { payload: contactList } });
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
@@ -18,7 +18,7 @@ describe('#actions', () => {
         [types.default.SET_CONTACT_UI_FLAG, { isFetching: false }],
       ]);
     });
-    it('sends correct actions if API is error', async () => {
+    it('sends correct mutations if API is error', async () => {
       axios.get.mockRejectedValue({ message: 'Incorrect header' });
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
@@ -29,7 +29,7 @@ describe('#actions', () => {
   });
 
   describe('#show', () => {
-    it('sends correct actions if API is success', async () => {
+    it('sends correct mutations if API is success', async () => {
       axios.get.mockResolvedValue({ data: { payload: contactList[0] } });
       await actions.show({ commit }, { id: contactList[0].id });
       expect(commit.mock.calls).toEqual([
@@ -38,7 +38,7 @@ describe('#actions', () => {
         [types.default.SET_CONTACT_UI_FLAG, { isFetchingItem: false }],
       ]);
     });
-    it('sends correct actions if API is error', async () => {
+    it('sends correct mutations if API is error', async () => {
       axios.get.mockRejectedValue({ message: 'Incorrect header' });
       await actions.show({ commit }, { id: contactList[0].id });
       expect(commit.mock.calls).toEqual([
@@ -49,7 +49,7 @@ describe('#actions', () => {
   });
 
   describe('#update', () => {
-    it('sends correct actions if API is success', async () => {
+    it('sends correct mutations if API is success', async () => {
       axios.patch.mockResolvedValue({ data: { payload: contactList[0] } });
       await actions.update({ commit }, contactList[0]);
       expect(commit.mock.calls).toEqual([
@@ -69,4 +69,14 @@ describe('#actions', () => {
       ]);
     });
   });
+
+  describe('#setContact', () => {
+    it('returns correct mutations', () => {
+      const data = { id: 1, name: 'john doe', availability_status: 'online' };
+      actions.setContact({ commit }, data);
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CONTACT_ITEM, data],
+      ]);
+    });
+  });
 });
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 815beb081..d44753732 100644
--- a/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/conversations/actions.spec.js
@@ -3,6 +3,7 @@ import actions from '../../conversations/actions';
 import * as types from '../../../mutation-types';
 
 const commit = jest.fn();
+const dispatch = jest.fn();
 global.axios = axios;
 jest.mock('axios');
 
@@ -39,4 +40,91 @@ describe('#actions', () => {
       expect(commit.mock.calls).toEqual([]);
     });
   });
+
+  describe('#updateConversation', () => {
+    it('sends setContact action and update_conversation mutation', () => {
+      const conversation = {
+        id: 1,
+        messages: [],
+        meta: { sender: { id: 1, name: 'john-doe' } },
+      };
+      actions.updateConversation({ commit, dispatch }, conversation);
+      expect(commit.mock.calls).toEqual([
+        [types.default.UPDATE_CONVERSATION, conversation],
+      ]);
+      expect(dispatch.mock.calls).toEqual([
+        [
+          'contacts/setContact',
+          {
+            id: 1,
+            name: 'john-doe',
+          },
+        ],
+      ]);
+    });
+  });
+
+  describe('#addConversation', () => {
+    it('doesnot send mutation if conversation is from a different inbox', () => {
+      const conversation = {
+        id: 1,
+        messages: [],
+        meta: { sender: { id: 1, name: 'john-doe' } },
+        inbox_id: 2,
+      };
+      actions.addConversation(
+        { commit, dispatch, state: { currentInbox: 1 } },
+        conversation
+      );
+      expect(commit.mock.calls).toEqual([]);
+      expect(dispatch.mock.calls).toEqual([]);
+    });
+
+    it('sends correct mutations', () => {
+      const conversation = {
+        id: 1,
+        messages: [],
+        meta: { sender: { id: 1, name: 'john-doe' } },
+        inbox_id: 1,
+      };
+      actions.addConversation(
+        { commit, dispatch, state: { currentInbox: 1 } },
+        conversation
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.ADD_CONVERSATION, conversation],
+      ]);
+      expect(dispatch.mock.calls).toEqual([
+        [
+          'contacts/setContact',
+          {
+            id: 1,
+            name: 'john-doe',
+          },
+        ],
+      ]);
+    });
+
+    it('sends correct mutations if inbox filter is not available', () => {
+      const conversation = {
+        id: 1,
+        messages: [],
+        meta: { sender: { id: 1, name: 'john-doe' } },
+        inbox_id: 1,
+      };
+      actions.addConversation({ commit, dispatch, state: {} }, conversation);
+      expect(commit.mock.calls).toEqual([
+        [types.default.ADD_CONVERSATION, conversation],
+      ]);
+      expect(dispatch.mock.calls).toEqual([
+        [
+          'contacts/setContact',
+          {
+            id: 1,
+            name: 'john-doe',
+          },
+        ],
+      ]);
+    });
+  });
 });
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 33c04dda2..08d7eca28 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -51,7 +51,8 @@ class Notification < ApplicationRecord
       read_at: read_at,
       secondary_actor: secondary_actor&.push_event_data,
       user: user&.push_event_data,
-      created_at: created_at
+      created_at: created_at,
+      account_id: account_id
     }
   end
 
diff --git a/app/presenters/conversations/event_data_presenter.rb b/app/presenters/conversations/event_data_presenter.rb
index bf1b4140d..c61792459 100644
--- a/app/presenters/conversations/event_data_presenter.rb
+++ b/app/presenters/conversations/event_data_presenter.rb
@@ -5,10 +5,11 @@ class Conversations::EventDataPresenter < SimpleDelegator
 
   def push_data
     {
-      id: display_id,
       additional_attributes: additional_attributes,
+      id: display_id,
       inbox_id: inbox_id,
       messages: push_messages,
+      channel: inbox.try(:channel_type),
       meta: push_meta,
       status: status,
       unread_count: unread_incoming_messages.count,
diff --git a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
index 187348b38..e9d796c31 100644
--- a/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
+++ b/app/views/api/v1/conversations/partials/_conversation.json.jbuilder
@@ -1,10 +1,8 @@
 json.meta do
   json.sender do
-    json.id conversation.contact.id
-    json.name conversation.contact.name
-    json.thumbnail conversation.contact.avatar_url
-    json.channel conversation.inbox.try(:channel_type)
+    json.partial! 'api/v1/models/contact.json.jbuilder', resource: conversation.contact
   end
+  json.channel conversation.inbox.try(:channel_type)
   json.assignee conversation.assignee
 end
 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 629b5fbf5..6e2e79be1 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -312,6 +312,7 @@ RSpec.describe Conversation, type: :model do
         inbox_id: conversation.inbox_id,
         status: conversation.status,
         timestamp: conversation.created_at.to_i,
+        channel: 'Channel::WebWidget',
         user_last_seen_at: conversation.user_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,
         unread_count: 0
diff --git a/spec/presenters/conversations/event_data_presenter_spec.rb b/spec/presenters/conversations/event_data_presenter_spec.rb
index 82a9dc771..76326b616 100644
--- a/spec/presenters/conversations/event_data_presenter_spec.rb
+++ b/spec/presenters/conversations/event_data_presenter_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe Conversations::EventDataPresenter do
         messages: [],
         inbox_id: conversation.inbox_id,
         status: conversation.status,
+        channel: conversation.inbox.channel_type,
         timestamp: conversation.created_at.to_i,
         user_last_seen_at: conversation.user_last_seen_at.to_i,
         agent_last_seen_at: conversation.agent_last_seen_at.to_i,

From 43147b3163d1bf4dc773979a7ee6d8ddba2c6d72 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Sat, 4 Jul 2020 20:03:16 +0530
Subject: [PATCH 43/50] Chore: Fix presence for current user (#1001)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 app/channels/room_channel.rb                  |  9 +++++--
 .../dashboard/helper/actionCable.js           |  1 +
 .../dashboard/settings/profile/Index.vue      |  6 +++++
 app/javascript/dashboard/store/index.js       |  2 --
 .../dashboard/store/modules/auth.js           | 16 ++++++++++++
 .../dashboard/store/modules/channels.js       | 14 ----------
 .../store/modules/specs/auth/actions.spec.js  | 26 +++++++++++++++++++
 .../store/modules/specs/auth/getters.spec.js  |  8 ++++++
 .../dashboard/store/mutation-types.js         |  2 +-
 .../concerns/availability_statusable.rb       | 12 ++++++++-
 lib/online_status_tracker.rb                  |  2 ++
 11 files changed, 78 insertions(+), 20 deletions(-)
 delete mode 100644 app/javascript/dashboard/store/modules/channels.js

diff --git a/app/channels/room_channel.rb b/app/channels/room_channel.rb
index 1a0cbb434..ab3af0c92 100644
--- a/app/channels/room_channel.rb
+++ b/app/channels/room_channel.rb
@@ -4,17 +4,22 @@ class RoomChannel < ApplicationCable::Channel
     current_user
     current_account
     update_subscription
+    broadcast_presence
   end
 
   def update_presence
     update_subscription
+    broadcast_presence
+  end
+
+  private
+
+  def broadcast_presence
     data = { account_id: @current_account.id, users: ::OnlineStatusTracker.get_available_users(@current_account.id) }
     data[:contacts] = ::OnlineStatusTracker.get_available_contacts(@current_account.id) if @current_user.is_a? User
     ActionCable.server.broadcast(@pubsub_token, { event: 'presence.update', data: data })
   end
 
-  private
-
   def ensure_stream
     @pubsub_token = params[:pubsub_token]
     stream_from @pubsub_token
diff --git a/app/javascript/dashboard/helper/actionCable.js b/app/javascript/dashboard/helper/actionCable.js
index 5d6abf359..4efde4d91 100644
--- a/app/javascript/dashboard/helper/actionCable.js
+++ b/app/javascript/dashboard/helper/actionCable.js
@@ -33,6 +33,7 @@ class ActionCableConnector extends BaseActionCableConnector {
   onPresenceUpdate = data => {
     this.app.$store.dispatch('contacts/updatePresence', data.contacts);
     this.app.$store.dispatch('agents/updatePresence', data.users);
+    this.app.$store.dispatch('setCurrentUserAvailabilityStatus', data.users);
   };
 
   onConversationContactChange = payload => {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
index 17d7ed037..eaf40b077 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/profile/Index.vue
@@ -163,6 +163,7 @@ export default {
     ...mapGetters({
       currentUser: 'getCurrentUser',
       currentUserId: 'getCurrentUserID',
+      currentAvailabilityStatus: 'getCurrentUserAvailabilityStatus',
     }),
   },
   watch: {
@@ -171,6 +172,11 @@ export default {
         this.initializeUser();
       }
     },
+    currentAvailabilityStatus(newStatus, oldStatus) {
+      if (newStatus !== oldStatus) {
+        this.availability = newStatus;
+      }
+    },
   },
   mounted() {
     if (this.currentUserId) {
diff --git a/app/javascript/dashboard/store/index.js b/app/javascript/dashboard/store/index.js
index 0f9194002..3da923b76 100755
--- a/app/javascript/dashboard/store/index.js
+++ b/app/javascript/dashboard/store/index.js
@@ -5,7 +5,6 @@ import accounts from './modules/accounts';
 import agents from './modules/agents';
 import auth from './modules/auth';
 import cannedResponse from './modules/cannedResponse';
-import Channel from './modules/channels';
 import contactConversations from './modules/contactConversations';
 import contacts from './modules/contacts';
 import conversationLabels from './modules/conversationLabels';
@@ -30,7 +29,6 @@ export default new Vuex.Store({
     agents,
     auth,
     cannedResponse,
-    Channel,
     contactConversations,
     contacts,
     conversationLabels,
diff --git a/app/javascript/dashboard/store/modules/auth.js b/app/javascript/dashboard/store/modules/auth.js
index 6486eb956..ba26ea79a 100644
--- a/app/javascript/dashboard/store/modules/auth.js
+++ b/app/javascript/dashboard/store/modules/auth.js
@@ -34,6 +34,10 @@ export const getters = {
     return _state.currentUser.id;
   },
 
+  getCurrentUserAvailabilityStatus(_state) {
+    return _state.currentUser.availability_status;
+  },
+
   getCurrentAccountId(_state) {
     return _state.currentAccountId;
   },
@@ -104,10 +108,22 @@ export const actions = {
   setCurrentAccountId({ commit }, accountId) {
     commit(types.default.SET_CURRENT_ACCOUNT_ID, accountId);
   },
+
+  setCurrentUserAvailabilityStatus({ commit, state: $state }, data) {
+    if (data[$state.currentUser.id]) {
+      commit(
+        types.default.SET_CURRENT_USER_AVAILABILITY,
+        data[$state.currentUser.id]
+      );
+    }
+  },
 };
 
 // mutations
 const mutations = {
+  [types.default.SET_CURRENT_USER_AVAILABILITY](_state, status) {
+    Vue.set(_state.currentUser, 'availability_status', status);
+  },
   [types.default.CLEAR_USER](_state) {
     _state.currentUser.id = null;
   },
diff --git a/app/javascript/dashboard/store/modules/channels.js b/app/javascript/dashboard/store/modules/channels.js
deleted file mode 100644
index 5104a8de5..000000000
--- a/app/javascript/dashboard/store/modules/channels.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* eslint no-console: 0 */
-/* eslint no-param-reassign: 0 */
-
-// const chatType = 'all';
-// initial state
-const state = {};
-
-// actions
-const actions = {};
-
-export default {
-  state,
-  actions,
-};
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 287bb1be3..1081196d6 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/actions.spec.js
@@ -67,4 +67,30 @@ describe('#actions', () => {
       expect(dispatch).toHaveBeenCalledTimes(0);
     });
   });
+
+  describe('#setCurrentUserAvailabilityStatus', () => {
+    it('sends correct mutations if user id is available', async () => {
+      actions.setCurrentUserAvailabilityStatus(
+        {
+          commit,
+          state: { currentUser: { id: 1 } },
+        },
+        { 1: 'online' }
+      );
+      expect(commit.mock.calls).toEqual([
+        [types.default.SET_CURRENT_USER_AVAILABILITY, 'online'],
+      ]);
+    });
+
+    it('does not send correct mutations if user id is not available', async () => {
+      actions.setCurrentUserAvailabilityStatus(
+        {
+          commit,
+          state: { currentUser: { id: 1 } },
+        },
+        {}
+      );
+      expect(commit.mock.calls).toEqual([]);
+    });
+  });
 });
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 d39f5d991..96d696085 100644
--- a/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
+++ b/app/javascript/dashboard/store/modules/specs/auth/getters.spec.js
@@ -17,4 +17,12 @@ describe('#getters', () => {
       getters.getCurrentUser({ currentUser: { id: 1, name: 'Pranav' } })
     ).toEqual({ id: 1, name: 'Pranav' });
   });
+
+  it('get', () => {
+    expect(
+      getters.getCurrentUserAvailabilityStatus({
+        currentUser: { id: 1, name: 'Pranav', availability_status: 'busy' },
+      })
+    ).toEqual('busy');
+  });
 });
diff --git a/app/javascript/dashboard/store/mutation-types.js b/app/javascript/dashboard/store/mutation-types.js
index 473304986..1a39175fa 100755
--- a/app/javascript/dashboard/store/mutation-types.js
+++ b/app/javascript/dashboard/store/mutation-types.js
@@ -3,7 +3,7 @@ export default {
   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',
   // Chat List
   RECEIVE_CHAT_LIST: 'RECEIVE_CHAT_LIST',
   SET_ALL_CONVERSATION: 'SET_ALL_CONVERSATION',
diff --git a/app/models/concerns/availability_statusable.rb b/app/models/concerns/availability_statusable.rb
index 2f1589bc3..11d1e438e 100644
--- a/app/models/concerns/availability_statusable.rb
+++ b/app/models/concerns/availability_statusable.rb
@@ -2,19 +2,29 @@ module AvailabilityStatusable
   extend ActiveSupport::Concern
 
   def online_presence?
+    return if user_profile_page_context?
+
     ::OnlineStatusTracker.get_presence(availability_account_id, self.class.name, id)
   end
 
   def availability_status
+    return availability if user_profile_page_context?
     return 'offline' unless online_presence?
     return 'online' if is_a? Contact
 
     ::OnlineStatusTracker.get_status(availability_account_id, id) || 'online'
   end
 
+  def user_profile_page_context?
+    # at the moment profile pages aren't account scoped
+    # hence we will return availability attribute instead of true presence
+    # we will revisit this later
+    is_a?(User) && Current.account.blank?
+  end
+
   def availability_account_id
     return account_id if is_a? Contact
 
-    Current.account.present? ? Current.account.id : accounts.first.id
+    Current.account.id
   end
 end
diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index 32069dd93..c9180e96f 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -44,6 +44,8 @@ module OnlineStatusTracker
 
   def self.get_available_users(account_id)
     user_ids = ::Redis::Alfred.zrangebyscore(presence_key(account_id, 'User'), (Time.zone.now - PRESENCE_DURATION).to_i, Time.now.to_i)
+    return {} if user_ids.blank?
+
     user_availabilities = ::Redis::Alfred.hmget(status_key(account_id), user_ids)
     user_ids.map.with_index { |id, index| [id, (user_availabilities[index] || 'online')] }.to_h
   end

From b633126b3546cc292c0be959823260199b146e2d Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 6 Jul 2020 10:37:51 +0530
Subject: [PATCH 44/50] Chore: Fix spelling mistakes in docs (#1012)

---
 docs/channels/facebook-channel.md             |  2 +-
 docs/channels/twitter-channel.md              |  2 +-
 docs/channels/website-channel.md              |  2 +-
 docs/channels/whatsapp-sms-twilio.md          |  6 +++-
 docs/deployment/production/architecture.md    | 14 ++++----
 docs/deployment/production/caprover.md        | 22 ++++++-------
 docs/deployment/production/docker.md          |  8 ++---
 docs/deployment/production/heroku.md          |  6 ++--
 docs/deployment/production/linux-vm.md        | 32 ++++++++++++-------
 docs/development/environment-setup/windows.md |  2 +-
 .../project-setup/slack-integration-setup.md  |  7 ++--
 11 files changed, 58 insertions(+), 45 deletions(-)

diff --git a/docs/channels/facebook-channel.md b/docs/channels/facebook-channel.md
index 48991997e..08f11d0aa 100644
--- a/docs/channels/facebook-channel.md
+++ b/docs/channels/facebook-channel.md
@@ -31,7 +31,7 @@ If you are using self-hosted Chatwoot installation, please configure the Faceboo
 
 ![add_agents](./images/add_agents.png)
 
-**Step 6**. Hooray! You have sucessfully created a Facebook inbox. Whenever a customer sends a message to your Facebook page, you will be able to see it here and manage it.
+**Step 6**. Hooray! You have successfully created a Facebook inbox. Whenever a customer sends a message to your Facebook page, you will be able to see it here and manage it.
 
 ![finish_inbox](./images/facebook/finish_inbox.png)
 
diff --git a/docs/channels/twitter-channel.md b/docs/channels/twitter-channel.md
index 4d7726204..db65060fe 100644
--- a/docs/channels/twitter-channel.md
+++ b/docs/channels/twitter-channel.md
@@ -23,7 +23,7 @@ title: "How to create Twitter channel?"
 
 ![add_agents](./images/add_agents.png)
 
-**Step 6**. Hooray! You have sucessfully created a Twitter inbox.  You will be able to manage Twitter DMs and tweets mentioning you in the Chatwoot Inbox.
+**Step 6**. Hooray! You have successfully created a Twitter inbox.  You will be able to manage Twitter DMs and tweets mentioning you in the Chatwoot Inbox.
 
 ![finish_inbox](./images/twitter/finish_inbox.png)
 
diff --git a/docs/channels/website-channel.md b/docs/channels/website-channel.md
index f730a4668..52cbb3736 100644
--- a/docs/channels/website-channel.md
+++ b/docs/channels/website-channel.md
@@ -19,7 +19,7 @@ title: "How to create website channel?"
 
 ![add_agents](./images/add_agents.png)
 
-**Step 5**. Hooray! You have sucessfully created a website inbox. Copy and paste the code shown in the page to your website and start supporting your customers.
+**Step 5**. Hooray! You have successfully created a website inbox. Copy and paste the code shown in the page to your website and start supporting your customers.
 
 ![finish_inbox](./images/finish_inbox.png)
 
diff --git a/docs/channels/whatsapp-sms-twilio.md b/docs/channels/whatsapp-sms-twilio.md
index 7f00516fd..96a036a72 100644
--- a/docs/channels/whatsapp-sms-twilio.md
+++ b/docs/channels/whatsapp-sms-twilio.md
@@ -15,6 +15,8 @@ title: "How to create a Whatsapp/SMS channel with Twilio?"
 
 These are input required to create this channel
 
+<div class="table table-striped">
+
 | Input | Description | Where can I find it |
 | -- | -- | -- |
 | Channel Name | This is the name inbox, this will used across the application | N/A |
@@ -23,13 +25,15 @@ These are input required to create this channel
 | Account SID | Account SID in Twilio Console | Login to Twilio Console, you would be able to see Account SID and Auth Token |
 | Auth Token | Auth token for the account | Login to Twilio Console, you would be able to see Account SID and Auth Token |
 
+</div>
+
 ![create_twilio](./images/twilio/create_twilio_inbox.png)
 
 **Step 4**. "Add agents" to your inbox.
 
 ![add_agents](./images/add_agents.png)
 
-**Step 6**. Hooray! You have sucessfully created a whatsapp/sms inbox.
+**Step 6**. Hooray! You have successfully created a whatsapp/sms inbox.
 
 ![finish_inbox](./images/twilio/finish_inbox.png)
 
diff --git a/docs/deployment/production/architecture.md b/docs/deployment/production/architecture.md
index ad7f1d83d..59d441017 100644
--- a/docs/deployment/production/architecture.md
+++ b/docs/deployment/production/architecture.md
@@ -5,9 +5,9 @@ title: "Chatwoot Production deployment guide"
 
 This guide will help you to deploy Chatwoot to production!
 
-## Architecture
+### Architecture
 
-Running Chatwoot in production requires the following set of services. 
+Running Chatwoot in production requires the following set of services.
 
 * Chatwoot web servers
 * Chatwoot workers
@@ -17,13 +17,13 @@ Running Chatwoot in production requires the following set of services.
 * Object Storage ( S3, Azure Storage, GCS, etc)
 
 
-## Updating your Chatwoot installation 
+### Updating your Chatwoot installation
 
-A new version of Chatwoot is released around the first monday of every month. We also release minor versions when there is a need for Hotfixes or security updates. 
+A new version of Chatwoot is released around the first monday of every month. We also release minor versions when there is a need for Hotfixes or security updates.
 
-You can stay tuned to our [Roadmap](https://github.com/chatwoot/chatwoot/milestones) and [releases](https://github.com/chatwoot/chatwoot/releases) on github. We recommend you to stay upto date with our releases to enjoy the lastest features and security updates. 
+You can stay tuned to our [Roadmap](https://github.com/chatwoot/chatwoot/milestones) and [releases](https://github.com/chatwoot/chatwoot/releases) on github. We recommend you to stay upto date with our releases to enjoy the lastest features and security updates.
 
-The deployment process for a newer version involves updating your app servers and workers with the latest code. Most updates would involve database migrations as well which can be executed through the following rails command. 
+The deployment process for a newer version involves updating your app servers and workers with the latest code. Most updates would involve database migrations as well which can be executed through the following rails command.
 
 ```
 bundle exec rails db:migrate
@@ -33,7 +33,7 @@ The detailed instructions can be found in respective deployment guides.
 
 ### Available deployment options
 
-If you want to self host Chatwoot, the recommended approach is to use one of the recommended one click installation options from the below list. If you are comfortable with ruby on rails applications, you can also make use of the other deployment options mentioned below. 
+If you want to self host Chatwoot, the recommended approach is to use one of the recommended one click installation options from the below list. If you are comfortable with ruby on rails applications, you can also make use of the other deployment options mentioned below.
 
 * [Heroku](/docs/deployment/deploy-chatwoot-with-heroku) (recommended)
 * [Caprover](/docs/deployment/deploy-chatwoot-with-caprover) (recommended)
diff --git a/docs/deployment/production/caprover.md b/docs/deployment/production/caprover.md
index c508bd057..c9e81438c 100644
--- a/docs/deployment/production/caprover.md
+++ b/docs/deployment/production/caprover.md
@@ -3,29 +3,29 @@ path: "/docs/deployment/deploy-chatwoot-with-caprover"
 title: "Caprover Chatwoot Production deployment guide"
 ---
 
-## Caprover Overview
+### Caprover Overview
 
-Caprover is an extremely easy to use application server management tool. It is blazing fast and uses Docker under the hood. Chatwoot has been made available as a one-click app in Chatwoot and hence the deployment process is very easy. 
+Caprover is an extremely easy to use application server management tool. It is blazing fast and uses Docker under the hood. Chatwoot has been made available as a one-click app in Chatwoot and hence the deployment process is very easy.
 
-## Install Caprover on your VM
+### Install Caprover on your VM
 
-Finish your caprover installation by referring to [Getting started guid](https://caprover.com/docs/get-started.html). 
+Finish your caprover installation by referring to [Getting started guid](https://caprover.com/docs/get-started.html).
 
-## Installing Chatwoot in Caprover
+### Installing Chatwoot in Caprover
 
-Chatwoot is available in the one-click apps option in caprover, find Chatwoot by searching and clicking on it. Replace the default `version` with the latest `version` of chatwoot. User appropriate values for the Postgres and Redis passwords and click install. It should only take a few minutes. 
+Chatwoot is available in the one-click apps option in caprover, find Chatwoot by searching and clicking on it. Replace the default `version` with the latest `version` of chatwoot. User appropriate values for the Postgres and Redis passwords and click install. It should only take a few minutes.
 
-## Configure the necessary environment variables 
+### Configure the necessary environment variables
 
-Caprover will take care of the installation of Postgres and Redis along with the app and worker servers. We would advise you to replace the database/Redis services with managed/standalone servers once you start scaling.  
+Caprover will take care of the installation of Postgres and Redis along with the app and worker servers. We would advise you to replace the database/Redis services with managed/standalone servers once you start scaling.
 
 Also, ensure to set the appropriate environment variables for E-mail, Object Store service etc referring to our [Environment variables guide](./environment-variables)
 
-## Upgrading Chatwoot installation
+### Upgrading Chatwoot installation
 
 To update your chatwoot installation to the latest version in caprover, Run the following command in deployment tab for web and worker in the method 5: deploy captain-definition
 
-### web 
+### web
 
 ```json
 {
@@ -52,6 +52,6 @@ To update your chatwoot installation to the latest version in caprover, Run the
 }
 ```
 
-## Further references
+### Further references
 
 - https://isotropic.co/how-to-install-chatwoot-to-a-digitalocean-droplet/
diff --git a/docs/deployment/production/docker.md b/docs/deployment/production/docker.md
index 633232339..92249c6c9 100644
--- a/docs/deployment/production/docker.md
+++ b/docs/deployment/production/docker.md
@@ -3,11 +3,11 @@ path: "/docs/deployment/deploy-chatwoot-with-docker"
 title: "Docker Chatwoot Production deployment guide"
 ---
 
-## Deploying with docker 
+### Deploying with docker
 
 We publish our base images to docker hub. Build your web/worker images from these base images
 
-### Web 
+### Web
 
 ```
 FROM chatwoot/chatwoot:latest
@@ -25,8 +25,8 @@ ENTRYPOINT [\"docker/entrypoints/rails.sh\"]
 CMD bundle exec sidekiq -C config/sidekiq.yml"
 ```
 
-The app servers will available on port `3000`. Ensure the images are connected to the same database and Redis servers. Provide the configuration for these services via environment variables. 
+The app servers will available on port `3000`. Ensure the images are connected to the same database and Redis servers. Provide the configuration for these services via environment variables.
 
-## Upgrading 
+### Upgrading
 
 Update the images using the latest image from chatwoot.  Run the `rails db:migrate` option after accessing console from one of the containers running latest image.
diff --git a/docs/deployment/production/heroku.md b/docs/deployment/production/heroku.md
index 24cbfed3e..16b4a3b80 100644
--- a/docs/deployment/production/heroku.md
+++ b/docs/deployment/production/heroku.md
@@ -1,9 +1,9 @@
 ---
-path: "/docs/deployment/deploy-chatwoot-with-Heroku"
+path: "/docs/deployment/deploy-chatwoot-with-heroku"
 title: "Heroku Chatwoot Production deployment guide"
 ---
 
-## Deploying on Heroku
+### Deploying on Heroku
 Deploy chatwoot on Heroku through the following steps
 
 1. Click on the [one click deploy button](https://heroku.com/deploy?template=https://github.com/chatwoot/chatwoot/tree/master) and deploy your app.
@@ -13,7 +13,7 @@ Deploy chatwoot on Heroku through the following steps
 5. Head over to `yourapp.herokuapp.com` and enjoy using Chatwoot.
 
 
-## Updating the deployment on Heroku
+### Updating the deployment on Heroku
 
 Whenever a new version is out for chatwoot, you update your Heroku deployment through following steps.
 
diff --git a/docs/deployment/production/linux-vm.md b/docs/deployment/production/linux-vm.md
index 9d72ca89a..79e940074 100644
--- a/docs/deployment/production/linux-vm.md
+++ b/docs/deployment/production/linux-vm.md
@@ -4,19 +4,19 @@ title: "Linux VM Chatwoot Production deployment guide"
 ---
 
 
-## Deploying to Linux VM 
+### Deploying to Linux VM
 
 We have prepared a deployment script for ubuntu 18.04. Run the script or refer the script and make changes accordingly to OS.
 
 https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh
 
-### After logging in to your Linux VM as the root user perform the following steps for initial set up 
+### After logging in to your Linux VM as the root user perform the following steps for initial set up
 
 1. Create the `chatwoot.sh` file and copy the content from [deployment script](https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh).
 2. Execute the script and it will take care of the initial Chatwoot setup
 3. Chatwoot Installation will now be accessible at `http://{your_ip}:3000`
 
-### Configure ngix and letsencrypt 
+### Configure ngix and letsencrypt
 
 1. configure Nginx to serve as a frontend proxy by following steps in your shell
 
@@ -24,8 +24,10 @@ https://github.com/chatwoot/chatwoot/blob/develop/deployment/setup.sh
 cd /etc/nginx/sites-enabled
 nano yourdomain.com.conf
 ```
-2. Add the required Nginx config after replacing the `yourdomain.com` in `server_name`
-```sh
+
+2. Add the required Nginx config after replacing the `yourdomain.com` in `server_name`.
+
+```bash
 server {
   server_name yourdomain.com;
   # where rails app is running
@@ -36,7 +38,7 @@ server {
      # Note that a request for /.well-known/test.html will be made
      alias /var/www/ssl-proof/chatwoot/.well-known;
   }
-  
+
   location / {
     proxy_pass_header Authorization;
     proxy_pass http://$upstream;
@@ -57,12 +59,16 @@ server {
   listen 80;
 }
 ```
+
 3. Verify and reload your Nginx config by running following command.
+
 ```sh
 nginx -t
 systemctl reload nginx
 ```
+
 4. Run Letsencrypt and configure SSL
+
 ```sh
 mkdir -p /var/www/ssl-proof/chatwoot/.well-known
 certbot --webroot -w /var/www/ssl-proof/chatwoot/  -d yourdomain.com  -i nginx
@@ -70,10 +76,12 @@ certbot --webroot -w /var/www/ssl-proof/chatwoot/  -d yourdomain.com  -i nginx
 
 5. You Chatwoot installation should be accessible from the `https://yourdomain.com` now.
 
-### Configure the required environment variables 
-For your chatwoot installation to properly function you would need to configure some of the essential environment variables like `FRONTEND_URL`, mailer and storage config etc. refer [environment variables](https://www.chatwoot.com/docs/environment-variables) for the full list. 
+### Configure the required environment variables
+
+For your chatwoot installation to properly function you would need to configure some of the essential environment variables like `FRONTEND_URL`, mailer and storage config etc. refer [environment variables](https://www.chatwoot.com/docs/environment-variables) for the full list.
 
 1. Login as chatwoot and edit the .env file.
+
 ```shell
 # login as chatwoot user 
 sudo -i -u chatwoot
@@ -82,14 +90,16 @@ nano .env
 ```
 2. Refer [environment variables](https://www.chatwoot.com/docs/environment-variables) and update the required variables. Save the `.env` file.
 3. Restart the Chatwoot server and enjoy using Chatwoot.
+
 ```sh
 systemctl restart chatwoot.target
 ```
-## Updating your Chatwoot Installation on a Linux VM
+
+### Updating your Chatwoot Installation on a Linux VM
 
 Run the following steps on your VM if you made use of our installation script Or making changes accordingly to your OS
 
-```sh
+```
 # login as chatwoot user 
 sudo -i -u chatwoot
 
@@ -100,7 +110,7 @@ cd chatwoot 
 git pull
 
 # update dependencies 
-bundle 
+bundle
 yarn
 
 # recompile the assets 
diff --git a/docs/development/environment-setup/windows.md b/docs/development/environment-setup/windows.md
index d2b3266b6..c1f379b5a 100644
--- a/docs/development/environment-setup/windows.md
+++ b/docs/development/environment-setup/windows.md
@@ -7,7 +7,7 @@ title: 'Windows 10 Installation Guide'
 
 You need to install Linux Subsystem for Windows.
 
-1. The first step is to enable "Developer mode" in Windows. You can do this by opening up Settings and navigating to to Update & Security, then "For Developers". Click the "Developer mode" option to enable it.
+1. The first step is to enable "Developer mode" in Windows. You can do this by opening up Settings and navigating to Update & Security, then "For Developers". Click the "Developer mode" option to enable it.
 
 <img src="./img/developer-mode.jpg" width="500" alt="Enable Developer Mode" style="display: block; margin-left: auto; margin-right: auto;">
 
diff --git a/docs/development/project-setup/slack-integration-setup.md b/docs/development/project-setup/slack-integration-setup.md
index 492effaa7..264238423 100644
--- a/docs/development/project-setup/slack-integration-setup.md
+++ b/docs/development/project-setup/slack-integration-setup.md
@@ -1,6 +1,6 @@
 ---
 path: "/docs/slack-integration-setup"
-title: "Setting Up Slack Intergration"
+title: "Setting Up Slack Integration"
 ---
 
 ### Register a Slack app
@@ -15,10 +15,9 @@ Once you register your Slack App, you will have to obtain the `Client Id` and `C
 2) Obtain the `Client Id` and `Client Secret` for the app and configure it in your Chatwoot environment variables.
 3) Head over to the `OAuth & permissions` section under `features` tab.
 4) In the redirect URLs, Add your Chatwoot installation base url.
-5) In the scopes section configure the given scopes for bot token scopes.
- `commands,chat:write,channels:read,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history`
+5) In the scopes section configure the given scopes for bot token scopes. `commands,chat:write,channels:read,channels:manage,channels:join,groups:write,im:write,mpim:write,users:read,users:read.email,chat:write.customize,channels:history,groups:history,mpim:history,im:history`
 6) Head over to the `events subscriptions` section under `features` tab.
-7) Enable events and configure the the given request url `{chatwoot installation url}/api/v1/integrations/webhooks`
+7) Enable events and configure the given request url `{chatwoot installation url}/api/v1/integrations/webhooks`
 8) Subscribe to the following bot events `message.channels` , `message.groups`, `message.im`, `message.mpim`
 9) Connect slack integration on Chatwoot app and get productive.
 

From e41bd56f41bd9dc110ae2a042718c080553e4b43 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Mon, 6 Jul 2020 11:16:19 +0530
Subject: [PATCH 45/50] Chore: Feature Flags for Channels (#1010)

---
 .../components/widgets/ChannelItem.vue         | 15 ++++++++++++++-
 .../dashboard/settings/inbox/ChannelList.vue   | 18 ++++++++++++++++++
 app/models/user.rb                             |  2 +-
 app/views/api/v1/accounts/show.json.jbuilder   |  2 +-
 config/features.yml                            |  3 ++-
 .../20200704173104_add_twitter_feature_flag.rb |  5 +++++
 db/schema.rb                                   |  2 +-
 7 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 db/migrate/20200704173104_add_twitter_feature_flag.rb

diff --git a/app/javascript/dashboard/components/widgets/ChannelItem.vue b/app/javascript/dashboard/components/widgets/ChannelItem.vue
index 948bff103..bd4636fd8 100644
--- a/app/javascript/dashboard/components/widgets/ChannelItem.vue
+++ b/app/javascript/dashboard/components/widgets/ChannelItem.vue
@@ -40,10 +40,23 @@ export default {
       type: String,
       required: true,
     },
+    enabledFeatures: {
+      type: Object,
+      required: true,
+    },
   },
   methods: {
     isActive(channel) {
-      return ['facebook', 'website', 'twitter', 'twilio'].includes(channel);
+      if (Object.keys(this.enabledFeatures) === 0) {
+        return false;
+      }
+      if (channel === 'facebook') {
+        return this.enabledFeatures.channel_facebook;
+      }
+      if (channel === 'twitter') {
+        return this.enabledFeatures.channel_facebook;
+      }
+      return ['website', 'twilio'].includes(channel);
     },
     onItemClick() {
       if (this.isActive(this.channel)) {
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
index 12bba91d3..a5db5a5c1 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue
@@ -9,6 +9,7 @@
         v-for="channel in channelList"
         :key="channel"
         :channel="channel"
+        :enabled-features="enabledFeatures"
         @channel-item-click="initChannelAuth"
       />
     </div>
@@ -19,6 +20,7 @@
 import ChannelItem from 'dashboard/components/widgets/ChannelItem';
 import router from '../../../index';
 import PageHeader from '../SettingsSubPageHeader';
+import { mapGetters } from 'vuex';
 
 export default {
   components: {
@@ -35,9 +37,25 @@ export default {
         'telegram',
         'line',
       ],
+      enabledFeatures: {},
     };
   },
+  computed: {
+    account() {
+      return this.$store.getters['accounts/getAccount'](this.accountId);
+    },
+    ...mapGetters({
+      accountId: 'getCurrentAccountId',
+    }),
+  },
+  mounted() {
+    this.initializeEnabledFeatures();
+  },
   methods: {
+    async initializeEnabledFeatures() {
+      await this.$store.dispatch('accounts/get', this.accountId);
+      this.enabledFeatures = this.account.features;
+    },
     initChannelAuth(channel) {
       const params = {
         page: 'new',
diff --git a/app/models/user.rb b/app/models/user.rb
index b025fabea..6a1c53eed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,7 +3,7 @@
 # Table name: users
 #
 #  id                     :integer          not null, primary key
-#  availability           :integer          default(0)
+#  availability           :integer          default("online")
 #  confirmation_sent_at   :datetime
 #  confirmation_token     :string
 #  confirmed_at           :datetime
diff --git a/app/views/api/v1/accounts/show.json.jbuilder b/app/views/api/v1/accounts/show.json.jbuilder
index 26d1c640e..446d1accb 100644
--- a/app/views/api/v1/accounts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/show.json.jbuilder
@@ -4,4 +4,4 @@ json.locale @account.locale
 json.domain @account.domain
 json.domain_emails_enabled @account.domain_emails_enabled
 json.support_email @account.support_email
-json.features @account.enabled_features
+json.features @account.all_features
diff --git a/config/features.yml b/config/features.yml
index 0ce1518a1..ab683e29a 100644
--- a/config/features.yml
+++ b/config/features.yml
@@ -5,4 +5,5 @@
   enabled: false
 - name: channel_facebook
   enabled: true
-
+- name: channel_twitter
+  enabled: true
diff --git a/db/migrate/20200704173104_add_twitter_feature_flag.rb b/db/migrate/20200704173104_add_twitter_feature_flag.rb
new file mode 100644
index 000000000..047313d70
--- /dev/null
+++ b/db/migrate/20200704173104_add_twitter_feature_flag.rb
@@ -0,0 +1,5 @@
+class AddTwitterFeatureFlag < ActiveRecord::Migration[6.0]
+  def change
+    ConfigLoader.new.process
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6db971114..b6337dbcd 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: 2020_06_29_122646) do
+ActiveRecord::Schema.define(version: 2020_07_04_173104) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_stat_statements"

From f8a3f2df27b195b8c9f5266000c861a6a7b28cda Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 6 Jul 2020 13:28:50 +0530
Subject: [PATCH 46/50] Chore: Add documentation for Mailgun & Mailchimp
 (#1014)

---
 .../project-setup/environment-variables.md    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/docs/development/project-setup/environment-variables.md b/docs/development/project-setup/environment-variables.md
index 3ec78a956..e92523355 100644
--- a/docs/development/project-setup/environment-variables.md
+++ b/docs/development/project-setup/environment-variables.md
@@ -47,9 +47,34 @@ SMTP_ADDRESS=smtp.sendgrid.net
 SMTP_AUTHENTICATION=plain
 SMTP_DOMAIN=<your verified domain>
 SMTP_ENABLE_STARTTLS_AUTO=true
-SMTP_PASSWORD=<your Sendgrid API key>
 SMTP_PORT=587
 SMTP_USERNAME=apikey
+SMTP_PASSWORD=<your Sendgrid API key>
+```
+
+If you would like to use Mailgun to send your emails, use the following environment variables:
+```bash
+SMTP_ADDRESS=smtp.mailgun.org
+SMTP_AUTHENTICATION=plain
+SMTP_DOMAIN=<Your domain, this has to be verified in Mailgun>
+SMTP_ENABLE_STARTTLS_AUTO=true
+SMTP_PORT=587
+SMTP_USERNAME=<Your SMTP username, view under Domains tab>
+SMTP_PASSWORD=<Your SMTP password, view under Domains tab>
+```
+
+
+If you would like to use Mailchimp to send your emails, use the following environment variables:
+Note: Mandrill is the transactional email service for Mailchimp. You need to enable transactional email and login to mandrillapp.com.
+
+```bash
+SMTP_ADDRESS=smtp.mandrillapp.com
+SMTP_AUTHENTICATION=plain
+SMTP_DOMAIN=<Your verified domain in Mailchimp>
+SMTP_ENABLE_STARTTLS_AUTO=true
+SMTP_PORT=587
+SMTP_USERNAME=<Your SMTP username displayed under Settings -> SMTP & API info>
+SMTP_PASSWORD=<Any valid API key, create an API key under Settings -> SMTP & API Info>
 ```
 
 ### Configure frontend URL

From 6a7d810c953e0d228c2a834b15e73e70692b1c5e Mon Sep 17 00:00:00 2001
From: Pranav Raj S <pranav@thoughtwoot.com>
Date: Mon, 6 Jul 2020 18:14:19 +0530
Subject: [PATCH 47/50] Bug: Set auto width to email input (#1013)

Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
---
 app/javascript/widget/components/template/EmailInput.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/javascript/widget/components/template/EmailInput.vue b/app/javascript/widget/components/template/EmailInput.vue
index a257e361f..3afcebb64 100644
--- a/app/javascript/widget/components/template/EmailInput.vue
+++ b/app/javascript/widget/components/template/EmailInput.vue
@@ -94,6 +94,7 @@ export default {
     border-bottom-right-radius: 0;
     border-top-right-radius: 0;
     padding: $space-one;
+    width: auto;
 
     &.error {
       border-color: $color-error;

From 49db9c5d8a3621a3c65ba61487bfafae58104a5b Mon Sep 17 00:00:00 2001
From: Nithin David Thomas <webofnithin@gmail.com>
Date: Wed, 8 Jul 2020 00:04:44 +0530
Subject: [PATCH 48/50] Adds unread message bubbles for widget (#943)

Co-authored-by: Sojan <sojan@pepalo.com>
Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .../api/v1/widget/conversations_controller.rb |   8 +
 app/javascript/packs/widget.js                |   6 +-
 app/javascript/sdk/DOMHelpers.js              |   4 +
 app/javascript/sdk/IFrameHelper.js            |  49 ++++-
 app/javascript/sdk/bubbleHelpers.js           |  18 +-
 app/javascript/widget/App.vue                 |  97 +++++++-
 app/javascript/widget/api/conversation.js     |   8 +
 .../widget/assets/scss/_variables.scss        |   9 +
 app/javascript/widget/assets/scss/sdk.js      |  14 +-
 .../widget/components/AgentMessageBubble.vue  |   2 +-
 app/javascript/widget/helpers/actionCable.js  |   4 +-
 app/javascript/widget/i18n/locale/en.json     |   4 +
 app/javascript/widget/store/modules/agent.js  |   1 +
 .../widget/store/modules/conversation.js      |  69 +++++-
 .../store/modules/conversationAttributes.js   |   2 +
 .../specs/conversation/actions.spec.js        |   8 +
 .../specs/conversation/getters.spec.js        | 167 ++++++++++++++
 .../conversationAttributes/actions.spec.js    |   1 +
 app/javascript/widget/views/Home.vue          |  35 ++-
 app/javascript/widget/views/Router.vue        |  86 ++++++++
 app/javascript/widget/views/Unread.vue        | 207 ++++++++++++++++++
 .../widget/conversations/index.json.jbuilder  |   1 +
 config/routes.rb                              |   3 +-
 .../widget/conversations_controller_spec.rb   |  34 ++-
 spec/factories/conversations.rb               |   1 -
 25 files changed, 787 insertions(+), 51 deletions(-)
 create mode 100644 app/javascript/widget/views/Router.vue
 create mode 100644 app/javascript/widget/views/Unread.vue

diff --git a/app/controllers/api/v1/widget/conversations_controller.rb b/app/controllers/api/v1/widget/conversations_controller.rb
index e346b6367..c8d3b64a7 100644
--- a/app/controllers/api/v1/widget/conversations_controller.rb
+++ b/app/controllers/api/v1/widget/conversations_controller.rb
@@ -5,6 +5,14 @@ class Api::V1::Widget::ConversationsController < Api::V1::Widget::BaseController
     @conversation = conversation
   end
 
+  def update_last_seen
+    head :ok && return if conversation.nil?
+
+    conversation.user_last_seen_at = DateTime.now.utc
+    conversation.save!
+    head :ok
+  end
+
   def toggle_typing
     head :ok && return if conversation.nil?
 
diff --git a/app/javascript/packs/widget.js b/app/javascript/packs/widget.js
index ed9af223a..2bfdd7c52 100644
--- a/app/javascript/packs/widget.js
+++ b/app/javascript/packs/widget.js
@@ -3,7 +3,6 @@ import Vuelidate from 'vuelidate';
 import VueI18n from 'vue-i18n';
 import store from '../widget/store';
 import App from '../widget/App.vue';
-import router from '../widget/router';
 import ActionCableConnector from '../widget/helpers/actionCable';
 import i18n from '../widget/i18n';
 
@@ -15,10 +14,13 @@ Object.keys(i18n).forEach(lang => {
   Vue.locale(lang, i18n[lang]);
 });
 
+// Event Bus
+window.bus = new Vue();
+
 Vue.config.productionTip = false;
+
 window.onload = () => {
   window.WOOT_WIDGET = new Vue({
-    router,
     store,
     render: h => h(App),
   }).$mount('#app');
diff --git a/app/javascript/sdk/DOMHelpers.js b/app/javascript/sdk/DOMHelpers.js
index 66ba6446b..196a98476 100644
--- a/app/javascript/sdk/DOMHelpers.js
+++ b/app/javascript/sdk/DOMHelpers.js
@@ -61,3 +61,7 @@ export const addClass = (elm, classes) => {
 export const toggleClass = (elm, classes) => {
   classHelper(classes, 'toggle', elm);
 };
+
+export const removeClass = (elm, classes) => {
+  classHelper(classes, 'remove', elm);
+};
diff --git a/app/javascript/sdk/IFrameHelper.js b/app/javascript/sdk/IFrameHelper.js
index 751e9fa6b..c1ac73046 100644
--- a/app/javascript/sdk/IFrameHelper.js
+++ b/app/javascript/sdk/IFrameHelper.js
@@ -1,5 +1,5 @@
 import Cookies from 'js-cookie';
-import { wootOn, loadCSS } from './DOMHelpers';
+import { wootOn, loadCSS, addClass, removeClass } from './DOMHelpers';
 import {
   body,
   widgetHolder,
@@ -29,7 +29,8 @@ export const IFrameHelper = {
 
     iframe.id = 'chatwoot_live_chat_widget';
     iframe.style.visibility = 'hidden';
-    widgetHolder.className = `woot-widget-holder woot--hide woot-elements--${window.$chatwoot.position}`;
+    const HolderclassName = `woot-widget-holder woot--hide woot-elements--${window.$chatwoot.position}`;
+    addClass(widgetHolder, HolderclassName);
     widgetHolder.appendChild(iframe);
     body.appendChild(widgetHolder);
     IFrameHelper.initPostMessageCommunication();
@@ -92,6 +93,8 @@ export const IFrameHelper = {
       window.$chatwoot.hasLoaded = true;
       IFrameHelper.sendMessage('config-set', {
         locale: window.$chatwoot.locale,
+        position: window.$chatwoot.position,
+        hideMessageBubble: window.$chatwoot.hideMessageBubble,
       });
       IFrameHelper.onLoad(message.config.channelConfig);
       IFrameHelper.setCurrentUrl();
@@ -105,6 +108,37 @@ export const IFrameHelper = {
     toggleBubble: () => {
       onBubbleClick();
     },
+
+    onBubbleToggle: isOpen => {
+      if (!isOpen) {
+        IFrameHelper.events.resetUnreadMode();
+      } else {
+        IFrameHelper.pushEvent('webwidget.triggered');
+      }
+    },
+
+    setUnreadMode: message => {
+      const { unreadMessageCount } = message;
+      const { isOpen } = window.$chatwoot;
+      const toggleValue = true;
+
+      if (!isOpen && unreadMessageCount > 0) {
+        IFrameHelper.sendMessage('set-unread-view');
+        onBubbleClick({ toggleValue });
+        const holderEl = document.querySelector('.woot-widget-holder');
+        addClass(holderEl, 'has-unread-view');
+      }
+    },
+
+    resetUnreadMode: () => {
+      IFrameHelper.sendMessage('unset-unread-view');
+      IFrameHelper.events.removeUnreadClass();
+    },
+
+    removeUnreadClass: () => {
+      const holderEl = document.querySelector('.woot-widget-holder');
+      removeClass(holderEl, 'has-unread-view');
+    },
   },
   pushEvent: eventName => {
     IFrameHelper.sendMessage('push-event', { eventName });
@@ -125,7 +159,8 @@ export const IFrameHelper = {
       });
 
       const closeIcon = closeBubble;
-      closeIcon.className = `woot-elements--${window.$chatwoot.position} woot-widget-bubble woot--close woot--hide`;
+      const closeIconclassName = `woot-elements--${window.$chatwoot.position} woot-widget-bubble woot--close woot--hide`;
+      addClass(closeIcon, closeIconclassName);
 
       chatIcon.style.background = widgetColor;
       closeIcon.style.background = widgetColor;
@@ -143,9 +178,13 @@ export const IFrameHelper = {
   },
   toggleCloseButton: () => {
     if (window.matchMedia('(max-width: 668px)').matches) {
-      IFrameHelper.sendMessage('toggle-close-button', { showClose: true });
+      IFrameHelper.sendMessage('toggle-close-button', {
+        showClose: true,
+      });
     } else {
-      IFrameHelper.sendMessage('toggle-close-button', { showClose: false });
+      IFrameHelper.sendMessage('toggle-close-button', {
+        showClose: false,
+      });
     }
   },
 };
diff --git a/app/javascript/sdk/bubbleHelpers.js b/app/javascript/sdk/bubbleHelpers.js
index cb58a4431..7499d337b 100644
--- a/app/javascript/sdk/bubbleHelpers.js
+++ b/app/javascript/sdk/bubbleHelpers.js
@@ -31,13 +31,17 @@ export const createNotificationBubble = () => {
   return notificationBubble;
 };
 
-export const onBubbleClick = () => {
-  window.$chatwoot.isOpen = !window.$chatwoot.isOpen;
-  toggleClass(chatBubble, 'woot--hide');
-  toggleClass(closeBubble, 'woot--hide');
-  toggleClass(widgetHolder, 'woot--hide');
-  if (window.$chatwoot.isOpen) {
-    IFrameHelper.pushEvent('webwidget.triggered');
+export const onBubbleClick = (props = {}) => {
+  const { toggleValue } = props;
+  const { isOpen } = window.$chatwoot;
+  if (isOpen !== toggleValue) {
+    const newIsOpen = toggleValue === undefined ? !isOpen : toggleValue;
+    window.$chatwoot.isOpen = newIsOpen;
+
+    toggleClass(chatBubble, 'woot--hide');
+    toggleClass(closeBubble, 'woot--hide');
+    toggleClass(widgetHolder, 'woot--hide');
+    IFrameHelper.events.onBubbleToggle(newIsOpen);
   }
 };
 
diff --git a/app/javascript/widget/App.vue b/app/javascript/widget/App.vue
index e5414a1ac..bdbd1388c 100755
--- a/app/javascript/widget/App.vue
+++ b/app/javascript/widget/App.vue
@@ -1,22 +1,57 @@
 <template>
-  <div id="app" class="woot-widget-wrap" :class="{ 'is-mobile': isMobile }">
-    <router-view />
-  </div>
+  <router
+    :show-unread-view="showUnreadView"
+    :is-mobile="isMobile"
+    :grouped-messages="groupedMessages"
+    :unread-messages="unreadMessages"
+    :conversation-size="conversationSize"
+    :available-agents="availableAgents"
+    :has-fetched="hasFetched"
+    :conversation-attributes="conversationAttributes"
+    :unread-message-count="unreadMessageCount"
+    :is-left-aligned="isLeftAligned"
+    :hide-message-bubble="hideMessageBubble"
+  />
 </template>
 
 <script>
-import { mapActions } from 'vuex';
+/* global bus */
+
+import Vue from 'vue';
+import { mapGetters, mapActions } from 'vuex';
 import { setHeader } from 'widget/helpers/axios';
 import { IFrameHelper } from 'widget/helpers/utils';
-import Vue from 'vue';
+
+import Router from './views/Router';
 
 export default {
   name: 'App',
+  components: {
+    Router,
+  },
   data() {
     return {
+      showUnreadView: false,
       isMobile: false,
+      hideMessageBubble: false,
+      widgetPosition: 'right',
     };
   },
+  computed: {
+    ...mapGetters({
+      groupedMessages: 'conversation/getGroupedConversation',
+      unreadMessages: 'conversation/getUnreadTextMessages',
+      conversationSize: 'conversation/getConversationSize',
+      availableAgents: 'agent/availableAgents',
+      hasFetched: 'agent/getHasFetched',
+      conversationAttributes: 'conversationAttributes/getConversationParams',
+      unreadMessageCount: 'conversation/getUnreadMessageCount',
+    }),
+    isLeftAligned() {
+      const isLeft = this.widgetPosition === 'left';
+      return isLeft;
+    },
+  },
   mounted() {
     const { websiteToken, locale } = window.chatwootWebChannel;
     this.setLocale(locale);
@@ -42,9 +77,13 @@ export default {
 
       const message = JSON.parse(e.data.replace(wootPrefix, ''));
       if (message.event === 'config-set') {
-        this.fetchOldConversations();
+        this.fetchOldConversations().then(() => {
+          this.setUnreadView();
+        });
         this.fetchAvailableAgents(websiteToken);
         this.setLocale(message.locale);
+        this.setPosition(message.position);
+        this.setHideMessageBubble(message.hideMessageBubble);
       } else if (message.event === 'widget-visible') {
         this.scrollConversationToBottom();
       } else if (message.event === 'set-current-url') {
@@ -52,7 +91,7 @@ export default {
       } else if (message.event === 'toggle-close-button') {
         this.isMobile = message.showClose;
       } else if (message.event === 'push-event') {
-        this.$store.dispatch('events/create', { name: message.eventName });
+        this.createWidgetEvents(message);
       } else if (message.event === 'set-label') {
         this.$store.dispatch('conversationLabels/create', message.label);
       } else if (message.event === 'remove-label') {
@@ -61,14 +100,19 @@ export default {
         this.$store.dispatch('contacts/update', message);
       } else if (message.event === 'set-locale') {
         this.setLocale(message.locale);
+      } else if (message.event === 'set-unread-view') {
+        this.showUnreadView = true;
+      } else if (message.event === 'unset-unread-view') {
+        this.showUnreadView = false;
       }
     });
 
     this.$store.dispatch('conversationAttributes/get');
+    this.registerUnreadEvents();
   },
   methods: {
     ...mapActions('appConfig', ['setWidgetColor']),
-    ...mapActions('conversation', ['fetchOldConversations']),
+    ...mapActions('conversation', ['fetchOldConversations', 'setUserLastSeen']),
     ...mapActions('agent', ['fetchAvailableAgents']),
     scrollConversationToBottom() {
       const container = this.$el.querySelector('.conversation-wrap');
@@ -80,6 +124,43 @@ export default {
         Vue.config.lang = locale;
       }
     },
+    setPosition(position) {
+      const widgetPosition = position || 'right';
+      this.widgetPosition = widgetPosition;
+    },
+    setHideMessageBubble(hideBubble) {
+      this.hideMessageBubble = !!hideBubble;
+    },
+    registerUnreadEvents() {
+      bus.$on('on-agent-message-recieved', () => this.setUnreadView());
+      bus.$on('on-unread-view-clicked', () => {
+        this.unsetUnreadView();
+        this.setUserLastSeen();
+      });
+    },
+    setUnreadView() {
+      const { unreadMessageCount } = this;
+      if (IFrameHelper.isIFrame() && unreadMessageCount > 0) {
+        IFrameHelper.sendMessage({
+          event: 'setUnreadMode',
+          unreadMessageCount,
+        });
+      }
+    },
+    unsetUnreadView() {
+      if (IFrameHelper.isIFrame()) {
+        IFrameHelper.sendMessage({ event: 'resetUnreadMode' });
+      }
+    },
+    createWidgetEvents(message) {
+      const { eventName } = message;
+      const isWidgetTriggerEvent = eventName === 'webwidget.triggered';
+      if (isWidgetTriggerEvent && this.showUnreadView) {
+        return;
+      }
+      this.setUserLastSeen();
+      this.$store.dispatch('events/create', { name: eventName });
+    },
   },
 };
 </script>
diff --git a/app/javascript/widget/api/conversation.js b/app/javascript/widget/api/conversation.js
index d70aaf342..9933e529a 100755
--- a/app/javascript/widget/api/conversation.js
+++ b/app/javascript/widget/api/conversation.js
@@ -30,10 +30,18 @@ const toggleTyping = async ({ typingStatus }) => {
   );
 };
 
+const setUserLastSeenAt = async ({ lastSeen }) => {
+  return API.post(
+    `/api/v1/widget/conversations/update_last_seen${window.location.search}`,
+    { user_last_seen_at: lastSeen }
+  );
+};
+
 export {
   sendMessageAPI,
   getConversationAPI,
   getMessagesAPI,
   sendAttachmentAPI,
   toggleTyping,
+  setUserLastSeenAt,
 };
diff --git a/app/javascript/widget/assets/scss/_variables.scss b/app/javascript/widget/assets/scss/_variables.scss
index 7c3ba1a9b..f7f3837a3 100755
--- a/app/javascript/widget/assets/scss/_variables.scss
+++ b/app/javascript/widget/assets/scss/_variables.scss
@@ -60,6 +60,11 @@ $color-body: #3c4858;
 $color-heading: #1f2d3d;
 $color-error: #ff382d;
 
+// Color-palettes
+
+$color-primary-light: #c7e3ff;
+$color-primary-dark: darken($color-woot, 20%);
+
 
 // Thumbnail
 $thumbnail-radius: 4rem;
@@ -110,3 +115,7 @@ $spinkit-size: 1.6rem !default;
 
 // Break points
 $break-point-medium: 667px;
+
+// Timing functions
+
+$ease-in-cubic: cubic-bezier(.17, .67, .83, .67);
diff --git a/app/javascript/widget/assets/scss/sdk.js b/app/javascript/widget/assets/scss/sdk.js
index bee0ca26e..558812c57 100644
--- a/app/javascript/widget/assets/scss/sdk.js
+++ b/app/javascript/widget/assets/scss/sdk.js
@@ -11,6 +11,18 @@ export const SDK_CSS = ` .woot-widget-holder {
   transition-duration: 0.5s, 0.5s;
 }
 
+.woot-widget-holder.has-unread-view {
+  box-shadow: none !important;
+  -moz-box-shadow: none !important;
+  -o-box-shadow: none !important;
+  -webkit-box-shadow: none !important;
+  -o-border-radius: 0 !important;
+  -moz-border-radius: 0 !important;
+  -webkit-border-radius: 0 !important;
+  border-radius: 0 !important;
+  bottom: 94px;
+}
+
 .woot-widget-holder iframe {
   width: 100% !important;
   height: 100% !important;
@@ -94,7 +106,7 @@ export const SDK_CSS = ` .woot-widget-holder {
   visibility: hidden !important;
   z-index: -1 !important;
   opacity: 0;
-  bottom: 60px;
+  bottom: -20000px;
 }
 
 @media only screen and (max-width: 667px) {
diff --git a/app/javascript/widget/components/AgentMessageBubble.vue b/app/javascript/widget/components/AgentMessageBubble.vue
index 1062614da..2676839a6 100755
--- a/app/javascript/widget/components/AgentMessageBubble.vue
+++ b/app/javascript/widget/components/AgentMessageBubble.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="chat-bubble-wrap">
     <div
       v-if="!isCards && !isOptions && !isForm && !isArticle"
       class="chat-bubble agent"
diff --git a/app/javascript/widget/helpers/actionCable.js b/app/javascript/widget/helpers/actionCable.js
index 35ca89bfd..6cb760b15 100644
--- a/app/javascript/widget/helpers/actionCable.js
+++ b/app/javascript/widget/helpers/actionCable.js
@@ -19,7 +19,9 @@ class ActionCableConnector extends BaseActionCableConnector {
   };
 
   onMessageCreated = data => {
-    this.app.$store.dispatch('conversation/addMessage', data);
+    this.app.$store.dispatch('conversation/addMessage', data).then(() => {
+      window.bus.$emit('on-agent-message-recieved');
+    });
   };
 
   onMessageUpdated = data => {
diff --git a/app/javascript/widget/i18n/locale/en.json b/app/javascript/widget/i18n/locale/en.json
index eeebff666..011adeae1 100644
--- a/app/javascript/widget/i18n/locale/en.json
+++ b/app/javascript/widget/i18n/locale/en.json
@@ -14,6 +14,10 @@
     "OTHERS_ARE_AVAILABLE": "others are available",
     "AND": "and"
   },
+  "UNREAD_VIEW": {
+    "VIEW_MESSAGES_BUTTON": "See new messages",
+    "CLOSE_MESSAGES_BUTTON": "Close"
+  },
   "POWERED_BY": "Powered by Chatwoot",
   "EMAIL_PLACEHOLDER": "Please enter your email",
   "CHAT_PLACEHOLDER": "Type your message"
diff --git a/app/javascript/widget/store/modules/agent.js b/app/javascript/widget/store/modules/agent.js
index 85b44bac8..9da668827 100644
--- a/app/javascript/widget/store/modules/agent.js
+++ b/app/javascript/widget/store/modules/agent.js
@@ -11,6 +11,7 @@ const state = {
 };
 
 export const getters = {
+  getHasFetched: $state => $state.uiFlags.hasFetched,
   availableAgents: $state =>
     $state.records.filter(agent => agent.availability_status === 'online'),
 };
diff --git a/app/javascript/widget/store/modules/conversation.js b/app/javascript/widget/store/modules/conversation.js
index 92b602045..14e3abbf1 100755
--- a/app/javascript/widget/store/modules/conversation.js
+++ b/app/javascript/widget/store/modules/conversation.js
@@ -5,6 +5,7 @@ import {
   getMessagesAPI,
   sendAttachmentAPI,
   toggleTyping,
+  setUserLastSeenAt,
 } from 'widget/api/conversation';
 import { MESSAGE_TYPE } from 'widget/helpers/constants';
 import { playNotificationAudio } from 'shared/helpers/AudioNotificationHelper';
@@ -59,10 +60,22 @@ export const findUndeliveredMessage = (messageInbox, { content }) =>
     message => message.content === content && message.status === 'in_progress'
   );
 
+export const onNewMessageCreated = data => {
+  const { message_type: messageType } = data;
+  const isIncomingMessage = messageType === MESSAGE_TYPE.OUTGOING;
+
+  if (isIncomingMessage) {
+    playNotificationAudio();
+  }
+};
+
 export const DEFAULT_CONVERSATION = 'default';
 
 const state = {
   conversations: {},
+  meta: {
+    userLastSeenAt: undefined,
+  },
   uiFlags: {
     allMessagesLoaded: false,
     isFetchingList: false,
@@ -93,6 +106,31 @@ export const getters = {
     }));
   },
   getIsFetchingList: _state => _state.uiFlags.isFetchingList,
+  getUnreadMessageCount: _state => {
+    const { userLastSeenAt } = _state.meta;
+    console.log(userLastSeenAt);
+    const count = Object.values(_state.conversations).filter(chat => {
+      const { created_at: createdAt, message_type: messageType } = chat;
+      const isOutGoing = messageType === MESSAGE_TYPE.OUTGOING;
+      const hasNotSeen = userLastSeenAt
+        ? createdAt * 1000 > userLastSeenAt * 1000
+        : true;
+      return hasNotSeen && isOutGoing;
+    }).length;
+    return count;
+  },
+  getUnreadTextMessages: (_state, _getters) => {
+    const unreadCount = _getters.getUnreadMessageCount;
+    const allMessages = [...Object.values(_state.conversations)];
+    console.log(unreadCount);
+    const unreadAgentMessages = allMessages.filter(message => {
+      const { message_type: messageType } = message;
+      return messageType === MESSAGE_TYPE.OUTGOING;
+    });
+    const maxUnreadCount = Math.min(unreadCount, 3);
+    const allUnreadMessages = unreadAgentMessages.splice(-maxUnreadCount);
+    return allUnreadMessages;
+  },
 };
 
 export const actions = {
@@ -112,7 +150,9 @@ export const actions = {
       file_type: fileType,
       status: 'in_progress',
     };
-    const tempMessage = createTemporaryMessage({ attachments: [attachment] });
+    const tempMessage = createTemporaryMessage({
+      attachments: [attachment],
+    });
     commit('pushMessageToConversation', tempMessage);
     try {
       const { data } = await sendAttachmentAPI(params);
@@ -136,12 +176,9 @@ export const actions = {
     }
   },
 
-  addMessage({ commit }, data) {
-    if (data.message_type === MESSAGE_TYPE.OUTGOING) {
-      playNotificationAudio();
-    }
-
+  addMessage: async ({ commit }, data) => {
     commit('pushMessageToConversation', data);
+    onNewMessageCreated(data);
   },
 
   updateMessage({ commit }, data) {
@@ -156,7 +193,21 @@ export const actions = {
     try {
       await toggleTyping(data);
     } catch (error) {
-      // console error
+      // IgnoreError
+    }
+  },
+
+  setUserLastSeen: async ({ commit, getters: appGetters }) => {
+    if (!appGetters.getConversationSize) {
+      return;
+    }
+
+    const lastSeen = Date.now() / 1000;
+    try {
+      commit('setMetaUserLastSeenAt', lastSeen);
+      await setUserLastSeenAt({ lastSeen });
+    } catch (error) {
+      // IgnoreError
     }
   },
 };
@@ -224,6 +275,10 @@ export const mutations = {
     const isTyping = status === 'on';
     $state.uiFlags.isAgentTyping = isTyping;
   },
+
+  setMetaUserLastSeenAt($state, lastSeen) {
+    $state.meta.userLastSeenAt = lastSeen;
+  },
 };
 
 export default {
diff --git a/app/javascript/widget/store/modules/conversationAttributes.js b/app/javascript/widget/store/modules/conversationAttributes.js
index 7f0a82d56..b4cbdeec0 100644
--- a/app/javascript/widget/store/modules/conversationAttributes.js
+++ b/app/javascript/widget/store/modules/conversationAttributes.js
@@ -17,7 +17,9 @@ export const actions = {
   get: async ({ commit }) => {
     try {
       const { data } = await getConversationAPI();
+      const { user_last_seen_at: lastSeen } = data;
       commit(SET_CONVERSATION_ATTRIBUTES, data);
+      commit('conversation/setMetaUserLastSeenAt', lastSeen, { root: true });
     } catch (error) {
       // Ignore 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 73c523231..d8c300727 100644
--- a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
@@ -86,4 +86,12 @@ describe('#actions', () => {
       });
     });
   });
+
+  describe('#setUserLastSeen', () => {
+    it('sends correct mutations', () => {
+      const lastSeen = Math.abs(Date.now() / 1000);
+      actions.setUserLastSeen({ commit }, { lastSeen });
+      expect(commit).toBeCalledWith('setMetaUserLastSeenAt', lastSeen);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
index 99f1c983a..2eb448a09 100644
--- a/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/getters.spec.js
@@ -262,4 +262,171 @@ describe('#getters', () => {
       },
     ]);
   });
+
+  describe('getUnreadMessageCount returns', () => {
+    it('0 if there are no messages and last seen is undefined', () => {
+      const state = {
+        conversations: {},
+        meta: {
+          userLastSeenAt: undefined,
+        },
+      };
+      expect(getters.getUnreadMessageCount(state)).toEqual(0);
+    });
+
+    it('0 if there are no messages and last seen is present', () => {
+      const state = {
+        conversations: {},
+        meta: {
+          userLastSeenAt: Date.now(),
+        },
+      };
+      expect(getters.getUnreadMessageCount(state)).toEqual(0);
+    });
+
+    it('unread count if there are messages and last seen is before messages created-at', () => {
+      const state = {
+        conversations: {
+          1: {
+            id: 1,
+            content: 'Thanks for the help',
+            created_at: 1574075964,
+            message_type: 1,
+          },
+          2: {
+            id: 2,
+            content: 'Yes, It makes sense',
+            created_at: 1574092218,
+            message_type: 1,
+          },
+        },
+        meta: {
+          userLastSeenAt: 1474075964,
+        },
+      };
+      expect(getters.getUnreadMessageCount(state)).toEqual(2);
+    });
+
+    it('unread count if there are messages and last seen is after messages created-at', () => {
+      const state = {
+        conversations: {
+          1: {
+            id: 1,
+            content: 'Thanks for the help',
+            created_at: 1574075964,
+            message_type: 1,
+          },
+          2: {
+            id: 2,
+            content: 'Yes, It makes sense',
+            created_at: 1574092218,
+            message_type: 1,
+          },
+          3: {
+            id: 3,
+            content: 'Yes, It makes sense',
+            created_at: 1574092218,
+            message_type: 0,
+          },
+        },
+        meta: {
+          userLastSeenAt: 1674075964,
+        },
+      };
+      expect(getters.getUnreadMessageCount(state)).toEqual(0);
+    });
+  });
+
+  describe('getUnreadTextMessages returns', () => {
+    it('no messages if there are no messages and last seen is undefined', () => {
+      const state = {
+        conversations: {},
+        meta: {
+          userLastSeenAt: undefined,
+        },
+      };
+      expect(
+        getters.getUnreadTextMessages(state, { getUnreadMessageCount: 0 })
+      ).toEqual([]);
+    });
+
+    it('0 if there are no messages and last seen is present', () => {
+      const state = {
+        conversations: {},
+        meta: {
+          userLastSeenAt: Date.now(),
+        },
+      };
+      expect(
+        getters.getUnreadTextMessages(state, { getUnreadMessageCount: 0 })
+      ).toEqual([]);
+    });
+
+    it('only unread text messages from agent if there are messages and last seen is before messages created-at', () => {
+      const state = {
+        conversations: {
+          1: {
+            id: 1,
+            content: 'Thanks for the help',
+            created_at: 1574075964,
+            message_type: 1,
+          },
+          2: {
+            id: 2,
+            content: 'Yes, It makes sense',
+            created_at: 1574092218,
+            message_type: 0,
+          },
+        },
+      };
+      expect(
+        getters.getUnreadTextMessages(state, { getUnreadMessageCount: 1 })
+      ).toEqual([
+        {
+          id: 1,
+          content: 'Thanks for the help',
+          created_at: 1574075964,
+          message_type: 1,
+        },
+      ]);
+    });
+
+    it('unread messages omitting seen messages ', () => {
+      const state = {
+        conversations: {
+          1: {
+            id: 1,
+            content: 'Thanks for the help',
+            created_at: 1574075964,
+            message_type: 1,
+          },
+          2: {
+            id: 2,
+            content: 'Yes, It makes sense',
+            created_at: 1674075965,
+            message_type: 1,
+          },
+          3: {
+            id: 3,
+            content: 'Yes, It makes sense',
+            created_at: 1574092218,
+            message_type: 0,
+          },
+        },
+        meta: {
+          userLastSeenAt: 1674075964,
+        },
+      };
+      expect(
+        getters.getUnreadTextMessages(state, { getUnreadMessageCount: 1 })
+      ).toEqual([
+        {
+          id: 2,
+          content: 'Yes, It makes sense',
+          created_at: 1674075965,
+          message_type: 1,
+        },
+      ]);
+    });
+  });
 });
diff --git a/app/javascript/widget/store/modules/specs/conversationAttributes/actions.spec.js b/app/javascript/widget/store/modules/specs/conversationAttributes/actions.spec.js
index 6267dd56a..15a447e85 100644
--- a/app/javascript/widget/store/modules/specs/conversationAttributes/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversationAttributes/actions.spec.js
@@ -11,6 +11,7 @@ describe('#actions', () => {
       await actions.get({ commit });
       expect(commit.mock.calls).toEqual([
         ['SET_CONVERSATION_ATTRIBUTES', { id: 1, status: 'bot' }],
+        ['conversation/setMetaUserLastSeenAt', undefined, { root: true }],
       ]);
     });
     it('doesnot send mutation if api is error', async () => {
diff --git a/app/javascript/widget/views/Home.vue b/app/javascript/widget/views/Home.vue
index 6e8724f68..127d8ca64 100755
--- a/app/javascript/widget/views/Home.vue
+++ b/app/javascript/widget/views/Home.vue
@@ -25,8 +25,6 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
-
 import Branding from 'widget/components/Branding.vue';
 import ChatFooter from 'widget/components/ChatFooter.vue';
 import ChatHeaderExpanded from 'widget/components/ChatHeaderExpanded.vue';
@@ -46,14 +44,33 @@ export default {
     AvailableAgents,
   },
   mixins: [configMixin],
+  props: {
+    groupedMessages: {
+      type: Array,
+      default: () => [],
+    },
+    conversationSize: {
+      type: Number,
+      default: 0,
+    },
+    availableAgents: {
+      type: Array,
+      default: () => [],
+    },
+    hasFetched: {
+      type: Boolean,
+      default: false,
+    },
+    conversationAttributes: {
+      type: Object,
+      default: () => {},
+    },
+    unreadMessageCount: {
+      type: Number,
+      default: 0,
+    },
+  },
   computed: {
-    ...mapGetters({
-      groupedMessages: 'conversation/getGroupedConversation',
-      conversationSize: 'conversation/getConversationSize',
-      availableAgents: 'agent/availableAgents',
-      hasFetched: 'agent/uiFlags/hasFetched',
-      conversationAttributes: 'conversationAttributes/getConversationParams',
-    }),
     isOpen() {
       return this.conversationAttributes.status === 'open';
     },
diff --git a/app/javascript/widget/views/Router.vue b/app/javascript/widget/views/Router.vue
new file mode 100644
index 000000000..8ec274cd6
--- /dev/null
+++ b/app/javascript/widget/views/Router.vue
@@ -0,0 +1,86 @@
+<template>
+  <div
+    id="app"
+    class="woot-widget-wrap"
+    :class="{ 'is-mobile': isMobile, 'is-widget-right': !isLeftAligned }"
+  >
+    <home
+      v-if="!showUnreadView"
+      :grouped-messages="groupedMessages"
+      :conversation-size="conversationSize"
+      :available-agents="availableAgents"
+      :has-fetched="hasFetched"
+      :conversation-attributes="conversationAttributes"
+      :unread-message-count="unreadMessageCount"
+    />
+    <unread
+      v-else
+      :unread-messages="unreadMessages"
+      :conversation-size="conversationSize"
+      :available-agents="availableAgents"
+      :has-fetched="hasFetched"
+      :conversation-attributes="conversationAttributes"
+      :unread-message-count="unreadMessageCount"
+      :hide-message-bubble="hideMessageBubble"
+    />
+  </div>
+</template>
+
+<script>
+import Home from './Home';
+import Unread from './Unread';
+
+export default {
+  name: 'Router',
+  components: {
+    Home,
+    Unread,
+  },
+  props: {
+    groupedMessages: {
+      type: Array,
+      default: () => [],
+    },
+    unreadMessages: {
+      type: Array,
+      default: () => [],
+    },
+    conversationSize: {
+      type: Number,
+      default: 0,
+    },
+    availableAgents: {
+      type: Array,
+      default: () => [],
+    },
+    hasFetched: {
+      type: Boolean,
+      default: false,
+    },
+    isMobile: {
+      type: Boolean,
+      default: false,
+    },
+    isLeftAligned: {
+      type: Boolean,
+      default: false,
+    },
+    showUnreadView: {
+      type: Boolean,
+      default: false,
+    },
+    hideMessageBubble: {
+      type: Boolean,
+      default: false,
+    },
+    conversationAttributes: {
+      type: Object,
+      default: () => {},
+    },
+    unreadMessageCount: {
+      type: Number,
+      default: 0,
+    },
+  },
+};
+</script>
diff --git a/app/javascript/widget/views/Unread.vue b/app/javascript/widget/views/Unread.vue
new file mode 100644
index 000000000..2707f0638
--- /dev/null
+++ b/app/javascript/widget/views/Unread.vue
@@ -0,0 +1,207 @@
+<template>
+  <div class="unread-wrap">
+    <div class="close-unread-wrap">
+      <button
+        v-if="showCloseButton"
+        class="button small close-unread-button"
+        @click="closeFullView"
+      >
+        <i class="ion-close-round" />
+        {{ $t('UNREAD_VIEW.CLOSE_MESSAGES_BUTTON') }}
+      </button>
+    </div>
+    <div class="unread-messages">
+      <agent-bubble
+        v-for="message in unreadMessages"
+        :key="message.id"
+        :message-id="message.id"
+        :message="message.content"
+      />
+    </div>
+    <div>
+      <button
+        v-if="unreadMessageCount"
+        class="button clear-button"
+        @click="openFullView"
+      >
+        <i class="ion-arrow-right-c" />
+        {{ $t('UNREAD_VIEW.VIEW_MESSAGES_BUTTON') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script>
+/* global bus */
+
+import { IFrameHelper } from 'widget/helpers/utils';
+import AgentBubble from 'widget/components/AgentMessageBubble.vue';
+import configMixin from '../mixins/configMixin';
+
+export default {
+  name: 'Unread',
+  components: {
+    AgentBubble,
+  },
+  mixins: [configMixin],
+  props: {
+    unreadMessages: {
+      type: Array,
+      default: () => [],
+    },
+    conversationSize: {
+      type: Number,
+      default: 0,
+    },
+    availableAgents: {
+      type: Array,
+      default: () => [],
+    },
+    hasFetched: {
+      type: Boolean,
+      default: false,
+    },
+    conversationAttributes: {
+      type: Object,
+      default: () => {},
+    },
+    unreadMessageCount: {
+      type: Number,
+      default: 0,
+    },
+    hideMessageBubble: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    showCloseButton() {
+      return this.unreadMessageCount && this.hideMessageBubble;
+    },
+  },
+  methods: {
+    openFullView() {
+      bus.$emit('on-unread-view-clicked');
+    },
+    closeFullView() {
+      if (IFrameHelper.isIFrame()) {
+        IFrameHelper.sendMessage({
+          event: 'toggleBubble',
+        });
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+@import '~widget/assets/scss/woot.scss';
+.unread-wrap {
+  width: 100%;
+  height: 100%;
+  background: transparent;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  justify-content: flex-end;
+  overflow: hidden;
+
+  .unread-messages {
+    padding-bottom: $space-small;
+  }
+
+  .clear-button {
+    background: transparent;
+    color: $color-woot;
+    padding: 0;
+    border: 0;
+    font-weight: $font-weight-bold;
+    font-size: $font-size-medium;
+    transition: all 0.3s $ease-in-cubic;
+    margin-left: $space-smaller;
+    padding-right: $space-one;
+
+    &:hover {
+      transform: translateX($space-smaller);
+      color: $color-primary-dark;
+    }
+  }
+
+  .close-unread-button {
+    background: $color-background;
+    color: $color-gray;
+    border: 0;
+    font-weight: $font-weight-bold;
+    font-size: $font-size-small;
+    transition: all 0.3s $ease-in-cubic;
+    margin-bottom: $space-slab;
+    border-radius: $space-normal;
+
+    &:hover {
+      color: $color-body;
+    }
+  }
+
+  .close-unread-wrap {
+    text-align: left;
+  }
+}
+</style>
+
+<style lang="scss">
+@import '~widget/assets/scss/woot.scss';
+
+.unread-messages {
+  width: 100%;
+  margin-top: auto;
+  padding-bottom: $space-small;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  overflow-y: auto;
+
+  .chat-bubble-wrap {
+    margin-bottom: $space-smaller;
+
+    &:first-child {
+      margin-top: auto;
+    }
+    .chat-bubble {
+      border: 1px solid $color-border-dark;
+    }
+
+    + .chat-bubble-wrap {
+      .chat-bubble {
+        border-top-left-radius: $space-smaller;
+      }
+    }
+    &:last-child .chat-bubble {
+      border-bottom-left-radius: $space-two;
+    }
+  }
+}
+
+.is-widget-right .unread-wrap {
+  text-align: right;
+  overflow: hidden;
+
+  .chat-bubble-wrap {
+    .chat-bubble {
+      border-radius: $space-two;
+      border-bottom-right-radius: $space-smaller;
+    }
+
+    + .chat-bubble-wrap {
+      .chat-bubble {
+        border-top-right-radius: $space-smaller;
+      }
+    }
+    &:last-child .chat-bubble {
+      border-bottom-right-radius: $space-two;
+    }
+  }
+
+  .close-unread-wrap {
+    text-align: right;
+  }
+}
+</style>
diff --git a/app/views/api/v1/widget/conversations/index.json.jbuilder b/app/views/api/v1/widget/conversations/index.json.jbuilder
index 5c15a8364..8eb943785 100644
--- a/app/views/api/v1/widget/conversations/index.json.jbuilder
+++ b/app/views/api/v1/widget/conversations/index.json.jbuilder
@@ -1,5 +1,6 @@
 if @conversation
   json.id @conversation.display_id
   json.inbox_id @conversation.inbox_id
+  json.user_last_seen_at @conversation.user_last_seen_at.to_i
   json.status @conversation.status
 end
diff --git a/config/routes.rb b/config/routes.rb
index 7c41848a4..0023e81ad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -109,8 +109,9 @@ Rails.application.routes.draw do
       namespace :widget do
         resources :events, only: [:create]
         resources :messages, only: [:index, :create, :update]
-        resources :conversations do
+        resources :conversations, only: [:index] do
           collection do
+            post :update_last_seen
             post :toggle_typing
           end
         end
diff --git a/spec/controllers/api/v1/widget/conversations_controller_spec.rb b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
index 7b3cc6538..8056b552f 100644
--- a/spec/controllers/api/v1/widget/conversations_controller_spec.rb
+++ b/spec/controllers/api/v1/widget/conversations_controller_spec.rb
@@ -9,6 +9,24 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', 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 }
 
+  describe 'GET /api/v1/widget/conversations' do
+    context 'with a conversation' do
+      it 'returns the correct conversation params' do
+        allow(Rails.configuration.dispatcher).to receive(:dispatch)
+        get '/api/v1/widget/conversations',
+            headers: { 'X-Auth-Token' => token },
+            params: { website_token: web_widget.website_token },
+            as: :json
+
+        expect(response).to have_http_status(:success)
+        json_response = JSON.parse(response.body)
+
+        expect(json_response['id']).to eq(conversation.display_id)
+        expect(json_response['status']).to eq(conversation.status)
+      end
+    end
+  end
+
   describe 'POST /api/v1/widget/conversations/toggle_typing' do
     context 'with a conversation' do
       it 'dispatches the correct typing status' do
@@ -25,20 +43,20 @@ RSpec.describe '/api/v1/widget/conversations/toggle_typing', type: :request do
     end
   end
 
-  describe 'POST /api/v1/widget/conversations' do
+  describe 'POST /api/v1/widget/conversations/update_last_seen' do
     context 'with a conversation' do
       it 'returns the correct conversation params' do
         allow(Rails.configuration.dispatcher).to receive(:dispatch)
-        get '/api/v1/widget/conversations',
-            headers: { 'X-Auth-Token' => token },
-            params: { website_token: web_widget.website_token },
-            as: :json
+        expect(conversation.user_last_seen_at).to eq(nil)
+
+        post '/api/v1/widget/conversations/update_last_seen',
+             headers: { 'X-Auth-Token' => token },
+             params: { website_token: web_widget.website_token },
+             as: :json
 
         expect(response).to have_http_status(:success)
-        json_response = JSON.parse(response.body)
 
-        expect(json_response['id']).to eq(conversation.display_id)
-        expect(json_response['status']).to eq(conversation.status)
+        expect(conversation.reload.user_last_seen_at).not_to eq(nil)
       end
     end
   end
diff --git a/spec/factories/conversations.rb b/spec/factories/conversations.rb
index ca5960a51..e3647cc64 100644
--- a/spec/factories/conversations.rb
+++ b/spec/factories/conversations.rb
@@ -4,7 +4,6 @@ FactoryBot.define do
   factory :conversation do
     status { 'open' }
     display_id { rand(10_000_000) }
-    user_last_seen_at { Time.current }
     agent_last_seen_at { Time.current }
     locked { false }
     identifier { SecureRandom.hex }

From 0fc0dc1683a7090ead71f298aeef4635a173d776 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Jul 2020 00:14:07 +0530
Subject: [PATCH 49/50] Chore: Refactor round robin logic (#1015)

Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
---
 .rubocop.yml                                  |  2 +
 .rubocop_todo.yml                             | 18 ------
 app/models/conversation.rb                    |  2 +-
 app/models/inbox.rb                           | 11 +---
 app/models/inbox_member.rb                    |  8 +--
 app/models/message.rb                         |  5 +-
 .../round_robin/assignment_service.rb         | 24 +++++++
 app/services/round_robin/manage_service.rb    | 56 +++++++++++++++++
 .../conversation_reply_email_worker.rb        |  7 ++-
 config/initializers/redis.rb                  |  3 +-
 config/puma.rb                                |  4 +-
 db/migrate/20170525104650_round_robin.rb      |  2 +-
 lib/constants/redis_keys.rb                   |  3 -
 lib/online_status_tracker.rb                  |  6 +-
 lib/redis/alfred.rb                           | 63 +++++++++++--------
 lib/redis/redis_keys.rb                       | 13 ++++
 spec/models/conversation_spec.rb              |  3 +
 .../round_robin/manage_service_spec.rb        | 41 ++++++++++++
 18 files changed, 197 insertions(+), 74 deletions(-)
 create mode 100644 app/services/round_robin/assignment_service.rb
 create mode 100644 app/services/round_robin/manage_service.rb
 delete mode 100644 lib/constants/redis_keys.rb
 create mode 100644 lib/redis/redis_keys.rb
 create mode 100644 spec/services/round_robin/manage_service_spec.rb

diff --git a/.rubocop.yml b/.rubocop.yml
index 4d75629e8..ab5efd6c8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -39,6 +39,8 @@ Style/HashTransformKeys:
   Enabled: true
 Style/HashTransformValues:
   Enabled: true
+Style/RedundantFetchBlock:
+  Enabled: true
 Style/RedundantRegexpCharacterClass:
   Enabled: true
 Style/RedundantRegexpEscape:
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2569a6d66..2d3abda7f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -266,24 +266,6 @@ Style/CommentedKeyword:
     - 'app/controllers/api/v1/conversations/labels_controller.rb'
     - 'app/controllers/api/v1/labels_controller.rb'
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'lib/constants/redis_keys.rb'
-
-# Offense count: 4
-# Configuration parameters: AllowedVariables.
-Style/GlobalVars:
-  Exclude:
-    - 'lib/redis/alfred.rb'
-
-# Offense count: 4
-Style/IdenticalConditionalBranches:
-  Exclude:
-    - 'app/controllers/api/v1/reports_controller.rb'
-
 # Offense count: 1
 # Configuration parameters: AllowIfModifier.
 Style/IfInsideElse:
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 4798d36b3..8da783235 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -188,7 +188,7 @@ class Conversation < ApplicationRecord
     return unless conversation_status_changed_to_open?
     return unless should_round_robin?
 
-    inbox.next_available_agent.then { |new_assignee| update_assignee(new_assignee) }
+    ::RoundRobin::AssignmentService.new(conversation: self).perform
   end
 
   def create_status_change_message(user_name)
diff --git a/app/models/inbox.rb b/app/models/inbox.rb
index b48b6b354..060dee980 100644
--- a/app/models/inbox.rb
+++ b/app/models/inbox.rb
@@ -64,11 +64,6 @@ class Inbox < ApplicationRecord
     channel.class.name.to_s == 'Channel::WebWidget'
   end
 
-  def next_available_agent
-    user_id = Redis::Alfred.rpoplpush(round_robin_key, round_robin_key)
-    account.users.find_by(id: user_id)
-  end
-
   def webhook_data
     {
       id: id,
@@ -79,10 +74,6 @@ class Inbox < ApplicationRecord
   private
 
   def delete_round_robin_agents
-    Redis::Alfred.delete(round_robin_key)
-  end
-
-  def round_robin_key
-    format(Constants::RedisKeys::ROUND_ROBIN_AGENTS, inbox_id: id)
+    ::RoundRobin::ManageService.new(inbox: self).clear_queue
   end
 end
diff --git a/app/models/inbox_member.rb b/app/models/inbox_member.rb
index 4c1e14159..4326b0a8f 100644
--- a/app/models/inbox_member.rb
+++ b/app/models/inbox_member.rb
@@ -26,14 +26,10 @@ class InboxMember < ApplicationRecord
   private
 
   def add_agent_to_round_robin
-    Redis::Alfred.lpush(round_robin_key, user_id)
+    ::RoundRobin::ManageService.new(inbox: inbox).add_agent_to_queue(user_id)
   end
 
   def remove_agent_from_round_robin
-    Redis::Alfred.lrem(round_robin_key, user_id)
-  end
-
-  def round_robin_key
-    format(Constants::RedisKeys::ROUND_ROBIN_AGENTS, inbox_id: inbox_id)
+    ::RoundRobin::ManageService.new(inbox: inbox).remove_agent_from_queue(user_id)
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 0ec98ac2e..7b368fe93 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -153,7 +153,6 @@ class Message < ApplicationRecord
   end
 
   def notify_via_mail
-    conversation_mail_key = Redis::Alfred::CONVERSATION_MAILER_KEY % conversation.id
     if Redis::Alfred.get(conversation_mail_key).nil? && conversation.contact.email? && outgoing?
       # set a redis key for the conversation so that we don't need to send email for every
       # new message that comes in and we dont enque the delayed sidekiq job for every message
@@ -165,6 +164,10 @@ class Message < ApplicationRecord
     end
   end
 
+  def conversation_mail_key
+    format(::Redis::Alfred::CONVERSATION_MAILER_KEY, conversation_id: conversation.id)
+  end
+
   def validate_attachments_limit(_attachment)
     errors.add(attachments: 'exceeded maximum allowed') if attachments.size >= NUMBER_OF_PERMITTED_ATTACHMENTS
   end
diff --git a/app/services/round_robin/assignment_service.rb b/app/services/round_robin/assignment_service.rb
new file mode 100644
index 000000000..26190737f
--- /dev/null
+++ b/app/services/round_robin/assignment_service.rb
@@ -0,0 +1,24 @@
+class RoundRobin::AssignmentService
+  pattr_initialize [:conversation]
+
+  def perform
+    # online agents will get priority
+    new_assignee = round_robin_manage_service.available_agent(priority_list: online_agents)
+    conversation.update(assignee: new_assignee) if new_assignee
+  end
+
+  private
+
+  def online_agents
+    online_agents = OnlineStatusTracker.get_available_users(conversation.account_id)
+    online_agents.select { |_key, value| value.eql?('online') }.keys if online_agents.present?
+  end
+
+  def round_robin_manage_service
+    @round_robin_manage_service ||= RoundRobin::ManageService.new(inbox: conversation.inbox)
+  end
+
+  def round_robin_key
+    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: conversation.inbox_id)
+  end
+end
diff --git a/app/services/round_robin/manage_service.rb b/app/services/round_robin/manage_service.rb
new file mode 100644
index 000000000..3720b1d6d
--- /dev/null
+++ b/app/services/round_robin/manage_service.rb
@@ -0,0 +1,56 @@
+class RoundRobin::ManageService
+  pattr_initialize [:inbox!]
+
+  # called on inbox delete
+  def clear_queue
+    ::Redis::Alfred.delete(round_robin_key)
+  end
+
+  # called on inbox member create
+  def add_agent_to_queue(user_id)
+    ::Redis::Alfred.lpush(round_robin_key, user_id)
+  end
+
+  # called on inbox member delete
+  def remove_agent_from_queue(user_id)
+    ::Redis::Alfred.lrem(round_robin_key, user_id)
+  end
+
+  def available_agent(priority_list: [])
+    reset_queue unless validate_queue?
+    user_id = get_agent_via_priority_list(priority_list)
+    # incase priority list was empty or inbox members weren't present
+    user_id ||= ::Redis::Alfred.rpoplpush(round_robin_key, round_robin_key)
+    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 get_agent_via_priority_list(priority_list)
+    return if priority_list.blank?
+
+    user_id = queue.intersection(priority_list.map(&:to_s)).pop
+    if user_id.present?
+      remove_agent_from_queue(user_id)
+      add_agent_to_queue(user_id)
+    end
+    user_id
+  end
+
+  def validate_queue?
+    return true if inbox.inbox_members.map(&:user_id).sort == queue.sort.map(&:to_i)
+  end
+
+  def queue
+    ::Redis::Alfred.lrange(round_robin_key)
+  end
+
+  def round_robin_key
+    format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: inbox.id)
+  end
+end
diff --git a/app/workers/conversation_reply_email_worker.rb b/app/workers/conversation_reply_email_worker.rb
index 8fed7cc12..e63d8fafb 100644
--- a/app/workers/conversation_reply_email_worker.rb
+++ b/app/workers/conversation_reply_email_worker.rb
@@ -9,7 +9,12 @@ class ConversationReplyEmailWorker
     ConversationReplyMailer.reply_with_summary(@conversation, queued_time).deliver_later
 
     # delete the redis set from the first new message on the conversation
-    conversation_mail_key = Redis::Alfred::CONVERSATION_MAILER_KEY % @conversation.id
     Redis::Alfred.delete(conversation_mail_key)
   end
+
+  private
+
+  def conversation_mail_key
+    format(::Redis::Alfred::CONVERSATION_MAILER_KEY, conversation_id: @conversation.id)
+  end
 end
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index c059323aa..423e0500f 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -4,8 +4,9 @@ app_redis_config = {
 }
 redis = Rails.env.test? ? MockRedis.new : Redis.new(app_redis_config)
 
-# Alfred - Used currently for round robin and conversation emails.
+# Alfred
 # Add here as you use it for more features
+# Used for Round Robin, Conversation Emails & Online Presence
 $alfred = Redis::Namespace.new('alfred', redis: redis, warning: true)
 
 # https://github.com/mperham/sidekiq/issues/4591
diff --git a/config/puma.rb b/config/puma.rb
index 0359054fb..1df88f6db 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,13 +4,13 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 }
+max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
 min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
 threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
-port ENV.fetch('PORT') { 3000 }
+port ENV.fetch('PORT', 3000)
 
 # Specifies the `environment` that Puma will run in.
 #
diff --git a/db/migrate/20170525104650_round_robin.rb b/db/migrate/20170525104650_round_robin.rb
index 3938346c9..e0476438a 100644
--- a/db/migrate/20170525104650_round_robin.rb
+++ b/db/migrate/20170525104650_round_robin.rb
@@ -1,7 +1,7 @@
 class RoundRobin < ActiveRecord::Migration[5.0]
   def change
     InboxMember.find_each do |im|
-      round_robin_key = format(Constants::RedisKeys::ROUND_ROBIN_AGENTS, inbox_id: im.inbox_id)
+      round_robin_key = format(::Redis::Alfred::ROUND_ROBIN_AGENTS, inbox_id: im.inbox_id)
       Redis::Alfred.lpush(round_robin_key, im.user_id)
     end
   end
diff --git a/lib/constants/redis_keys.rb b/lib/constants/redis_keys.rb
deleted file mode 100644
index 7138e4f24..000000000
--- a/lib/constants/redis_keys.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-module Constants::RedisKeys
-  ROUND_ROBIN_AGENTS = 'ROUND_ROBIN_AGENTS:%{inbox_id}'.freeze
-end
diff --git a/lib/online_status_tracker.rb b/lib/online_status_tracker.rb
index c9180e96f..622585dff 100644
--- a/lib/online_status_tracker.rb
+++ b/lib/online_status_tracker.rb
@@ -16,9 +16,9 @@ module OnlineStatusTracker
   def self.presence_key(account_id, type)
     case type
     when 'Contact'
-      Redis::Alfred::ONLINE_PRESENCE_CONTACTS % account_id
+      format(::Redis::Alfred::ONLINE_PRESENCE_CONTACTS, account_id: account_id)
     else
-      Redis::Alfred::ONLINE_PRESENCE_USERS % account_id
+      format(::Redis::Alfred::ONLINE_PRESENCE_USERS, account_id: account_id)
     end
   end
 
@@ -34,7 +34,7 @@ module OnlineStatusTracker
   end
 
   def self.status_key(account_id)
-    Redis::Alfred::ONLINE_STATUS % account_id
+    format(::Redis::Alfred::ONLINE_STATUS, account_id: account_id)
   end
 
   def self.get_available_contacts(account_id)
diff --git a/lib/redis/alfred.rb b/lib/redis/alfred.rb
index e1274a59b..d023f9fa3 100644
--- a/lib/redis/alfred.rb
+++ b/lib/redis/alfred.rb
@@ -1,43 +1,52 @@
 module Redis::Alfred
-  CONVERSATION_MAILER_KEY = 'CONVERSATION::%d'.freeze
-
-  # hash containing user_id key and status as value ONLINE_STATUS::%accountid
-  ONLINE_STATUS = 'ONLINE_STATUS::%s'.freeze
-  # sorted set storing online presense of account contacts : ONLINE_PRESENCE::%accountid::CONTACTS
-  ONLINE_PRESENCE_CONTACTS = 'ONLINE_PRESENCE::%s::CONTACTS'.freeze
-  # sorted set storing online presense of account users : ONLINE_PRESENCE::%accountid::USERS
-  ONLINE_PRESENCE_USERS = 'ONLINE_PRESENCE::%s::USERS'.freeze
+  include Redis::RedisKeys
 
   class << self
-    def rpoplpush(source, destination)
-      $alfred.rpoplpush(source, destination)
-    end
+    # key operations
 
-    def lpush(key, value)
-      $alfred.lpush(key, value)
-    end
-
-    def delete(key)
-      $alfred.del(key)
-    end
-
-    def lrem(key, value, count = 0)
-      $alfred.lrem(key, count, value)
+    def set(key, value)
+      $alfred.set(key, value)
     end
 
     def setex(key, value, expiry = 1.day)
       $alfred.setex(key, expiry, value)
     end
 
-    def set(key, value)
-      $alfred.set(key, value)
-    end
-
     def get(key)
       $alfred.get(key)
     end
 
-    # hash operation
+    def delete(key)
+      $alfred.del(key)
+    end
+
+    # list operations
+
+    def llen(key)
+      $alfred.llen(key)
+    end
+
+    def lrange(key, start_index = 0, end_index = -1)
+      $alfred.lrange(key, start_index, end_index)
+    end
+
+    def rpop(key)
+      $alfred.rpop(key)
+    end
+
+    def lpush(key, values)
+      $alfred.lpush(key, values)
+    end
+
+    def rpoplpush(source, destination)
+      $alfred.rpoplpush(source, destination)
+    end
+
+    def lrem(key, value, count = 0)
+      $alfred.lrem(key, count, value)
+    end
+
+    # hash operations
 
     # add a key value to redis hash
     def hset(key, field, value)
@@ -54,7 +63,7 @@ module Redis::Alfred
       $alfred.hmget(key, *fields)
     end
 
-    # sorted set functions
+    # sorted set operations
 
     # add score and value for a key
     def zadd(key, score, value)
diff --git a/lib/redis/redis_keys.rb b/lib/redis/redis_keys.rb
new file mode 100644
index 000000000..417978d7c
--- /dev/null
+++ b/lib/redis/redis_keys.rb
@@ -0,0 +1,13 @@
+module Redis::RedisKeys
+  ROUND_ROBIN_AGENTS = 'ROUND_ROBIN_AGENTS:%<inbox_id>d'.freeze
+
+  CONVERSATION_MAILER_KEY = 'CONVERSATION::%<conversation_id>d'.freeze
+
+  ## Online Status Keys
+  # hash containing user_id key and status as value
+  ONLINE_STATUS = 'ONLINE_STATUS::%<account_id>d'.freeze
+  # sorted set storing online presense of account contacts
+  ONLINE_PRESENCE_CONTACTS = 'ONLINE_PRESENCE::%<account_id>d::CONTACTS'.freeze
+  # sorted set storing online presense of account users
+  ONLINE_PRESENCE_USERS = 'ONLINE_PRESENCE::%<account_id>d::USERS'.freeze
+end
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 6e2e79be1..1c5cc2939 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -108,6 +108,7 @@ RSpec.describe Conversation, type: :model do
     end
 
     before do
+      create(:inbox_member, inbox: inbox, user: agent)
       allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent.id)
     end
 
@@ -141,9 +142,11 @@ RSpec.describe Conversation, type: :model do
       conversation.status = 'resolved'
       conversation.save!
       expect(conversation.reload.assignee).to eq(agent)
+      inbox.inbox_members.where(user_id: agent.id).first.destroy!
 
       # round robin changes assignee in this case since agent doesn't have access to inbox
       agent2 = create(:user, email: 'agent2@example.com', account: account)
+      create(:inbox_member, inbox: inbox, user: agent2)
       allow(Redis::Alfred).to receive(:rpoplpush).and_return(agent2.id)
       conversation.status = 'open'
       conversation.save!
diff --git a/spec/services/round_robin/manage_service_spec.rb b/spec/services/round_robin/manage_service_spec.rb
new file mode 100644
index 000000000..8d0696b26
--- /dev/null
+++ b/spec/services/round_robin/manage_service_spec.rb
@@ -0,0 +1,41 @@
+require 'rails_helper'
+
+describe RoundRobin::ManageService do
+  let!(:account) { create(:account) }
+  let!(:inbox) { create(:inbox, account: account) }
+  let!(:inbox_members) { create_list(:inbox_member, 5, inbox: inbox) }
+  let(:subject) { ::RoundRobin::ManageService.new(inbox: inbox) }
+
+  describe '#available_agent' do
+    it 'gets the first available agent 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)
+      subject.available_agent
+      expect(subject.send(:queue)).to eq(expected_queue)
+    end
+
+    it 'gets intersection of priority list and agent queue. get and move agent to the end of the list' 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)
+      expect(subject.available_agent(priority_list: [inbox_members[3].user_id, inbox_members[2].user_id])).to eq inbox_members[2].user
+      expect(subject.send(:queue)).to eq(expected_queue)
+    end
+
+    it 'constructs round_robin_queue if queue is not present' do
+      subject.clear_queue
+      expect(subject.send(:queue)).to eq([])
+      subject.available_agent
+      # the service constructed the redis queue before performing
+      expect(subject.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+    end
+
+    it 'validates the queue and correct it before performing round robin' do
+      # adding some invalid ids to queue
+      subject.add_agent_to_queue([2, 3, 5, 9])
+      expect(subject.send(:queue).sort.map(&:to_i)).not_to eq(inbox_members.map(&:user_id).sort)
+      subject.available_agent
+      # the service have refreshed the redis queue before performing
+      expect(subject.send(:queue).sort.map(&:to_i)).to eq(inbox_members.map(&:user_id).sort)
+    end
+  end
+end

From a77cc713c2084de62608cc0efa2788dbf88433e9 Mon Sep 17 00:00:00 2001
From: Sojan Jose <sojan@pepalo.com>
Date: Wed, 8 Jul 2020 00:59:30 +0530
Subject: [PATCH 50/50] Chore: Include Tamil, Arabic, other language updates
 (#1018)

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
---
 app/javascript/dashboard/i18n/index.js        |   4 +
 .../dashboard/i18n/locale/ar/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/ar/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/ar/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/ar/contact.json     |  29 +++
 .../i18n/locale/ar/conversation.json          |  35 ++++
 .../i18n/locale/ar/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/ar/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/ar/index.js         |  33 +++
 .../i18n/locale/ar/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/ar/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ar/login.json       |  21 ++
 .../dashboard/i18n/locale/ar/report.json      |  49 +++++
 .../i18n/locale/ar/resetPassword.json         |  15 ++
 .../i18n/locale/ar/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/ar/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ar/signup.json      |  32 +++
 .../dashboard/i18n/locale/ar/webhooks.json    |   5 +
 .../dashboard/i18n/locale/ca/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/ca/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ca/contact.json     |  19 +-
 .../i18n/locale/ca/generalSettings.json       |  20 ++
 .../dashboard/i18n/locale/ca/inboxMgmt.json   |  79 ++++++--
 .../i18n/locale/ca/integrations.json          |   9 +
 .../dashboard/i18n/locale/ca/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ca/settings.json    |  63 ++++--
 .../dashboard/i18n/locale/cs/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/cs/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/cs/contact.json     |  19 +-
 .../i18n/locale/cs/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/cs/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/cs/index.js         |  33 +++
 .../i18n/locale/cs/integrations.json          |  11 +-
 .../dashboard/i18n/locale/cs/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/cs/login.json       |  21 ++
 .../dashboard/i18n/locale/cs/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/da/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/da/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/da/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/da/contact.json     |  29 +++
 .../i18n/locale/da/conversation.json          |  35 ++++
 .../i18n/locale/da/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/da/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/da/index.js         |  33 +++
 .../i18n/locale/da/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/da/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/da/login.json       |  21 ++
 .../dashboard/i18n/locale/da/report.json      |  49 +++++
 .../i18n/locale/da/resetPassword.json         |  15 ++
 .../i18n/locale/da/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/da/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/da/signup.json      |  32 +++
 .../dashboard/i18n/locale/da/webhooks.json    |   5 +
 .../dashboard/i18n/locale/de/agentMgmt.json   |  20 +-
 .../dashboard/i18n/locale/de/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/de/contact.json     |  19 +-
 .../i18n/locale/de/generalSettings.json       |  20 ++
 .../dashboard/i18n/locale/de/inboxMgmt.json   |  44 +++-
 .../i18n/locale/de/integrations.json          |  11 +-
 .../dashboard/i18n/locale/de/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/de/report.json      |  46 ++++-
 .../dashboard/i18n/locale/de/settings.json    |  51 ++++-
 .../dashboard/i18n/locale/de/signup.json      |   2 +-
 .../dashboard/i18n/locale/el/agentMgmt.json   |   2 +-
 .../dashboard/i18n/locale/el/contact.json     |  18 +-
 .../i18n/locale/el/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/el/inboxMgmt.json   |  23 ++-
 .../i18n/locale/el/integrations.json          |   9 +
 .../dashboard/i18n/locale/el/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/el/settings.json    |  20 +-
 .../dashboard/i18n/locale/es/agentMgmt.json   |   2 +-
 .../dashboard/i18n/locale/es/contact.json     |  18 +-
 .../i18n/locale/es/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/es/inboxMgmt.json   |   8 +-
 .../i18n/locale/es/integrations.json          |   9 +
 .../dashboard/i18n/locale/es/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/es/settings.json    |  20 +-
 .../dashboard/i18n/locale/fi/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/fi/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/fi/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/fi/contact.json     |  29 +++
 .../i18n/locale/fi/conversation.json          |  35 ++++
 .../i18n/locale/fi/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/fi/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/fi/index.js         |  33 +++
 .../i18n/locale/fi/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/fi/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/fi/login.json       |  21 ++
 .../dashboard/i18n/locale/fi/report.json      |  49 +++++
 .../i18n/locale/fi/resetPassword.json         |  15 ++
 .../i18n/locale/fi/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/fi/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/fi/signup.json      |  32 +++
 .../dashboard/i18n/locale/fi/webhooks.json    |   5 +
 .../dashboard/i18n/locale/fr/agentMgmt.json   |   4 +-
 .../dashboard/i18n/locale/fr/contact.json     |  19 +-
 .../i18n/locale/fr/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/fr/inboxMgmt.json   |  21 +-
 .../i18n/locale/fr/integrations.json          |   9 +
 .../dashboard/i18n/locale/fr/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/fr/settings.json    |  20 +-
 .../dashboard/i18n/locale/hi/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/hi/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/hi/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/hi/contact.json     |  29 +++
 .../i18n/locale/hi/conversation.json          |  35 ++++
 .../i18n/locale/hi/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/hi/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/hi/index.js         |  33 +++
 .../i18n/locale/hi/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/hi/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/hi/login.json       |  21 ++
 .../dashboard/i18n/locale/hi/report.json      |  49 +++++
 .../i18n/locale/hi/resetPassword.json         |  15 ++
 .../i18n/locale/hi/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/hi/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/hi/signup.json      |  32 +++
 .../dashboard/i18n/locale/hi/webhooks.json    |   5 +
 .../dashboard/i18n/locale/hu/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/hu/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/hu/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/hu/contact.json     |  29 +++
 .../i18n/locale/hu/conversation.json          |  35 ++++
 .../i18n/locale/hu/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/hu/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/hu/index.js         |  33 +++
 .../i18n/locale/hu/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/hu/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/hu/login.json       |  21 ++
 .../dashboard/i18n/locale/hu/report.json      |  49 +++++
 .../i18n/locale/hu/resetPassword.json         |  15 ++
 .../i18n/locale/hu/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/hu/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/hu/signup.json      |  32 +++
 .../dashboard/i18n/locale/hu/webhooks.json    |   5 +
 .../dashboard/i18n/locale/it/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/it/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/it/contact.json     |  19 +-
 .../i18n/locale/it/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/it/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/it/index.js         |  33 +++
 .../i18n/locale/it/integrations.json          |  11 +-
 .../dashboard/i18n/locale/it/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/it/login.json       |  21 ++
 .../dashboard/i18n/locale/it/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/it/signup.json      |  32 +++
 .../dashboard/i18n/locale/ja/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/ja/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/ja/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/ja/contact.json     |  29 +++
 .../i18n/locale/ja/conversation.json          |  35 ++++
 .../i18n/locale/ja/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/ja/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/ja/index.js         |  33 +++
 .../i18n/locale/ja/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/ja/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ja/login.json       |  21 ++
 .../dashboard/i18n/locale/ja/report.json      |  49 +++++
 .../i18n/locale/ja/resetPassword.json         |  15 ++
 .../i18n/locale/ja/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/ja/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ja/signup.json      |  32 +++
 .../dashboard/i18n/locale/ja/webhooks.json    |   5 +
 .../dashboard/i18n/locale/ko/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/ko/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/ko/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/ko/contact.json     |  29 +++
 .../i18n/locale/ko/conversation.json          |  35 ++++
 .../i18n/locale/ko/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/ko/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/ko/index.js         |  33 +++
 .../i18n/locale/ko/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/ko/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ko/login.json       |  21 ++
 .../dashboard/i18n/locale/ko/report.json      |  49 +++++
 .../i18n/locale/ko/resetPassword.json         |  15 ++
 .../i18n/locale/ko/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/ko/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ko/signup.json      |  32 +++
 .../dashboard/i18n/locale/ko/webhooks.json    |   5 +
 .../dashboard/i18n/locale/ml/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/ml/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/ml/contact.json     |  19 +-
 .../i18n/locale/ml/generalSettings.json       |  20 ++
 .../dashboard/i18n/locale/ml/inboxMgmt.json   |  83 ++++++--
 .../i18n/locale/ml/integrations.json          |   9 +
 .../dashboard/i18n/locale/ml/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ml/settings.json    |  56 +++--
 .../dashboard/i18n/locale/nl/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/nl/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/nl/contact.json     |  19 +-
 .../i18n/locale/nl/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/nl/inboxMgmt.json   |  25 ++-
 .../dashboard/i18n/locale/nl/index.js         |   3 +-
 .../i18n/locale/nl/integrations.json          |   9 +
 .../dashboard/i18n/locale/nl/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/nl/settings.json    |  24 ++-
 .../dashboard/i18n/locale/pl/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/pl/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/pl/contact.json     |  19 +-
 .../i18n/locale/pl/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/pl/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/pl/index.js         |  33 +++
 .../i18n/locale/pl/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/pl/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/pl/login.json       |  21 ++
 .../dashboard/i18n/locale/pl/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/pt/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/pt/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/pt/contact.json     |  19 +-
 .../i18n/locale/pt/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/pt/inboxMgmt.json   |  31 ++-
 .../i18n/locale/pt/integrations.json          |   9 +
 .../dashboard/i18n/locale/pt/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/pt/settings.json    |  73 ++++++-
 .../i18n/locale/pt_BR/agentMgmt.json          |   2 +-
 .../dashboard/i18n/locale/pt_BR/contact.json  |  19 +-
 .../i18n/locale/pt_BR/generalSettings.json    |   1 +
 .../i18n/locale/pt_BR/inboxMgmt.json          |  23 ++-
 .../i18n/locale/pt_BR/integrations.json       |   9 +
 .../i18n/locale/pt_BR/labelsMgmt.json         |  68 +++++++
 .../dashboard/i18n/locale/pt_BR/settings.json |  22 +-
 .../dashboard/i18n/locale/ro/contact.json     |  19 +-
 .../i18n/locale/ro/generalSettings.json       |   1 +
 .../dashboard/i18n/locale/ro/inboxMgmt.json   |  21 +-
 .../i18n/locale/ro/integrations.json          |   9 +
 .../dashboard/i18n/locale/ro/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ro/settings.json    |  20 +-
 .../dashboard/i18n/locale/ru/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/ru/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/ru/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/ru/contact.json     |  29 +++
 .../i18n/locale/ru/conversation.json          |  35 ++++
 .../i18n/locale/ru/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/ru/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/ru/index.js         |  33 +++
 .../i18n/locale/ru/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/ru/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ru/login.json       |  21 ++
 .../dashboard/i18n/locale/ru/report.json      |  49 +++++
 .../i18n/locale/ru/resetPassword.json         |  15 ++
 .../i18n/locale/ru/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/ru/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ru/signup.json      |  32 +++
 .../dashboard/i18n/locale/ru/webhooks.json    |   5 +
 .../dashboard/i18n/locale/sk/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/sk/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/sk/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/sk/contact.json     |  29 +++
 .../i18n/locale/sk/conversation.json          |  35 ++++
 .../i18n/locale/sk/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/sk/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/sk/index.js         |  33 +++
 .../i18n/locale/sk/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/sk/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/sk/login.json       |  21 ++
 .../dashboard/i18n/locale/sk/report.json      |  49 +++++
 .../i18n/locale/sk/resetPassword.json         |  15 ++
 .../i18n/locale/sk/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/sk/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/sk/signup.json      |  32 +++
 .../dashboard/i18n/locale/sk/webhooks.json    |   5 +
 .../dashboard/i18n/locale/sv/agentMgmt.json   |   5 +-
 .../dashboard/i18n/locale/sv/cannedMgmt.json  |   4 +-
 .../dashboard/i18n/locale/sv/contact.json     |  19 +-
 .../i18n/locale/sv/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/sv/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/sv/index.js         |  33 +++
 .../i18n/locale/sv/integrations.json          |  11 +-
 .../dashboard/i18n/locale/sv/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/sv/login.json       |  21 ++
 .../dashboard/i18n/locale/sv/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ta/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/ta/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/ta/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/ta/contact.json     |  29 +++
 .../i18n/locale/ta/conversation.json          |  35 ++++
 .../i18n/locale/ta/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/ta/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/ta/index.js         |  33 +++
 .../i18n/locale/ta/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/ta/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/ta/login.json       |  21 ++
 .../dashboard/i18n/locale/ta/report.json      |  49 +++++
 .../i18n/locale/ta/resetPassword.json         |  15 ++
 .../i18n/locale/ta/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/ta/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/ta/signup.json      |  32 +++
 .../dashboard/i18n/locale/ta/webhooks.json    |   5 +
 .../dashboard/i18n/locale/tr/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/tr/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/tr/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/tr/contact.json     |  29 +++
 .../i18n/locale/tr/conversation.json          |  35 ++++
 .../i18n/locale/tr/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/tr/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/tr/index.js         |  33 +++
 .../i18n/locale/tr/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/tr/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/tr/login.json       |  21 ++
 .../dashboard/i18n/locale/tr/report.json      |  49 +++++
 .../i18n/locale/tr/resetPassword.json         |  15 ++
 .../i18n/locale/tr/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/tr/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/tr/signup.json      |  32 +++
 .../dashboard/i18n/locale/tr/webhooks.json    |   5 +
 .../dashboard/i18n/locale/uk/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/uk/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/uk/contact.json     |  19 +-
 .../i18n/locale/uk/generalSettings.json       |  20 ++
 .../dashboard/i18n/locale/uk/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/uk/index.js         |  33 +++
 .../i18n/locale/uk/integrations.json          |   9 +
 .../dashboard/i18n/locale/uk/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/uk/settings.json    |  68 ++++++-
 .../dashboard/i18n/locale/vi/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/vi/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/vi/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/vi/contact.json     |  29 +++
 .../i18n/locale/vi/conversation.json          |  35 ++++
 .../i18n/locale/vi/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/vi/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/vi/index.js         |  33 +++
 .../i18n/locale/vi/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/vi/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/vi/login.json       |  21 ++
 .../dashboard/i18n/locale/vi/report.json      |  49 +++++
 .../i18n/locale/vi/resetPassword.json         |  15 ++
 .../i18n/locale/vi/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/vi/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/vi/signup.json      |  32 +++
 .../dashboard/i18n/locale/vi/webhooks.json    |   5 +
 .../dashboard/i18n/locale/zh/agentMgmt.json   | 102 ++++++++++
 .../dashboard/i18n/locale/zh/cannedMgmt.json  |  76 +++++++
 .../dashboard/i18n/locale/zh/chatlist.json    |  77 +++++++
 .../dashboard/i18n/locale/zh/contact.json     |  29 +++
 .../i18n/locale/zh/conversation.json          |  35 ++++
 .../i18n/locale/zh/generalSettings.json       |  47 +++++
 .../dashboard/i18n/locale/zh/inboxMgmt.json   | 191 ++++++++++++++++++
 .../dashboard/i18n/locale/zh/index.js         |  33 +++
 .../i18n/locale/zh/integrations.json          |  63 ++++++
 .../dashboard/i18n/locale/zh/labelsMgmt.json  |  68 +++++++
 .../dashboard/i18n/locale/zh/login.json       |  21 ++
 .../dashboard/i18n/locale/zh/report.json      |  49 +++++
 .../i18n/locale/zh/resetPassword.json         |  15 ++
 .../i18n/locale/zh/setNewPassword.json        |  20 ++
 .../dashboard/i18n/locale/zh/settings.json    | 126 ++++++++++++
 .../dashboard/i18n/locale/zh/signup.json      |  32 +++
 .../dashboard/i18n/locale/zh/webhooks.json    |   5 +
 app/javascript/widget/i18n/locale/ar.json     |   6 +-
 app/javascript/widget/i18n/locale/ca.json     |  18 +-
 app/javascript/widget/i18n/locale/cs.json     |  20 ++
 app/javascript/widget/i18n/locale/da.json     |  20 ++
 app/javascript/widget/i18n/locale/de.json     |  16 +-
 app/javascript/widget/i18n/locale/fi.json     |  20 ++
 app/javascript/widget/i18n/locale/hi.json     |  20 ++
 app/javascript/widget/i18n/locale/hu.json     |  20 ++
 app/javascript/widget/i18n/locale/it.json     |  20 ++
 app/javascript/widget/i18n/locale/ja.json     |  20 ++
 app/javascript/widget/i18n/locale/ko.json     |  20 ++
 app/javascript/widget/i18n/locale/ml.json     |  14 +-
 app/javascript/widget/i18n/locale/nl.json     |   8 +-
 app/javascript/widget/i18n/locale/pl.json     |  20 ++
 app/javascript/widget/i18n/locale/pt.json     |  18 +-
 app/javascript/widget/i18n/locale/ru.json     |  20 ++
 app/javascript/widget/i18n/locale/sk.json     |  20 ++
 app/javascript/widget/i18n/locale/sv.json     |  20 ++
 app/javascript/widget/i18n/locale/ta.json     |  20 ++
 app/javascript/widget/i18n/locale/tr.json     |  20 ++
 app/javascript/widget/i18n/locale/uk.json     |  20 ++
 app/javascript/widget/i18n/locale/vi.json     |  20 ++
 app/javascript/widget/i18n/locale/zh.json     |  20 ++
 .../widget/store/modules/conversation.js      |   2 -
 .../specs/conversation/actions.spec.js        |  21 +-
 config/initializers/languages.rb              |   5 +-
 config/locales/ar.yml                         |  43 ++++
 config/locales/ca.yml                         |   2 +
 config/locales/cs.yml                         |   4 +-
 config/locales/da.yml                         |  43 ++++
 config/locales/de.yml                         |  53 ++---
 config/locales/devise.ar.yml                  |  65 ++++++
 config/locales/devise.da.yml                  |  61 ++++++
 config/locales/devise.de.yml                  |  61 ++++++
 config/locales/devise.fi.yml                  |  61 ++++++
 config/locales/devise.hi.yml                  |  61 ++++++
 config/locales/devise.hu.yml                  |  61 ++++++
 config/locales/devise.ja.yml                  |  60 ++++++
 config/locales/devise.ko.yml                  |  60 ++++++
 config/locales/devise.ml.yml                  |  61 ++++++
 config/locales/devise.pt_BR.yml               |   2 +-
 config/locales/devise.ro.yml                  |  62 ++++++
 config/locales/devise.ru.yml                  |  63 ++++++
 config/locales/devise.sk.yml                  |  63 ++++++
 config/locales/devise.ta.yml                  |  61 ++++++
 config/locales/devise.tr.yml                  |  61 ++++++
 config/locales/devise.uk.yml                  |  63 ++++++
 config/locales/devise.vi.yml                  |  60 ++++++
 config/locales/devise.zh.yml                  |  60 ++++++
 config/locales/el.yml                         |   2 +-
 config/locales/fi.yml                         |  43 ++++
 config/locales/hi.yml                         |  43 ++++
 config/locales/hu.yml                         |  43 ++++
 config/locales/it.yml                         |   4 +-
 config/locales/ja.yml                         |  43 ++++
 config/locales/ko.yml                         |  43 ++++
 config/locales/ml.yml                         |   2 +
 config/locales/nl.yml                         |   2 +
 config/locales/pl.yml                         |   4 +-
 config/locales/pt.yml                         |   4 +-
 config/locales/pt_BR.yml                      |   4 +-
 config/locales/ru.yml                         |  43 ++++
 config/locales/sk.yml                         |  43 ++++
 config/locales/sv.yml                         |   4 +-
 config/locales/ta.yml                         |  43 ++++
 config/locales/tr.yml                         |  43 ++++
 config/locales/uk.yml                         |  43 ++++
 config/locales/vi.yml                         |  43 ++++
 config/locales/zh.yml                         |  43 ++++
 418 files changed, 19359 insertions(+), 328 deletions(-)
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ar/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/cs/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/da/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/da/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fi/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hi/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/hu/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/it/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ja/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ko/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pl/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ru/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sk/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/sv/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/ta/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/tr/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/vi/webhooks.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/agentMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/cannedMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/chatlist.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/contact.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/conversation.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/generalSettings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/inboxMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/index.js
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/integrations.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/labelsMgmt.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/login.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/report.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/resetPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/setNewPassword.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/settings.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/signup.json
 create mode 100644 app/javascript/dashboard/i18n/locale/zh/webhooks.json
 create mode 100644 app/javascript/widget/i18n/locale/cs.json
 create mode 100644 app/javascript/widget/i18n/locale/da.json
 create mode 100644 app/javascript/widget/i18n/locale/fi.json
 create mode 100644 app/javascript/widget/i18n/locale/hi.json
 create mode 100644 app/javascript/widget/i18n/locale/hu.json
 create mode 100644 app/javascript/widget/i18n/locale/it.json
 create mode 100644 app/javascript/widget/i18n/locale/ja.json
 create mode 100644 app/javascript/widget/i18n/locale/ko.json
 create mode 100644 app/javascript/widget/i18n/locale/pl.json
 create mode 100644 app/javascript/widget/i18n/locale/ru.json
 create mode 100644 app/javascript/widget/i18n/locale/sk.json
 create mode 100644 app/javascript/widget/i18n/locale/sv.json
 create mode 100644 app/javascript/widget/i18n/locale/ta.json
 create mode 100644 app/javascript/widget/i18n/locale/tr.json
 create mode 100644 app/javascript/widget/i18n/locale/uk.json
 create mode 100644 app/javascript/widget/i18n/locale/vi.json
 create mode 100644 app/javascript/widget/i18n/locale/zh.json
 create mode 100644 config/locales/ar.yml
 create mode 100644 config/locales/da.yml
 create mode 100644 config/locales/devise.ar.yml
 create mode 100644 config/locales/devise.da.yml
 create mode 100644 config/locales/devise.de.yml
 create mode 100644 config/locales/devise.fi.yml
 create mode 100644 config/locales/devise.hi.yml
 create mode 100644 config/locales/devise.hu.yml
 create mode 100644 config/locales/devise.ja.yml
 create mode 100644 config/locales/devise.ko.yml
 create mode 100644 config/locales/devise.ml.yml
 create mode 100644 config/locales/devise.ro.yml
 create mode 100644 config/locales/devise.ru.yml
 create mode 100644 config/locales/devise.sk.yml
 create mode 100644 config/locales/devise.ta.yml
 create mode 100644 config/locales/devise.tr.yml
 create mode 100644 config/locales/devise.uk.yml
 create mode 100644 config/locales/devise.vi.yml
 create mode 100644 config/locales/devise.zh.yml
 create mode 100644 config/locales/fi.yml
 create mode 100644 config/locales/hi.yml
 create mode 100644 config/locales/hu.yml
 create mode 100644 config/locales/ja.yml
 create mode 100644 config/locales/ko.yml
 create mode 100644 config/locales/ru.yml
 create mode 100644 config/locales/sk.yml
 create mode 100644 config/locales/ta.yml
 create mode 100644 config/locales/tr.yml
 create mode 100644 config/locales/uk.yml
 create mode 100644 config/locales/vi.yml
 create mode 100644 config/locales/zh.yml

diff --git a/app/javascript/dashboard/i18n/index.js b/app/javascript/dashboard/i18n/index.js
index 820dd8174..0ed3f5667 100644
--- a/app/javascript/dashboard/i18n/index.js
+++ b/app/javascript/dashboard/i18n/index.js
@@ -9,6 +9,8 @@ import ml from './locale/ml';
 import pt from './locale/pt';
 import pt_BR from './locale/pt_BR';
 import ro from './locale/ro';
+import ta from './locale/ta';
+import it from './locale/it';
 
 export default {
   ca,
@@ -22,4 +24,6 @@ export default {
   pt_BR,
   pt,
   ro,
+  ta,
+  it,
 };
diff --git a/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
new file mode 100644
index 000000000..906fa2883
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "AGENT_MGMT": {
+    "HEADER": "موظف الدعم",
+    "HEADER_BTN_TXT": "إضافة موظف",
+    "LOADING": "جار جلب قائمة الموظفين",
+    "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": [
+      {
+        "name": "administrator",
+        "label": "المدير"
+      },
+      {
+        "name": "agent",
+        "label": "موظف الدعم"
+      }
+    ],
+    "LIST": {
+      "404": "لا يوجد موظفي دعم مرتبطين بهذا الحساب",
+      "TITLE": "إدارة موظفي الدعم في فريقك",
+      "DESC": "يمكنك إضافة/إزالة موظفي الدعم الفني في فريقك.",
+      "NAME": "الاسم",
+      "EMAIL": "البريد الإلكتروني",
+      "STATUS": "الحالة",
+      "ACTIONS": "الإجراءات",
+      "VERIFIED": "تم التحقق",
+      "VERIFICATION_PENDING": "بانتظار التحقق"
+    },
+    "ADD": {
+      "TITLE": "إضافة موظف دعم فني إلى فريقك",
+      "DESC": "يمكنك إضافة موظفي الدعم للرد على الرسائل في صندوق الوارد المشترك الخاص بفريقك.",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "FORM": {
+        "NAME": {
+          "LABEL": "اسم الموظف",
+          "PLACEHOLDER": "الرجاء إدخال اسم الموظف"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "رتبة الموظف",
+          "PLACEHOLDER": "الرجاء تحديد نوع",
+          "ERROR": "رتبة الموظف مطلوبة"
+        },
+        "EMAIL": {
+          "LABEL": "عنوان البريد الإلكتروني",
+          "PLACEHOLDER": "الرجاء إدخال عنوان البريد الإلكتروني للموظف"
+        },
+        "SUBMIT": "إضافة موظف"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "تم إضافة الموظف بنجاح",
+        "EXIST_MESSAGE": "عنوان هذا البريد الإلكتروني مستخدم مسبقاً، الرجاء إضافة عنوان آخر",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف حساب الموظف بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      },
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف ",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      }
+    },
+    "EDIT": {
+      "TITLE": "تعديل حساب الموظف",
+      "FORM": {
+        "NAME": {
+          "LABEL": "اسم الموظف",
+          "PLACEHOLDER": "الرجاء إدخال اسم الموظف"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "رتبة الموظف",
+          "PLACEHOLDER": "الرجاء تحديد نوع",
+          "ERROR": "رتبة الموظف مطلوبة"
+        },
+        "EMAIL": {
+          "LABEL": "عنوان البريد الإلكتروني",
+          "PLACEHOLDER": "الرجاء إدخال عنوان البريد الإلكتروني للموظف"
+        },
+        "SUBMIT": "تعديل حساب الموظف"
+      },
+      "BUTTON_TEXT": "تعديل",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "API": {
+        "SUCCESS_MESSAGE": "تم تحديث حساب الموظف بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "إعادة تعيين كلمة المرور",
+        "ADMIN_SUCCESS_MESSAGE": "تم إرسال بريد إلكتروني مع تعليمات إعادة تعيين كلمة المرور",
+        "SUCCESS_MESSAGE": "إعادة تعيين كلمة مرور حساب الموظف بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "لم يتم العثور على موظفين."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
new file mode 100644
index 000000000..03ce94ddf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "HEADER": "الردود السريعة",
+    "HEADER_BTN_TXT": "إضافة رد جاهز",
+    "LOADING": "جاري جلب الردود الجاهزة",
+    "SEARCH_404": "لا توجد عناصر مطابقة لهذا الاستعلام",
+    "SIDEBAR_TXT": "<p><b>الردود الجاهزة</b> </p><p> الردود الجاهزة هي عبارة عن قوالب يتم إعدادها مسبقاً لاستخدامها في كتابة الرسائل والردود للإجابة على اكثر الاسئلة شيوعاً. </p><p> لإضافة قالب جديد، فقط انقر على <b>إضافة رد جاهز</b>. يمكنك أيضاً تعديل أو حذف الردود الجاهزة الأخرى بالنقر على زر التحرير أو الحذف </p><p> يتم تسهيل استخدام الردود المسبقة بواسطة <b>رموز مختصرة</b> لتسريع البحث والوصول إليها. يمكن للموظفين الوصول إلى قوالب الردود الجاهزة أثناء الدردشة عن طريق الضغط على زر <b>'/'</b> ومن ثم الاختصار الخاص بالقالب المراد إدخاله في مربع النص. </p>",
+    "LIST": {
+      "404": "لا توجد ردود جاهزة متوفرة في هذا الحساب.",
+      "TITLE": "إدارة الردود الجاهزة",
+      "DESC": "الردود الجاهزة هي قوالب رسائل معدة مسبقاً يمكن استخدامها لتسريع كتابة الردود في المحادثات.",
+      "TABLE_HEADER": [
+        "الرمز المختصر",
+        "المحتوى",
+        "الإجراءات"
+      ]
+    },
+    "ADD": {
+      "TITLE": "إضافة رد جاهز",
+      "DESC": "الردود الجاهزة هي قوالب رسائل معدة مسبقاً يمكن استخدامها لتسريع كتابة الردود في المحادثات .",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "الرمز المختصر",
+          "PLACEHOLDER": "الرجاء إدخال رمز مختصر",
+          "ERROR": "الرمز المختصر مطلوب"
+        },
+        "CONTENT": {
+          "LABEL": "المحتوى",
+          "PLACEHOLDER": "الرجاء إدخال محتوى",
+          "ERROR": "المحتوى مطلوب"
+        },
+        "SUBMIT": "إرسال"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "تم إضافة قالب الرد الجاهز بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "EDIT": {
+      "TITLE": "تعديل قالب الرد الجاهز",
+      "CANCEL_BUTTON_TEXT": "إلغاء",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "الرمز المختصر",
+          "PLACEHOLDER": "الرجاء إدخال رمز مختصر",
+          "ERROR": "الرمز المختصر مطلوب"
+        },
+        "CONTENT": {
+          "LABEL": "المحتوى",
+          "PLACEHOLDER": "الرجاء إدخال محتوى",
+          "ERROR": "المحتوى مطلوب"
+        },
+        "SUBMIT": "إرسال"
+      },
+      "BUTTON_TEXT": "تعديل",
+      "API": {
+        "SUCCESS_MESSAGE": "تم تحديث قالب الرد الجاهز بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف قالب الرد الجاهز بنجاح",
+        "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+      },
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف ",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/chatlist.json b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
new file mode 100644
index 000000000..9244385aa
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "جاري جلب المحادثات",
+    "LOAD_MORE_CONVERSATIONS": "تحميل المزيد من المحادثات",
+    "EOF": "تم تحميل كافة المحادثات 🎉",
+    "LIST": {
+      "404": "لا توجد محادثات نشطة في هذه المجموعة."
+    },
+    "TAB_HEADING": "المحادثات",
+    "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"
+      }
+    ],
+    "CHAT_STATUS_ITEMS": [
+      {
+        "TEXT": "فتح",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "مغلقة",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "رسالة صورة"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "رسالة صوتية"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "رسالة فيديو"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "مرفقات"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "الموقع الجغرافي"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "قام بمشاركة رابط"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/contact.json b/app/javascript/dashboard/i18n/locale/ar/contact.json
new file mode 100644
index 000000000..70a89a3c5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "تفاصيل المحادثة",
+    "BROWSER": "المتصفح",
+    "OS": "نظام التشغيل",
+    "INITIATED_FROM": "تم البدء من",
+    "INITIATED_AT": "تم البدء في",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "لا توجد محادثات سابقة مرتبطة بجهة الاتصال هذه.",
+      "TITLE": "المحادثات السابقة"
+    },
+    "LABELS": {
+      "TITLE": "وسوم المحادثة",
+      "MODAL": {
+        "TITLE": "الوسوم الخاصة بـ",
+        "ACTIVE_LABELS": "تم إضافة الوسوم للمحادثة",
+        "INACTIVE_LABELS": "الوسوم المتاحة في الحساب",
+        "REMOVE": "انقر على أيقونة X لإزالة الوسم",
+        "ADD": "اضغط على أيقونة + لإضافة وسوم",
+        "UPDATE_BUTTON": "تحديث الوسوم",
+        "UPDATE_ERROR": "تعذر تحديث الوسوم، الرجاء المحاولة مرة أخرى."
+      },
+      "NO_LABELS_TO_ADD": "لا يوجد وسوم في الحساب.",
+      "NO_AVAILABLE_LABELS": "لا يوجد وسوم مضافة لهذه المحادثة."
+    },
+    "MUTE_CONTACT": "كتم جهة الاتصال",
+    "EDIT_LABEL": "تعديل"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/conversation.json b/app/javascript/dashboard/i18n/locale/ar/conversation.json
new file mode 100644
index 000000000..559511e5a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "الرجاء اختيار محادثة من سجل المحادثات",
+    "NO_MESSAGE_1": "لا توجد رسائل بعد من العملاء في صندوق الوارد الخاص بك.",
+    "NO_MESSAGE_2": " لإرسال رسالة إلى الصفحة الخاصة بك!",
+    "NO_INBOX_1": "يبدو أنك لم تقم بإضافة أي صناديق بريدية بعد.",
+    "NO_INBOX_2": " للبدء",
+    "NO_INBOX_AGENT": "يبدو أنه لم يتم إسنادك لأي قنوات تواصل بعد. الرجاء التواصل مع المدير لإضافتك لصناديق الوارد الخاصة بقنوات التواصل",
+    "CLICK_HERE": "اضغط هنا",
+    "LOADING_INBOXES": "جار تحميل صناديق الوارد",
+    "LOADING_CONVERSATIONS": "جاري تحميل المحادثات",
+    "DOWNLOAD": "تنزيل",
+    "HEADER": {
+      "RESOLVE_ACTION": "إغلاق المحادثة",
+      "REOPEN_ACTION": "إعادة فتح",
+      "OPEN": "المزيد",
+      "CLOSE": "أغلق",
+      "DETAILS": "التفاصيل"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "زر Shift + Enter لإضافة سطر جديد. ابدأ بزر / للاختيار من الردود السريعة.",
+      "PRIVATE_MSG_INPUT": "زر Shift + Enter لإضافة سطر جديد. سيكون هذا مرئياً للموظفين فقط"
+    },
+    "REPLYBOX": {
+      "REPLY": "إضافة رد",
+      "PRIVATE_NOTE": "إضافة ملاحظة خاصة",
+      "SEND": "إرسال",
+      "CREATE": "إضافة ملاحظة",
+      "TWEET": "تغريد"
+    },
+    "VISIBLE_TO_AGENTS": "ملاحظة خاصة: مرئية فقط لأعضاء فريق العمل والموظفين",
+    "CHANGE_STATUS": "تم تغيير حالة المحادثة",
+    "CHANGE_AGENT": "تم تغيير الموظف الذي تم إحالة المحادثة إليه"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/generalSettings.json b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
new file mode 100644
index 000000000..acda787c6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "إعدادات الحساب",
+    "SUBMIT": "تحديث الإعدادات",
+    "BACK": "العودة",
+    "UPDATE": {
+      "ERROR": "تعذر تحديث الإعدادات، الرجاء المحاولة مرة أخرى!",
+      "SUCCESS": "تم تحديث إعدادات الحساب بنجاح"
+    },
+    "FORM": {
+      "ERROR": "الرجاء إصلاح الأخطاء في الفورم",
+      "GENERAL_SECTION": {
+        "TITLE": "الإعدادات العامة",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "اسم الحساب",
+        "PLACEHOLDER": "اسم الحساب الخاص بك",
+        "ERROR": "الرجاء إدخال اسم حساب صحيح"
+      },
+      "LANGUAGE": {
+        "LABEL": "لغة الموقع (تجريبي)",
+        "PLACEHOLDER": "اسم الحساب الخاص بك",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "الدومين",
+        "PLACEHOLDER": "نطاق موقعك الإلكتروني",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "البريد الإلكتروني للدعم الفني",
+        "PLACEHOLDER": "عنوان البريد الإلكتروني الخاص باستقبال رسائل الدعم الفني",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "تفعيل دومين البريد الإلكتروني",
+        "PLACEHOLDER": "تفعيل خيار تعيين دومين مخصص لعنوان البريد الإلكتروني",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "مفعل",
+          "DISABLED": "معطّل"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
new file mode 100644
index 000000000..b0ca84351
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "قنوات التواصل",
+    "SIDEBAR_TXT": "<p><b>قنوات التواصل</b></p> <p> عند ربطك لموقع ويب أو صفحة فيسبوك إلى Chatwooot، يتم تسميتها <b>قناة تواصل</b>. يمكنك إنشاء قنوات تواصل غير محدودة من مختلف الأنواع في حساب Chatwoot الخاص بك. </p><p> انقر فوق <b>إضافة قناة تواصل</b> لربط موقع الويب أو صفحة فيسبوك الخاصة بك. </p><p> من لوحة الإدارة، يمكنك رؤية جميع المحادثات من جميع صناديق الوارد الخاصة بك والرد عليها من مكان موّحد عبر الضغط على علامة التبويب \"المحادثات\". </p><p> يمكنك أيضًا مشاهدة المحادثات الخاصة بصندوق وارد معين بالنقر على اسم صندوق الوارد على الجزء الجانبي من لوحة الإدارة. </p>",
+    "LIST": {
+      "404": "لا توجد صناديق وارد لقنوات تواصل مرتبطة بهذا الحساب."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "اختر قناة",
+        "route": "settings_inbox_new",
+        "body": "اختر الخدمة التي تود ربطها مع حسابك في Chatwoot."
+      },
+      {
+        "title": "إنشاء قناة تواصل",
+        "route": "settings_inboxes_page_channel",
+        "body": "قم بالمصادقة على حسابك وإنشاء قناة التواصل."
+      },
+      {
+        "title": "إضافة موظفين",
+        "route": "settings_inboxes_add_agents",
+        "body": "إضافة موظفين إلى صندوق الوارد الخاص بقناة التواصل التي تم إنشاؤها."
+      },
+      {
+        "title": "مرحى!",
+        "route": "settings_inbox_finish",
+        "body": "أصبح كل شيء جاهزاً الآن!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "ملحوظة: بالمصادقة على حسابك، فنحن يمكننا فقط الوصول إلى الرسائل الواردة لصفحتك. لا يستطيع Chatwoot أبداً بأي شكل من الأشكال الوصول إلى رسائلك الخاصة في حسابك الشخصي.",
+        "CHOOSE_PAGE": "اختر صفحة",
+        "CHOOSE_PLACEHOLDER": "اختر صفحة من القائمة",
+        "INBOX_NAME": "اسم صندوق الوارد لقناة التواصل",
+        "ADD_NAME": "قم بتعيين اسم لصندوق الوارد الخاص بقناتك الجديدة",
+        "PICK_NAME": "اختر اسم لقناة التواصل الخاصة بك",
+        "PICK_A_VALUE": "اختر قيمة"
+      },
+      "TWITTER": {
+        "HELP": "لإضافة حساب تويتر الخاص بك كقناة تواصل، تحتاج إلى مصادقة حسابك على تويتر بك بالنقر على زر \"تسجيل الدخول باستخدام تويتر\" "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "قناة الموقع",
+        "DESC": "قم بإنشاء قناة تواصل لموقع الويب الخاص بك وابدأ في استقبال الرسائل من عملائك عبر صندوق الدردشة المباشرة.",
+        "LOADING_MESSAGE": "جاري إنشاء قناة تواصل للموقع",
+        "CHANNEL_AVATAR": {
+          "LABEL": "الصورة الرمزية للقناة"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "اسم الموقع",
+          "PLACEHOLDER": "أدخل اسم موقع الويب الخاص بك (مثال: Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "نطاق الموقع",
+          "PLACEHOLDER": "أدخل نطاق موقعك الإلكتروني (مثال: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "العنوان الترحيبي",
+          "PLACEHOLDER": "مرحبا بك!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "افتتاحية الترحيب",
+          "PLACEHOLDER": "نحن نجعل من السهل عليك التواصل معنا. اسألنا أي شيء، أو قم بمشاركتنا ملاحظاتك."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "رسالة الترحيب التلقائية",
+          "PLACEHOLDER": "يتم الرد عادة خلال بضع ساعات."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "تفعيل رسالة الترحيب التلقائية",
+          "HELP_TEXT": "إرسال رسالة ترحيب إلى المستخدم عند بدء المحادثة.",
+          "ENABLED": "مفعل",
+          "DISABLED": "معطّل"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "لون صندوق الدردشة",
+          "PLACEHOLDER": "تحديث اللون الرئيسي لصندوق الدردشة"
+        },
+        "SUBMIT_BUTTON": "إنشاء قناة تواصل"
+      },
+      "TWILIO": {
+        "TITLE": "قناة Twilio SMS/WhatsApp",
+        "DESC": "قم بإضافة قناة Twilio لتمكن عملائك من التواصل معك عبر الرسائل القصيرة SMS أو عبر واتساب.",
+        "ACCOUNT_SID": {
+          "LABEL": "معرف حساب Twilio (يعرف أيضاً بـ Account SID)",
+          "PLACEHOLDER": "الرجاء إدخال معرف حساب Twilio الخاص بك (يعرف أيضاً بـ Account SID)",
+          "ERROR": "هذا الحقل مطلوب"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "نوع القناة",
+          "ERROR": "الرجاء تحديد نوع القناة"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "رمز المصادقة Auth Token",
+          "PLACEHOLDER": "الرجاء إدخال رمز مصادقة Twilio الخاص بك Auth Token",
+          "ERROR": "هذا الحقل مطلوب"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "اسم القناة",
+          "PLACEHOLDER": "الرجاء إدخال اسم القناة",
+          "ERROR": "هذا الحقل مطلوب"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "رقم الهاتف",
+          "PLACEHOLDER": "الرجاء إدخال رقم الهاتف الذي سيتم إرسال الرسائل منه.",
+          "ERROR": "الرجاء إدخال قيمة صحيحة. يجب أن يبدأ رقم الهاتف بعلامة `+`."
+        },
+        "API_CALLBACK": {
+          "TITLE": "عنوان Callback URL",
+          "SUBTITLE": "يتوجب تهيئة عنوان callback URL في إعدادات Twilio بإدخال القيمة أدناه."
+        },
+        "SUBMIT_BUTTON": "إنشاء قناة Twilio",
+        "API": {
+          "ERROR_MESSAGE": "تعذر تكوين المصادقة بواسطة بيانات الاعتماد الخاصة بحسابك على Twilio، يرجى المحاولة مرة أخرى"
+        }
+      },
+      "AUTH": {
+        "TITLE": "القنوات",
+        "DESC": "ندعم حالياً تثبيت برنامج الدردشة المباشرة على موقعك وربط صفحات الفيس بوك وحسابات تويتر. جار العمل على دعم المزيد من المنصات الأخرى مثل واتساب، و البريد الإلكتروني، و تلغرام و لاين، والتي ستكون متاحة قريباً."
+      },
+      "AGENTS": {
+        "TITLE": "موظف الدعم",
+        "DESC": "هنا يمكنك إضافة موظفين لإدارة صندوق الوارد الخاص بقناة تواصلك التي تم إنشاؤها حديثاً. الموظفين الذين يتم تحديدهم هنا هم فقط من يمكنهم الوصول إلى صندوق الوارد الخاص بتلك القناة. الموظفين الذين ليسوا جزءاً من صندوق الوارد هذا لن يكونوا قادرين على رؤية أو الرد على الرسائل في قناة التواصل هذه عند تسجيل الدخول. <br> <b>ملحوظة:</b> كمسؤول، إذا كنت بحاجة إلى الوصول إلى جميع صناديق الوارد، يجب عليك إضافة نفسك كموظف لجميع صناديق الوارد الخاصة بقنوات التواصل التي تنشئها."
+      },
+      "DETAILS": {
+        "TITLE": "تفاصيل قناة التواصل",
+        "DESC": "من القائمة المنسدلة أدناه، حدد صفحة فيس بوك التي تريد ربطها بـ Chatwoot. يمكنك أيضًا تخصيص اسم لصندوق الوارد الخاص بهذه الصفحة للحصول على تجربة وصول أفضل."
+      },
+      "FINISH": {
+        "TITLE": "تم!",
+        "DESC": "لقد تم بنجاح ربط صفحة فيسبوك الخاصة بك مع Chatwoot. في المرة القادمة التي يرسل فيها العملاء رسالة إلى صفحتك، ستظهر المحادثة تلقائيًا على صندوق الوارد الخاص بك هنا.<br>نحن نزودك أيضًا بالكود النصي لصندوق دردشة الماسنجر والذي يمكنك إضافته بسهولة إلى الموقع الخاص بك لاستقبال الرسائل من الزوار كذلك. بمجرد أن يتم ذلك على موقع الويب الخاص بك، يمكن للعملاء مراسلتك من موقع الويب الخاص بك بدون الحاجة لأي أدوات خارجية وستظهر المحادثة هنا على Chatwoot.<br>رائع، أليس كذلك؟ نحن بالتأكيد نحاول أن نكون الأفضل :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "جار المصادقة والربط مع الفيسبوك...",
+      "ERROR_FB_AUTH": "حدث خطأ ما، الرجاء تحديث الصفحة...",
+      "CREATING_CHANNEL": "جار إنشاء قناة التواصل...",
+      "TITLE": "تهيئة إعدادات قناة التواصل",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "إضافة موظفين",
+      "ADD_AGENTS": "إضافة موظفين إلى صندوق الوارد الخاص بالقناة..."
+    },
+    "FINISH": {
+      "TITLE": "أصبحت قناة التواصل جاهزة الآن!",
+      "MESSAGE": "يمكنك الآن التواصل مع عملائك من خلال قناتك الجديدة ",
+      "BUTTON_TEXT": "خذني إلى هناك",
+      "WEBSITE_SUCCESS": "لقد انتهيت بنجاح من إنشاء قناة دردشة مباشرة لموقعك. انسخ الرمز الموضح أدناه وقم بإضافته إلى موقع الويب الخاص بك. في المرة القادمة التي يستخدم فيها العميل الدردشة المباشرة، ستظهر المحادثة تلقائياً على صندوق الوارد الخاص بك."
+    },
+    "REAUTH": "إعادة التصريح",
+    "VIEW": "عرض",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "تم تحديث إعدادات قناة التواصل بنجاح",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "تم تحديث إعدادات الإسناد التلقائي بنجاح",
+        "ERROR_MESSAGE": "تعذر تحديث لون صندوق الدردشة. الرجاء المحاولة مرة أخرى لاحقاً."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "مفعل",
+        "DISABLED": "معطّل"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف ",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف قناة التواصل بنجاح",
+        "ERROR_MESSAGE": "تعذر حذف قناة التواصل. الرجاء المحاولة مرة أخرى لاحقاً."
+      }
+    },
+    "SETTINGS": "الإعدادات",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "كود \"الماسنجر\"",
+      "MESSENGER_SUB_HEAD": "ضع هذا الكود داخل وسم الـ body في موقعك",
+      "INBOX_AGENTS": "موظف الدعم",
+      "INBOX_AGENTS_SUB_TEXT": "إضافة أو إزالة موظفين من قناة التواصل هذه",
+      "UPDATE": "تحديث",
+      "AUTO_ASSIGNMENT": "تفعيل الإسناد التلقائي",
+      "INBOX_UPDATE_TITLE": "إعدادات قناة التواصل",
+      "INBOX_UPDATE_SUB_TEXT": "تحديث إعدادات قناة التواصل",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "تمكين أو تعطيل الإسناد التلقائي للمحادثات الجديدة إلى الموظفين المضافين إلى قناة التواصل هذه."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/index.js b/app/javascript/dashboard/i18n/locale/ar/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ar/integrations.json b/app/javascript/dashboard/i18n/locale/ar/integrations.json
new file mode 100644
index 000000000..12e5bcb23
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "خيارات الربط",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "تهيئة",
+      "HEADER": "إعدادات الـ Webhook",
+      "HEADER_BTN_TXT": "إضافة webhook جديد",
+      "INTEGRATION_TXT": "أحداث Webhook توفر لك معلومات في الوقت الحقيقي حول ما يحدث في حساب Chatwoot الخاص بك. يمكنك استخدام خاصية الـ Webhook لإيصال الأحداث إلى تطبيقاتك المفضلة مثل Slack أو Github. انقر على \"تهيئة\" لإعداد الـ Webhooks الخاصة بك.",
+      "LOADING": "جار جلب الـ Webhooks",
+      "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": "إدارة الـ webhooks",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "الإجراءات"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "إلغاء",
+        "TITLE": "إضافة 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": "مثال: https://example/api/webhook",
+            "ERROR": "الرجاء إدخال عنوان URL صالح"
+          },
+          "SUBMIT": "إنشاء webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "تم إضافة Webhook بنجاح",
+          "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "حذف",
+        "API": {
+          "SUCCESS_MESSAGE": "تم حذف Webhook بنجاح",
+          "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+        },
+        "CONFIRM": {
+          "TITLE": "تأكيد الحذف",
+          "MESSAGE": "هل أنت متأكد من الحذف ",
+          "YES": "نعم، احذف ",
+          "NO": "لا، احتفظ به"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف التكامل بنجاح"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "ربط الاتصال"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
new file mode 100644
index 000000000..bd59b1a9e
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "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>",
+    "LIST": {
+      "404": "لا يوجد وسوم متوفرة في هذا الحساب.",
+      "TITLE": "إدارة الوسوم",
+      "DESC": "الوسوم تسمح لك بتجميع المحادثات المتشابهة معاً.",
+      "TABLE_HEADER": [
+        "الاسم",
+        "الوصف",
+        "اللون"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "اسم الوسم",
+        "PLACEHOLDER": "اسم الوسم",
+        "ERROR": "اسم الوسم مطلوب"
+      },
+      "DESCRIPTION": {
+        "LABEL": "الوصف",
+        "PLACEHOLDER": "وصف الوسم"
+      },
+      "COLOR": {
+        "LABEL": "اللون"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "إظهار الوسم على الشريط الجانبي"
+      },
+      "EDIT": "تعديل",
+      "CREATE": "إنشاء",
+      "DELETE": "حذف",
+      "CANCEL": "إلغاء"
+    },
+    "ADD": {
+      "TITLE": "إضافة وسم جديد",
+      "DESC": "الوسوم تسمح لك بتجميع المحادثات المتشابهة معاً.",
+      "API": {
+        "SUCCESS_MESSAGE": "تم إضافة الوسم بنجاح",
+        "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+      }
+    },
+    "EDIT": {
+      "TITLE": "تعديل الوسم",
+      "API": {
+        "SUCCESS_MESSAGE": "تم تحديث الوسم بنجاح",
+        "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "حذف",
+      "API": {
+        "SUCCESS_MESSAGE": "تم حذف الوسم بنجاح",
+        "ERROR_MESSAGE": "حدث خطأ، الرجاء المحاولة مرة أخرى"
+      },
+      "CONFIRM": {
+        "TITLE": "تأكيد الحذف",
+        "MESSAGE": "هل أنت متأكد من الحذف ",
+        "YES": "نعم، احذف ",
+        "NO": "لا، احتفظ "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/login.json b/app/javascript/dashboard/i18n/locale/ar/login.json
new file mode 100644
index 000000000..caf74b78a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "تسجيل الدخول إلى Chatwoot",
+    "EMAIL": {
+      "LABEL": "البريد الإلكتروني",
+      "PLACEHOLDER": "مثال: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "كلمة المرور",
+      "PLACEHOLDER": "كلمة المرور"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "تم تسجيل الدخول بنجاح",
+      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً",
+      "UNAUTH": "اسم المستخدم / كلمة المرور غير صحيحة. الرجاء المحاولة مرة أخرى"
+    },
+    "FORGOT_PASSWORD": "نسيت كلمة المرور؟",
+    "CREATE_NEW_ACCOUNT": "إنشاء حساب جديد",
+    "SUBMIT": "تسجيل الدخول"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/report.json b/app/javascript/dashboard/i18n/locale/ar/report.json
new file mode 100644
index 000000000..abbb4030a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "التقارير",
+    "LOADING_CHART": "تحميل بيانات الرسم البياني...",
+    "NO_ENOUGH_DATA": "لم يتم جمع بيانات بقدر كافي لإنشاء التقرير، الرجاء المحاولة مرة أخرى لاحقاً.",
+    "METRICS": [
+      {
+        "NAME": "المحادثات",
+        "KEY": "conversations_count",
+        "DESC": "(الإجمالي)"
+      },
+      {
+        "NAME": "الرسائل الواردة",
+        "KEY": "incoming_messages_count",
+        "DESC": "(الإجمالي)"
+      },
+      {
+        "NAME": "الرسائل الصادرة",
+        "KEY": "outgoing_messages_count",
+        "DESC": "(الإجمالي)"
+      },
+      {
+        "NAME": "وقت الاستجابة الأولى",
+        "KEY": "avg_first_response_time",
+        "DESC": "(متوسط)"
+      },
+      {
+        "NAME": "وقت إغلاق المحادثات",
+        "KEY": "avg_resolution_time",
+        "DESC": "(متوسط)"
+      },
+      {
+        "NAME": "عدد مرات الإغلاق",
+        "KEY": "resolutions_count",
+        "DESC": "(الإجمالي)"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "آخر 7 أيام"
+      },
+      {
+        "id": 1,
+        "name": "آخر 30 يوماً"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/resetPassword.json b/app/javascript/dashboard/i18n/locale/ar/resetPassword.json
new file mode 100644
index 000000000..e862f7f13
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "إعادة تعيين كلمة المرور",
+    "EMAIL": {
+      "LABEL": "البريد الإلكتروني",
+      "PLACEHOLDER": "الرجاء إدخال بريدك الإلكتروني",
+      "ERROR": "الرجاء إدخال بريد إلكتروني صالح"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "تم إرسال رابط إعادة تعيين كلمة المرور إلى بريدك الإلكتروني",
+      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+    },
+    "SUBMIT": "إرسال"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
new file mode 100644
index 000000000..446658b1f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "تعيين كلمة مرور جديدة",
+    "PASSWORD": {
+      "LABEL": "كلمة المرور",
+      "PLACEHOLDER": "كلمة المرور",
+      "ERROR": "كلمة المرور قصيرة جداً"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "تأكيد كلمة المرور",
+      "PLACEHOLDER": "تأكيد كلمة المرور",
+      "ERROR": "كلمة المرور غير متطابقة"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "تم تغيير كلمة المرور بنجاح",
+      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+    },
+    "SUBMIT": "إرسال"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/settings.json b/app/javascript/dashboard/i18n/locale/ar/settings.json
new file mode 100644
index 000000000..7cc226616
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "إعدادات الملف الشخصي",
+    "TITLE": "إعدادات الملف الشخصي",
+    "BTN_TEXT": "تحديث الملف الشخصي",
+    "AFTER_EMAIL_CHANGED": "تم تحديث ملفك الشخصي بنجاح، الرجاء تسجيل الدخول مرة أخرى حيث أنه قد تم تغيير بيانات تسجيل الدخول الخاصة بك",
+    "FORM": {
+      "AVATAR": "صورة الملف الشخصي",
+      "ERROR": "الرجاء إصلاح الأخطاء في الفورم",
+      "REMOVE_IMAGE": "حذف",
+      "UPLOAD_IMAGE": "رفع صورة",
+      "UPDATE_IMAGE": "تحديث الصورة",
+      "PROFILE_SECTION": {
+        "TITLE": "الملف الشخصي",
+        "NOTE": "عنوان بريدك الإلكتروني هو هويتك ويستخدم لتسجيل الدخول."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "كلمة المرور",
+        "NOTE": "تحديث كلمة المرور الخاصة بك سيعيد ضبط تسجيلات الدخول الخاصة بك في الأجهزة الأخرى التي قمت بالدخول عبرها."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "رمز المصادقة",
+        "NOTE": "يمكن استخدام هذا رمز المصادقة إذا كنت تبني تطبيقات API للتكامل مع Chatwoot"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "إشعارات البريد الإلكتروني",
+        "NOTE": "قم بتحديث تفضيلات إشعار البريد الإلكتروني الخاص بك من هنا",
+        "CONVERSATION_ASSIGNMENT": "إرسال إشعارات البريد الإلكتروني عند إسناد محادثة لي",
+        "CONVERSATION_CREATION": "إرسال إشعارات للبريد الإلكتروني عند ورود محادثة جديدة"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "يتم تحديث إعدادات الإشعارات بنجاح",
+        "UPDATE_ERROR": "حدث خطأ أثناء تحديث الإعدادات، الرجاء المحاولة مرة أخرى"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "إشعارات المتصفح",
+        "NOTE": "قم بتحديث تفضيلات إشعارات المتصفح من هنا",
+        "CONVERSATION_ASSIGNMENT": "إرسال إشعارات على المتصفح عند إسناد محادثة لي",
+        "CONVERSATION_CREATION": "إرسال إشعارات المتصفح عند ورود محادثة جديدة",
+        "HAS_ENABLED_PUSH": "لقد قمت بتمكين الإشعارات لهذا المتصفح.",
+        "REQUEST_PUSH": "تفعيل إشعارات المتصفح"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "صورة الملف الشخصي"
+      },
+      "NAME": {
+        "LABEL": "الاسم الخاص بك",
+        "ERROR": "الرجاء إدخال اسم صالح",
+        "PLACEHOLDER": "الرجاء إدخال اسمك، سيتم عرض هذا في المحادثات"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "عنوان البريد الإلكتروني الخاص بك",
+        "ERROR": "الرجاء إدخال عنوان بريد إلكتروني صحيح",
+        "PLACEHOLDER": "الرجاء إدخال عنوان البريد الإلكتروني الخاص بك، سيتم عرضه في المحادثات"
+      },
+      "PASSWORD": {
+        "LABEL": "كلمة المرور",
+        "ERROR": "الرجاء إدخال كلمة مرور بطول 6 أحرف أو أكثر",
+        "PLACEHOLDER": "الرجاء إدخال كلمة مرور جديدة"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "تأكيد كلمة المرور الجديدة",
+        "ERROR": "تأكيد كلمة المرور يجب أن تتطابق",
+        "PLACEHOLDER": "الرجاء إعادة إدخال كلمة المرور"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "تبديل الحساب",
+    "SELECTOR_SUBTITLE": "اختر حساباً من القائمة التالية",
+    "PROFILE_SETTINGS": "إعدادات الملف الشخصي",
+    "LOGOUT": "تسجيل الخروج"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "أيام متبقية من الفترة التجريبية.",
+    "TRAIL_BUTTON": "اشترك الآن"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "نسخ",
+      "COPY_SUCCESSFUL": "تم نسخ الكود إلى الحافظة بنجاح"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "تنزيل",
+      "UPLOADING": "جاري الرفع..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "إرسال"
+    }
+  },
+  "CONFIRM_EMAIL": "جار التحقق...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "إضافة قناة تواصل"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "المحادثات",
+    "REPORTS": "التقارير",
+    "SETTINGS": "الإعدادات",
+    "HOME": "الرئيسية",
+    "AGENTS": "موظف الدعم",
+    "INBOXES": "قنوات التواصل",
+    "CANNED_RESPONSES": "الردود السريعة",
+    "INTEGRATIONS": "خيارات الربط",
+    "ACCOUNT_SETTINGS": "إعدادات الحساب",
+    "LABELS": "الوسوم"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/signup.json b/app/javascript/dashboard/i18n/locale/ar/signup.json
new file mode 100644
index 000000000..8712a083a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/signup.json
@@ -0,0 +1,32 @@
+{
+  "REGISTER": {
+    "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": "مؤسسة Wayne",
+      "ERROR": "اسم الحساب قصير جداً"
+    },
+    "EMAIL": {
+      "LABEL": "البريد الإلكتروني",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "البريد الإلكتروني غير صالح"
+    },
+    "PASSWORD": {
+      "LABEL": "كلمة المرور",
+      "PLACEHOLDER": "كلمة المرور",
+      "ERROR": "كلمة المرور قصيرة جداً"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "تأكيد كلمة المرور",
+      "PLACEHOLDER": "تأكيد كلمة المرور",
+      "ERROR": "كلمة المرور غير متطابقة"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "تم التسجيل بنجاح",
+      "ERROR_MESSAGE": "تعذر الاتصال بالخادم، الرجاء المحاولة مرة أخرى لاحقاً"
+    },
+    "SUBMIT": "إرسال"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ar/webhooks.json b/app/javascript/dashboard/i18n/locale/ar/webhooks.json
new file mode 100644
index 000000000..1ed49bc3c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ar/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "إعدادات الـ Webhook"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
index 86028734f..ba4e1caa3 100644
--- a/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agents",
     "HEADER_BTN_TXT": "Afegir Agent",
     "LOADING": "S'està recollint la llista d'agents",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>Agent</b> és un membre del teu equip de suport al client. </p><p> Els agents podran veure i respondre als missatges dels vostres usuaris. La llista mostra tots els agents que hi ha actualment al vostre compte. </p><p> Clica en <b>Afegir Agent</b> per afegir un nou agent. L’agent que afegiu rebrà un correu electrònic amb un enllaç de confirmació per activar el seu compte, després del qual podran accedir a Chatwoot i respondre als missatges. </p><p> L’accés a les funcions de Chatwoot es basa en els següents rols. </p><p> <b>Agent</b> - els agents amb aquest rol només poden accedir a bústies de sortida, informes i converses. </p><p> <b>Administrador/a</b> - L’administrador/a tindrà accés a totes les funcions de Chatwoot habilitades per al vostre compte, incloses les configuracions i la facturació, juntament amb tots els privilegis dels agents normals.</p>",
+    "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": [
       {
         "name": "administrador/a",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Afegir agent al teu equip",
       "DESC": "Podeu afegir persones que podran gestionar suport per a les vostres safates d'entrada.",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "NAME": {
           "LABEL": "Nom de l'Agent",
@@ -60,7 +61,7 @@
         "TITLE": "Confirma l'esborrat",
         "MESSAGE": "N'estas segur? ",
         "YES": "Si, esborra ",
-        "NO": "No, manten-la "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
index e2cd3e7a2..76863a4d0 100644
--- a/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Afegeix Resposta Predeterminada",
       "DESC": "Les respostes predeterminades són plantilles de resposta que es poden utilitzar per enviar ràpidament les respostes a les converses.",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Codi curt",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Edita la resposta predeterminada",
+      "CANCEL_BUTTON_TEXT": "Cancel·la",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Codi curt",
@@ -67,7 +69,7 @@
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur ",
         "YES": "Si, esborra ",
-        "NO": "No, mantén-la "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/contact.json b/app/javascript/dashboard/i18n/locale/ca/contact.json
index c534ad106..6c233d59f 100644
--- a/app/javascript/dashboard/i18n/locale/ca/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ca/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etiquetes de converses",
-      "UPDATE_BUTTON": "Actualitza etiquetes",
-      "UPDATE_ERROR": "No s'han pogut actualitzar les etiquetes, torna-ho a provar.",
-      "TAG_PLACEHOLDER": "Afegeix una etiqueta nova",
-      "PLACEHOLDER": "Cerca o afegeix una etiqueta"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "No s'han pogut actualitzar les etiquetes, torna-ho a provar."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edita"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
index 520f28928..55cedf814 100644
--- a/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Configuració del compte",
     "SUBMIT": "Actualització de la configuració",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "No s'ha pogut actualitzar la configuració, torna-ho a provar!",
       "SUCCESS": "La configuració del compte s'ha actualitzat correctament"
@@ -21,6 +22,25 @@
         "LABEL": "Idioma del lloc (Beta)",
         "PLACEHOLDER": "El nom del vostre compte",
         "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Habilita",
+          "DISABLED": "Inhabilita"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
index c9c1f740d..9ff7f68c2 100644
--- a/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ca/inboxMgmt.json
@@ -1,19 +1,41 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Safates d'entrada",
-    "SIDEBAR_TXT": "<p><b>Safata d'entrada</b></p> <p> Quan connecteu un lloc web o una pàgina de facebook a Chatwoot, es diu <b>Safata d'entrada</b>. Teniu bústies d'entrada il·limitades al vostre compte de Chatwoot. </p><p> Feu click a <b>Afegir safata d'entrada</b> per connectar-vos a un lloc web o a una pàgina de Facebook. </p><p> Al Tauler de control, pots veure totes les converses de totes les teves safates d'entrada en un sol lloc i respondre-les a la pestanya `Converses`. </p><p> També pots veure converses específiques per a una safata d’entrada si feu clic al nom de la safata d'entrada, al panell esquerre de la taula. </p>",
+    "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": "No hi ha cap safata d'entrada connectat a aquest compte."
     },
     "CREATE_FLOW": [
-      { "title": "Triar canal", "route": "settings_inbox_new", "body": "Trieu el proveïdor que vulgueu integrar amb Chatwoot." },
-      { "title": "Crear safata d'entrada", "route": "settings_inboxes_page_channel", "body": "Autentiqueu el vostre compte i creeu una safata d'entrada." },
-      { "title": "Afegir agents", "route": "settings_inboxes_add_agents", "body": "Afegir agents a la safata d'entrada creada." },
-      { "title": "Voila!", "route": "settings_inbox_finish", "body": "Ja estàs preparat!" }
+      {
+        "title": "Triar canal",
+        "route": "settings_inbox_new",
+        "body": "Trieu el proveïdor que vulgueu integrar amb Chatwoot."
+      },
+      {
+        "title": "Crear safata d'entrada",
+        "route": "settings_inboxes_page_channel",
+        "body": "Autentiqueu el vostre compte i creeu una safata d'entrada."
+      },
+      {
+        "title": "Afegir agents",
+        "route": "settings_inboxes_add_agents",
+        "body": "Afegir agents a la safata d'entrada creada."
+      },
+      {
+        "title": "Llest!",
+        "route": "settings_inbox_finish",
+        "body": "Ja estàs preparat!"
+      }
     ],
     "ADD": {
       "FB": {
-        "HELP": "PD: Al iniciar la sessió, només accediu als missatges de la vostra pàgina. Chatwoot mai no podrà accedir als vostres missatges privats."
+        "HELP": "PD: Al iniciar la sessió, només accediu als missatges de la vostra pàgina. Chatwoot mai no podrà accedir als vostres missatges privats.",
+        "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": "Per afegir el teu perfil de Twitter com a canal, has d'autentificar el vostre perfil de Twitter fent clic a 'Inicieu la sessió amb Twitter' "
@@ -22,6 +44,9 @@
         "TITLE": "Canal Web",
         "DESC": "Crea un canal per al vostre lloc web i comença a donar suport als vostres clients mitjançant el teu widget del lloc web.",
         "LOADING_MESSAGE": "S'està creant el canal de suport web",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Nom del lloc web",
           "PLACEHOLDER": "Introduïu el nom del vostre lloc web (per exemple, Acme Inc)"
@@ -30,11 +55,29 @@
           "LABEL": "Domini del lloc web",
           "PLACEHOLDER": "Introduïu el vostre domini de lloc web (pe: 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 user when he starts the conversation.",
+          "ENABLED": "Habilita",
+          "DISABLED": "Inhabilita"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Color del Widget",
           "PLACEHOLDER": "Actualitza el color del widget"
         },
-        "SUBMIT_BUTTON":"Crea la safata entrada"
+        "SUBMIT_BUTTON": "Crea la safata entrada"
       },
       "TWILIO": {
         "TITLE": "Canal Twilio SMS",
@@ -44,8 +87,12 @@
           "PLACEHOLDER": "Introduïu el vostre compte Twilio SID",
           "ERROR": "Aquest camp és obligatori"
         },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
         "AUTH_TOKEN": {
-          "LABEL": "Auth Token",
+          "LABEL": "Token d'autenticació",
           "PLACEHOLDER": "Introduïu el vostre Twilio Auth Token",
           "ERROR": "Aquest camp és obligatori"
         },
@@ -59,6 +106,10 @@
           "PLACEHOLDER": "Introduïu el número de telèfon des del qual serà enviat el missatge.",
           "ERROR": "Introduïu un valor vàlid. El número de telèfon hauria de començar amb el signe `+`."
         },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
         "SUBMIT_BUTTON": "Crear un canal Twilio",
         "API": {
           "ERROR_MESSAGE": "No hem pogut autenticar les credencials de Twilio, prova de nou"
@@ -66,7 +117,7 @@
       },
       "AUTH": {
         "TITLE": "Canals",
-        "DESC": "Actualment estan suportats widgets de xat en directe per a llocs web, pàgines de Facebook i perfils de Twitter. Estem treballant en més plataformes com Whatsapp, correu electrònic, Telegram i Line, que estaran disponibles en breu"
+        "DESC": "Actualment estan suportats widgets de xat en directe per a llocs web, pàgines de Facebook i perfils de Twitter. Estem treballant en més plataformes com Whatsapp, correu electrònic, Telegram i Line, que estaran disponibles en breu."
       },
       "AGENTS": {
         "TITLE": "Agents",
@@ -76,14 +127,14 @@
         "TITLE": "Detalls de la safata d'entrada",
         "DESC": "Des del següent menú desplegable, seleccioneu la pàgina de Facebook que voleu connectar a Chatwoot. També podeu donar un nom personalitzat a la safata d'entrada per a una millor identificació."
       },
-      "FINISH":{
+      "FINISH": {
         "TITLE": "L'has clavat!",
         "DESC": "Heu acabat d'integrar la vostra pàgina de Facebook amb Chatwoot. La propera vegada que un client escrigui un missatge a la vostra pàgina, la conversa apareixerà automàticament a la safata d'entrada. <br>També us proporcionem un script del widget que podeu afegir fàcilment al vostre web. Una vegada que estigui operatiu al vostre web, els clients us podran enviar missatges des del web sense l’ajuda de cap eina externa i la conversa apareixerà aquí mateix, a Chatwoot. <br>Genial, eh? Bé, segur que intentem ser-ho :)"
       }
     },
     "DETAILS": {
       "LOADING_FB": "S'està autenticant amb Facebook...",
-      "ERROR_FB_AUTH": "Alguna cosa ha anat malament, actualitza la pàgina ...",
+      "ERROR_FB_AUTH": "Alguna cosa ha anat malament, actualitza la pàgina...",
       "CREATING_CHANNEL": "S'està creant la safata d'entrada...",
       "TITLE": "Configura els detalls de la safata d'entrada",
       "DESC": ""
@@ -94,7 +145,7 @@
     },
     "FINISH": {
       "TITLE": "La vostra safata d'entrada està a punt!",
-      "MESSAGE": "Ja podeu interactuar amb els vostres clients a través del vostre canal nou. Feliç suport",
+      "MESSAGE": "Ja podeu interactuar amb els vostres clients a través del vostre canal nou. Feliç suport ",
       "BUTTON_TEXT": "Porta'm allà",
       "WEBSITE_SUCCESS": "Heu finalitzat amb èxit la creació d'un canal web. Copieu el codi que es mostra a continuació i enganxeu-lo al lloc web. La propera vegada que un client utilitzi el xat en directe, la conversa apareixerà automàticament a la safata d'entrada."
     },
@@ -117,7 +168,7 @@
         "TITLE": "Confirma esborrat",
         "MESSAGE": "N'estas segur? ",
         "YES": "Si, esborra ",
-        "NO": "No, manten-la "
+        "NO": "No, Keep "
       },
       "API": {
         "SUCCESS_MESSAGE": "S'ha suprimit la safata d'entrada correctament",
@@ -132,6 +183,8 @@
       "INBOX_AGENTS_SUB_TEXT": "Afegir o eliminar agents d'aquesta safata d'entrada",
       "UPDATE": "Actualitza",
       "AUTO_ASSIGNMENT": "Activa l'assignació automàtica",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Activa o desactiva l'assignació automàtica d'agents disponibles a les noves converses"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ca/integrations.json b/app/javascript/dashboard/i18n/locale/ca/integrations.json
index 9a97e3395..55cd53d05 100644
--- a/app/javascript/dashboard/i18n/locale/ca/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ca/integrations.json
@@ -49,6 +49,15 @@
           "NO": "No, manten-la"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Suprimeix",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
new file mode 100644
index 000000000..bd04290e3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ca/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "No hi ha cap resposta que coincideixi amb aquesta consulta",
+    "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": [
+        "Nom",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Edita",
+      "CREATE": "Create",
+      "DELETE": "Suprimeix",
+      "CANCEL": "Cancel·la"
+    },
+    "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": "Suprimeix",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirma esborrat",
+        "MESSAGE": "N'estas segur? ",
+        "YES": "Si, esborra ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ca/settings.json b/app/javascript/dashboard/i18n/locale/ca/settings.json
index bf2ffbe39..a2f8c9809 100644
--- a/app/javascript/dashboard/i18n/locale/ca/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ca/settings.json
@@ -26,9 +26,19 @@
         "TITLE": "Notificacions per correu electrònic",
         "NOTE": "Actualitza aqui les preferències de les notificacions per correu electrònic",
         "CONVERSATION_ASSIGNMENT": "Envieu notificacions per correu electrònic quan se m’assigni una conversa",
-        "CONVERSATION_CREATION": "Envieu notificacions per correu electrònic quan es crea una nova conversa",
-        "UPDATE_SUCCESS": "Les preferències de notificació per correu electrònic s’han actualitzat correctament",
-        "UPDATE_ERROR": "S'ha produït un error en actualitzar les preferències. Torneu-ho a provar"
+        "CONVERSATION_CREATION": "Envieu notificacions per correu electrònic quan es crea una nova conversa"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Imatge del Perfil"
@@ -38,6 +48,23 @@
         "ERROR": "Introduïu un nom vàlid",
         "PLACEHOLDER": "Introdueix el teu nom, serà mostrat a les converses"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "La teva adreça de correu electrònic",
         "ERROR": "Introduïu una adreça de correu electrònic vàlida",
@@ -56,38 +83,44 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Configuració del Perfil",
     "LOGOUT": "Sortir"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "dies de prova restants.",
-    "TRAIL_BUTTON": "Comprar ara"
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Copiar",
-      "COPY_SUCCESSFUL": "Codi copiat al porta-retalls correctament"
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descarrega",
-      "UPLOADING": "S'està pujant..."
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Envia"
     }
   },
-  "CONFIRM_EMAIL": "S'està verificant...",
+  "CONFIRM_EMAIL": "Verifying...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Afegeix una safata d'entrada"
+      "NEW_INBOX": "Add Inbox"
     }
   },
   "SIDEBAR": {
-    "CONVERSATIONS": "Conversacions",
+    "CONVERSATIONS": "Converses",
     "REPORTS": "Informes",
-    "SETTINGS": "Configuració",
-    "HOME": "Inici",
+    "SETTINGS": "Configuracions",
+    "HOME": "Home",
     "AGENTS": "Agents",
     "INBOXES": "Safates d'entrada",
-    "CANNED_RESPONSES": "Respostes Predeterminades",
+    "CANNED_RESPONSES": "Respostes predeterminades",
     "INTEGRATIONS": "Integracions",
-    "ACCOUNT_SETTINGS": "Configuració del compte"
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json b/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
index 2d2e7bc30..b580eaaad 100644
--- a/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenti",
     "HEADER_BTN_TXT": "Přidat agenta",
     "LOADING": "Načítání seznamu agentů",
-    "SIDEBAR_TXT": "<p><b>Agenti</b></p> <p> <b>Agent</b> je členem vašeho týmu zákaznické podpory. </p><p> Agenti budou moci prohlížet a odpovídat na zprávy od uživatelů. Seznam zobrazuje všechny agenty aktuálně na vašem účtu. </p><p> Pro přidání nového agenta klikněte na <b>Přidat agenta</b> . Přidaný agent obdrží e-mail s potvrzovacím odkazem pro aktivaci jejich účtu, poté bude mít přístup k Chatwoot a bude reagovat na zprávy. </p><p> Přístup k funkcím Chatwootu je založen na následujících rolích. </p><p> <b>Agent</b> - Agent s touto rolí může přistupovat pouze k doručeným zprávám, zprávám a konverzacím. Mohou přiřadit konverzace jiným agentům nebo sobě a řešit konverzace.</p><p> <b>Administrátor</b> - Správce bude mít přístup ke všem funkcím Chatwoot povoleným pro váš účet, včetně nastavení a fakturace, spolu se všemi právy normálních agentů.</p>",
+    "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": [
       {
         "name": "administrator",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Přidat agenta do vašeho týmu",
       "DESC": "Můžete přidat lidi, kteří budou schopni zvládnout podporu pro vaše schránky.",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
       "FORM": {
         "NAME": {
           "LABEL": "Název agenta",
@@ -60,7 +61,7 @@
         "TITLE": "Potvrdit odstranění",
         "MESSAGE": "Opravdu chcete odstranit ",
         "YES": "Ano, odstranit ",
-        "NO": "Ne, ponechat "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
index 1a7d20f32..47c0ae5e7 100644
--- a/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/cs/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Přidat konzervovanou odpověď",
       "DESC": "Konzervované odpovědi jsou uložené šablony odpovědí, které lze použít pro rychlé odeslání odpovědi do konverzace .",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krátký kód",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Upravit konzervovanou odpověď",
+      "CANCEL_BUTTON_TEXT": "Zrušit",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krátký kód",
@@ -67,7 +69,7 @@
         "TITLE": "Potvrdit odstranění",
         "MESSAGE": "Opravdu chcete odstranit ",
         "YES": "Ano, odstranit ",
-        "NO": "Ne, ponechat "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/cs/contact.json b/app/javascript/dashboard/i18n/locale/cs/contact.json
index 41616b1c5..a5d38213a 100644
--- a/app/javascript/dashboard/i18n/locale/cs/contact.json
+++ b/app/javascript/dashboard/i18n/locale/cs/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Štítky konverzace",
-      "UPDATE_BUTTON": "Aktualizovat štítky",
-      "UPDATE_ERROR": "Nelze aktualizovat štítky, zkuste to znovu.",
-      "TAG_PLACEHOLDER": "Přidat nový štítek",
-      "PLACEHOLDER": "Vyhledat nebo přidat štítek"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Upravit"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/generalSettings.json b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
new file mode 100644
index 000000000..469ccb22f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Nastavení účtu",
+    "SUBMIT": "Aktualizovat nastavení",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Nelze aktualizovat nastavení, zkuste to znovu!",
+      "SUCCESS": "Nastavení účtu bylo úspěšně aktualizováno"
+    },
+    "FORM": {
+      "ERROR": "Opravte chyby formuláře",
+      "GENERAL_SECTION": {
+        "TITLE": "Obecná nastavení",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "Název účtu",
+        "PLACEHOLDER": "Název vašeho účtu",
+        "ERROR": "Zadejte prosím platný název účtu"
+      },
+      "LANGUAGE": {
+        "LABEL": "Jazyk webu (Beta)",
+        "PLACEHOLDER": "Název vašeho účtu",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Povoleno",
+          "DISABLED": "Zakázáno"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
new file mode 100644
index 000000000..a29dd73eb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Krabice",
+    "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": "K tomuto účtu nejsou připojeny žádné doručené schránky."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Vybrat kanál",
+        "route": "settings_inbox_new",
+        "body": "Vyberte si poskytovatele, který chcete integrovat do Chatwoot."
+      },
+      {
+        "title": "Vytvořit doručenou poštu",
+        "route": "settings_inboxes_page_channel",
+        "body": "Ověřte si svůj účet a vytvořte si doručenou poštu."
+      },
+      {
+        "title": "Přidat agenty",
+        "route": "settings_inboxes_add_agents",
+        "body": "Přidat agenty do vytvořené schránky."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "Vše je nastaveno!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "PS: Přihlášením získáme přístup pouze ke zprávám vaší stránky. Vaše soukromé zprávy nikdy nemohou být přístupné 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": "Chcete-li přidat svůj Twitter profil jako kanál, musíte ověřit svůj Twitter profil kliknutím na tlačítko 'Přihlásit se přes Twitter' "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Kanál webové stránky",
+        "DESC": "Vytvořte si kanál pro vaše webové stránky a začněte podporovat své zákazníky prostřednictvím našeho widgetu.",
+        "LOADING_MESSAGE": "Vytváření podpůrného kanálu webových stránek",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Název webu",
+          "PLACEHOLDER": "Zadejte název webové stránky (např. Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Doména webových stránek",
+          "PLACEHOLDER": "Zadejte doménu webu (např. acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Úvod uvítání",
+          "PLACEHOLDER": "Ahoj!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Vítejte Tagline",
+          "PLACEHOLDER": "Snadno se s námi spojujeme. Požádejte nás o cokoliv, nebo sdílejte svou zpětnou vazbu."
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Povoleno",
+          "DISABLED": "Zakázáno"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Barva widgetu",
+          "PLACEHOLDER": "Aktualizovat barvu widgetu použitou ve widgetu"
+        },
+        "SUBMIT_BUTTON": "Vytvořit doručenou poštu"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/Whatsapp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "ACCOUNT_SID": {
+          "LABEL": "SID účtu",
+          "PLACEHOLDER": "Zadejte SID vašeho Twilio účtu",
+          "ERROR": "Toto pole je povinné"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth Token",
+          "PLACEHOLDER": "Zadejte svůj ověřovací Token Twilio",
+          "ERROR": "Toto pole je povinné"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Název kanálu",
+          "PLACEHOLDER": "Zadejte název kanálu",
+          "ERROR": "Toto pole je povinné"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Telefonní číslo",
+          "PLACEHOLDER": "Zadejte prosím telefonní číslo, ze kterého bude zpráva odeslána.",
+          "ERROR": "Zadejte platnou hodnotu. Telefonní číslo by mělo začínat znakem `+`."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Vytvořit Twilio kanál",
+        "API": {
+          "ERROR_MESSAGE": "Nebyli jsme schopni ověřit přihlašovací údaje Twilia, zkuste to prosím znovu"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Kanály",
+        "DESC": "V současné době podporujeme jako platformu widgety živého chatu, Facebook stránky a Twitter profily. Máme více platforem jako Whatsapp, Email, Telegram a Line v dílech, což bude brzy ven."
+      },
+      "AGENTS": {
+        "TITLE": "Agenti",
+        "DESC": "Zde můžete přidat agenty ke správě nově vytvořené schránky. Pouze tito vybraní agenti budou mít přístup do vaší schránky. Agenty, které nejsou součástí této schránky, nebudou moci při přihlášení vidět zprávy v této schránce ani na ně reagovat. <br> <b>PS:</b> Jako správce, pokud potřebujete přístup ke všem schránkám, byste se měli přidat jako agent do všech schránek, které vytváříte."
+      },
+      "DETAILS": {
+        "TITLE": "Doručená pošta detaily",
+        "DESC": "Z rozevíracího seznamu níže vyberte Facebook stránku, kterou chcete připojit k Chatwoot. Můžete také zadat vlastní název doručené poště pro lepší identifikaci."
+      },
+      "FINISH": {
+        "TITLE": "Nalezeno to!",
+        "DESC": "Úspěšně jste dokončili integraci vaší facebookové stránky s Chatwootem. Až příště přijde zákaznická zpráva, konverzace se automaticky objeví ve vaší schránce.<br>Poskytujeme vám také widget skript, který můžete snadno přidat na vaše webové stránky. Jakmile je toto aktivní na vašich webových stránkách, zákazníci vám mohou posílat zprávy přímo z vašich webových stránek bez pomoci externího nástroje a konverzace se objeví přímo zde, na Chatwoot.<br>Skvěle, co? No, určitě se pokusíme být :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Ověřování pomocí Facebooku...",
+      "ERROR_FB_AUTH": "Něco se pokazilo, prosím obnovte stránku...",
+      "CREATING_CHANNEL": "Vytvářím vaši doručenou poštu...",
+      "TITLE": "Konfigurace detailů doručené pošty",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Přidat agenty",
+      "ADD_AGENTS": "Přidávání agentů do vaší schránky..."
+    },
+    "FINISH": {
+      "TITLE": "Vaše doručená pošta je připravena!",
+      "MESSAGE": "Nyní se můžete spojit se svými zákazníky prostřednictvím nového kanálu. Šťastná podpora ",
+      "BUTTON_TEXT": "Vezmi mě tam",
+      "WEBSITE_SUCCESS": "Úspěšně jste dokončili vytvoření webového kanálu. Zkopírujte kód zobrazený níže a vložte jej na vaše webové stránky. Když zákazník příště použije živý chat, konverzace se automaticky objeví ve vaší doručené poště."
+    },
+    "REAUTH": "Znovu autorizovat",
+    "VIEW": "Zobrazit",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Nastavení doručené pošty bylo úspěšně aktualizováno",
+        "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Vymazat",
+      "CONFIRM": {
+        "TITLE": "Potvrdit odstranění",
+        "MESSAGE": "Opravdu chcete odstranit ",
+        "YES": "Ano, odstranit ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Doručená pošta byla úspěšně smazána",
+        "ERROR_MESSAGE": "Nelze odstranit doručenou poštu. Opakujte akci později."
+      }
+    },
+    "SETTINGS": "Nastavení",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Messenger skript",
+      "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",
+      "UPDATE": "Aktualizovat",
+      "AUTO_ASSIGNMENT": "Povolit automatické přiřazení",
+      "INBOX_UPDATE_TITLE": "Nastavení doručené pošty",
+      "INBOX_UPDATE_SUB_TEXT": "Aktualizujte nastavení doručené pošty",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Povolit nebo zakázat automatické přiřazování nových konverzací agentům přidaným do této schránky."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/index.js b/app/javascript/dashboard/i18n/locale/cs/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/cs/integrations.json b/app/javascript/dashboard/i18n/locale/cs/integrations.json
index 750e5b51a..568e45a97 100644
--- a/app/javascript/dashboard/i18n/locale/cs/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/cs/integrations.json
@@ -46,9 +46,18 @@
           "TITLE": "Potvrdit odstranění",
           "MESSAGE": "Opravdu chcete odstranit ",
           "YES": "Ano, odstranit ",
-          "NO": "Ne, ponechat "
+          "NO": "No, Keep it"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Vymazat",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
new file mode 100644
index 000000000..41ef54d62
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Neexistují žádné položky odpovídající tomuto dotazu",
+    "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": [
+        "Název",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Upravit",
+      "CREATE": "Create",
+      "DELETE": "Vymazat",
+      "CANCEL": "Zrušit"
+    },
+    "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": "Vymazat",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Potvrdit odstranění",
+        "MESSAGE": "Opravdu chcete odstranit ",
+        "YES": "Ano, odstranit ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/login.json b/app/javascript/dashboard/i18n/locale/cs/login.json
new file mode 100644
index 000000000..f5453b5e3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Přihlásit se do Chatwoot",
+    "EMAIL": {
+      "LABEL": "E-mailová adresa",
+      "PLACEHOLDER": "E-mail např: někdo@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Heslo",
+      "PLACEHOLDER": "Heslo"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Přihlášení úspěšné",
+      "ERROR_MESSAGE": "Nelze se připojit k Woot serveru, opakujte akci později",
+      "UNAUTH": "Nesprávné uživatelské jméno / heslo. Zkuste to prosím znovu"
+    },
+    "FORGOT_PASSWORD": "Zapomněli jste heslo?",
+    "CREATE_NEW_ACCOUNT": "Vytvořit nový účet",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/cs/settings.json b/app/javascript/dashboard/i18n/locale/cs/settings.json
new file mode 100644
index 000000000..414dd3452
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/cs/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Nastavení profilu",
+    "TITLE": "Nastavení profilu",
+    "BTN_TEXT": "Aktualizovat profil",
+    "AFTER_EMAIL_CHANGED": "Váš profil byl úspěšně aktualizován, přihlaste se prosím znovu, protože se vaše přihlašovací údaje změnily",
+    "FORM": {
+      "AVATAR": "Profil obrázek",
+      "ERROR": "Opravte chyby formuláře",
+      "REMOVE_IMAGE": "Odebrat",
+      "UPLOAD_IMAGE": "Nahrát obrázek",
+      "UPDATE_IMAGE": "Aktualizovat obrázek",
+      "PROFILE_SECTION": {
+        "TITLE": "Profil",
+        "NOTE": "Vaše e-mailová adresa je Vaše identita a používá se k přihlášení."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Heslo",
+        "NOTE": "Aktualizace hesla by obnovila vaše přihlašovací údaje na více zařízeních."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Přístupový token",
+        "NOTE": "Tento token může být použit při vytváření integrace založené na API"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "E-mailová oznámení",
+        "NOTE": "Zde aktualizujte nastavení e-mailových oznámení",
+        "CONVERSATION_ASSIGNMENT": "Odeslat e-mailová oznámení, když je mi přiřazena konverzace",
+        "CONVERSATION_CREATION": "Odeslat oznámení e-mailem při vytváření nové konverzace"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profil obrázek"
+      },
+      "NAME": {
+        "LABEL": "Vaše jméno",
+        "ERROR": "Zadejte prosím platný název",
+        "PLACEHOLDER": "Zadejte prosím Vaše jméno, bude zobrazeno v konverzacích"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Vaše e-mailová adresa",
+        "ERROR": "Zadejte prosím platnou e-mailovou adresu",
+        "PLACEHOLDER": "Prosím, zadejte vaši e-mailovou adresu, bude zobrazena v konverzacích"
+      },
+      "PASSWORD": {
+        "LABEL": "Heslo",
+        "ERROR": "Zadejte prosím heslo o délce 6 nebo více",
+        "PLACEHOLDER": "Zadejte prosím nové heslo"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Potvrdit nové heslo",
+        "ERROR": "Potvrzení hesla by mělo odpovídat heslu",
+        "PLACEHOLDER": "Zadejte prosím znovu své heslo"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Nastavení profilu",
+    "LOGOUT": "Odhlásit se"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Stáhnout",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Odeslat"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Konverzace",
+    "REPORTS": "Zprávy",
+    "SETTINGS": "Nastavení",
+    "HOME": "Home",
+    "AGENTS": "Agenti",
+    "INBOXES": "Krabice",
+    "CANNED_RESPONSES": "Konzervované odpovědi",
+    "INTEGRATIONS": "Integrace",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/agentMgmt.json b/app/javascript/dashboard/i18n/locale/da/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/da/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/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 shortcode",
+          "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/da/chatlist.json b/app/javascript/dashboard/i18n/locale/da/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/contact.json b/app/javascript/dashboard/i18n/locale/da/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/conversation.json b/app/javascript/dashboard/i18n/locale/da/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/generalSettings.json b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/index.js b/app/javascript/dashboard/i18n/locale/da/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/da/integrations.json b/app/javascript/dashboard/i18n/locale/da/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/da/login.json b/app/javascript/dashboard/i18n/locale/da/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/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/da/report.json b/app/javascript/dashboard/i18n/locale/da/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/resetPassword.json b/app/javascript/dashboard/i18n/locale/da/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/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/da/setNewPassword.json b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/settings.json b/app/javascript/dashboard/i18n/locale/da/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/signup.json b/app/javascript/dashboard/i18n/locale/da/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/da/webhooks.json b/app/javascript/dashboard/i18n/locale/da/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/da/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
index 5d9111808..8ed86701e 100644
--- a/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/agentMgmt.json
@@ -3,12 +3,13 @@
     "HEADER": "Agenten",
     "HEADER_BTN_TXT": "Agent hinzufügen",
     "LOADING": "Agentenliste abrufen",
-    "SIDEBAR_TXT": "<p> <b> Agenten </b> </p> <p> Ein <b> Agent </b> ist Mitglied Ihres Kundensupportteams. </p> <p> Agenten können Nachrichten Ihrer Benutzer anzeigen und beantworten. In der Liste werden alle Agenten angezeigt, die sich derzeit in Ihrem Konto befinden. </p> <p> Klicken Sie auf <b> Agent hinzufügen </b>, um einen neuen Agenten hinzuzufügen. Der von Ihnen hinzugefügte Agent erhält eine E-Mail mit einem Bestätigungslink zur Aktivierung seines Kontos. Anschließend kann er auf Chatwoot zugreifen und auf Nachrichten antworten. </p> <p> Der Zugriff auf die Funktionen von Chatwoot basiert auf den folgenden Rollen. </p> <p> <b> Agent </b> - Agenten mit dieser Rolle können nur auf Posteingänge, Berichte und Konversationen zugreifen. Sie können Konversationen anderen Agenten oder sich selbst zuweisen und Konversationen auflösen. </p> <p> <b> Administrator </b> - Der Administrator hat Zugriff auf alle für Ihr Konto aktivierten Chatwoot-Funktionen, einschließlich Einstellungen und Abrechnung, sowie auf alle der Berechtigungen eines normalen Agenten. </p>",
+    "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": [
       {
         "name": "administrator",
         "label": "Administrator"
-      }, {
+      },
+      {
         "name": "agent",
         "label": "Agent"
       }
@@ -27,17 +28,18 @@
     "ADD": {
       "TITLE": "Fügen Sie Ihrem Team einen Agenten hinzu",
       "DESC": "Sie können Personen hinzufügen, die die Unterstützung für Ihre Posteingänge übernehmen können.",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
       "FORM": {
-        "NAME" : {
+        "NAME": {
           "LABEL": "Agentenname",
           "PLACEHOLDER": "Bitte geben Sie einen Namen des Agenten ein"
         },
-        "AGENT_TYPE" : {
+        "AGENT_TYPE": {
           "LABEL": "Agententyp",
           "PLACEHOLDER": "Bitte wählen Sie einen Typ",
           "ERROR": "Agententyp ist erforderlich"
         },
-        "EMAIL" : {
+        "EMAIL": {
           "LABEL": "E-Mail-Addresse",
           "PLACEHOLDER": "Bitte geben Sie eine E-Mail-Adresse des Agenten ein"
         },
@@ -59,22 +61,22 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest?",
         "YES": "Ja, löschen ",
-        "NO": "Nein, behalte es "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
       "TITLE": "Agent bearbeiten",
       "FORM": {
-        "NAME" : {
+        "NAME": {
           "LABEL": "Agentenname",
           "PLACEHOLDER": "Bitte geben Sie einen Namen des Agenten ein"
         },
-        "AGENT_TYPE" : {
+        "AGENT_TYPE": {
           "LABEL": "Agententyp",
           "PLACEHOLDER": "Bitte wählen Sie einen Typ",
           "ERROR": "Agententyp ist erforderlich"
         },
-        "EMAIL" : {
+        "EMAIL": {
           "LABEL": "E-Mail-Addresse",
           "PLACEHOLDER": "Bitte geben Sie eine E-Mail-Adresse des Agenten ein"
         },
diff --git a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
index e9d333880..e3973ef35 100644
--- a/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Vorgefertigte Antwort hinzufügen",
       "DESC": "Gespeicherte Antworten sind gespeicherte Antwortvorlagen, mit denen schnell Antworten auf Konversationen gesendet werden können.",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Funktionscode",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Vorgefertigte Antwort bearbeiten",
+      "CANCEL_BUTTON_TEXT": "Stornieren",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Funktionscode",
@@ -67,7 +69,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest",
         "YES": "Ja, löschen",
-        "NO": "Nein, behalte es"
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/contact.json b/app/javascript/dashboard/i18n/locale/de/contact.json
index ae50556ef..6e2f01fab 100644
--- a/app/javascript/dashboard/i18n/locale/de/contact.json
+++ b/app/javascript/dashboard/i18n/locale/de/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Konversationsetiketten",
-      "UPDATE_BUTTON": "Etiketten aktualisieren",
-      "UPDATE_ERROR": "Etiketten konnten nicht aktualisiert werden. Versuchen Sie es erneut.",
-      "TAG_PLACEHOLDER": "Neues Etikett hinzufügen",
-      "PLACEHOLDER": "Suchen oder fügen Sie ein Etikett hinzu"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Etiketten konnten nicht aktualisiert werden. Versuchen Sie es erneut."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Bearbeiten"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/generalSettings.json b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
index 66458623f..05c00453c 100644
--- a/app/javascript/dashboard/i18n/locale/de/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/de/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Kontoeinstellungen",
     "SUBMIT": "Update Einstellungen",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Einstellungen konnten nicht aktualisiert werden, versuchen Sie es erneut!",
       "SUCCESS": "Kontoeinstellungen erfolgreich aktualisiert"
@@ -21,6 +22,25 @@
         "LABEL": "Site-Sprache (Beta)",
         "PLACEHOLDER": "Ihr Kontoname",
         "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Aktiviert",
+          "DISABLED": "Behindert"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
index fca1a7c44..ed3a30100 100644
--- a/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/de/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Posteingänge",
-    "SIDEBAR_TXT": "<p> <b> Posteingang </b> </p> <p> Wenn Sie eine Website oder eine Facebook-Seite mit Chatwoot verbinden, wird dies als <b> Posteingang </b> bezeichnet. Sie können unbegrenzt Posteingänge in Ihrem Chatwoot-Konto haben. </p> <p> Klicken Sie auf <b> Posteingang hinzufügen </b>, um eine Website oder eine Facebook-Seite zu verbinden. </p> <p> Im Dashboard können Sie alle Konversationen aus all Ihren Posteingängen an einem einzigen Ort anzeigen und unter 'Konversationen' darauf antworten `tab. </p> <p> Sie können Konversationen auch für einen Posteingang anzeigen, indem Sie auf den Namen des Posteingangs im linken Bereich des Dashboards klicken. </p>",
+    "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": "Diesem Konto sind keine Posteingänge zugeordnet."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: Durch die Anmeldung erhalten wir nur Zugriff auf die Nachrichten Ihrer Seite. Auf Ihre privaten Nachrichten kann Chatwoot niemals zugreifen."
+        "HELP": "PS: Durch die Anmeldung erhalten wir nur Zugriff auf die Nachrichten Ihrer Seite. Auf Ihre privaten Nachrichten kann Chatwoot niemals zugreifen.",
+        "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": "Um Ihr Twitter-Profil als Kanal hinzuzufügen, müssen Sie Ihr Twitter-Profil authentifizieren, indem Sie auf 'Mit Twitter anmelden' klicken."
@@ -37,6 +43,10 @@
       "WEBSITE_CHANNEL": {
         "TITLE": "Website-Kanal",
         "DESC": "Erstellen Sie einen Kanal für Ihre Website und unterstützen Sie Ihre Kunden über unser Website-Widget.",
+        "LOADING_MESSAGE": "Creating Website Support Channel",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Webseiten-Name",
           "PLACEHOLDER": "Geben Sie den Namen Ihrer Website ein (eg: Acme Inc)"
@@ -45,6 +55,24 @@
           "LABEL": "Website Domain",
           "PLACEHOLDER": "Geben Sie Ihre Website-Domain ein (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 user when he starts the conversation.",
+          "ENABLED": "Aktiviert",
+          "DISABLED": "Behindert"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Widget Farbe",
           "PLACEHOLDER": "Aktualisieren Sie die im Widget verwendete Widget-Farbe"
@@ -59,6 +87,10 @@
           "PLACEHOLDER": "Bitte geben Sie Ihre Twilio Account SID ein",
           "ERROR": "Dieses Feld wird benötigt"
         },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
         "AUTH_TOKEN": {
           "LABEL": "Auth Token",
           "PLACEHOLDER": "Bitte geben Sie Ihr Twilio Auth Token ein",
@@ -74,6 +106,10 @@
           "PLACEHOLDER": "Bitte geben Sie die Telefonnummer ein, von der die Nachricht gesendet wird.",
           "ERROR": "Bitte geben sie einen gültigen Wert ein. Die Telefonnummer sollte mit dem Pluszeichen beginnen."
         },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
         "SUBMIT_BUTTON": "Erstellen Sie Twilio Channel",
         "API": {
           "ERROR_MESSAGE": "Wir konnten die Twilio-Anmeldeinformationen nicht authentifizieren. Bitte versuchen Sie es erneut"
@@ -132,7 +168,7 @@
         "TITLE": "Löschung bestätigen",
         "MESSAGE": "Bist du sicher, das du das löschen möchtest ",
         "YES": "Ja, löschen",
-        "NO": "Nein, behalte es "
+        "NO": "No, Keep "
       },
       "API": {
         "SUCCESS_MESSAGE": "Posteingang erfolgreich gelöscht",
@@ -147,6 +183,8 @@
       "INBOX_AGENTS_SUB_TEXT": "Hinzufügen oder Entfernen von Agenten zu diesem Posteingang",
       "UPDATE": "Aktualisieren",
       "AUTO_ASSIGNMENT": "Aktivieren Sie die automatische Zuweisung",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivieren oder deaktivieren Sie die automatische Zuweisung verfügbarer Agenten für neue Konversationen"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/de/integrations.json b/app/javascript/dashboard/i18n/locale/de/integrations.json
index 9941cacd4..54219e449 100644
--- a/app/javascript/dashboard/i18n/locale/de/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/de/integrations.json
@@ -46,9 +46,18 @@
           "TITLE": "Löschung bestätigen",
           "MESSAGE": "Bist du sicher, das du das löschen möchtest",
           "YES": "Ja, löschen ",
-          "NO": "Nein, behalte es "
+          "NO": "Nein, behalte es"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Löschen",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
new file mode 100644
index 000000000..38f596efb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/de/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Es gibt keine Elemente, die dieser Abfrage entsprechen",
+    "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",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Bearbeiten",
+      "CREATE": "Create",
+      "DELETE": "Löschen",
+      "CANCEL": "Stornieren"
+    },
+    "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": "Löschen",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Löschung bestätigen",
+        "MESSAGE": "Bist du sicher, das du das löschen möchtest",
+        "YES": "Ja, löschen",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/de/report.json b/app/javascript/dashboard/i18n/locale/de/report.json
index 2e95b6019..5a79ed1cf 100644
--- a/app/javascript/dashboard/i18n/locale/de/report.json
+++ b/app/javascript/dashboard/i18n/locale/de/report.json
@@ -4,16 +4,46 @@
     "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.",
     "METRICS": [
-      { "NAME": "Gespräche", "KEY": "conversations_count", "DESC": "( Total )" },
-      { "NAME": "Eingehende Nachrichten", "KEY": "incoming_messages_count", "DESC": "( Total )" },
-      { "NAME": "Ausgehende Nachrichten", "KEY": "outgoing_messages_count", "DESC": "( Total )" },
-      { "NAME": "Erste Antwortzeit", "KEY": "avg_first_response_time", "DESC": "( Avg )" },
-      { "NAME": "Lösungszeit", "KEY": "avg_resolution_time", "DESC": "( Avg )" },
-      { "NAME": "Auflösungsanzahl", "KEY": "resolutions_count", "DESC": "( Total )" }
+      {
+        "NAME": "Gespräche",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Eingehende Nachrichten",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Ausgehende Nachrichten",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Erste Antwortzeit",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Lösungszeit",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Auflösungsanzahl",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
     ],
     "DATE_RANGE": [
-      { "id": 0, "name": "Letzten 7 Tage" },
-      { "id": 1, "name": "Letzte 30 Tage" }
+      {
+        "id": 0,
+        "name": "Letzten 7 Tage"
+      },
+      {
+        "id": 1,
+        "name": "Letzte 30 Tage"
+      }
     ]
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/settings.json b/app/javascript/dashboard/i18n/locale/de/settings.json
index c9ff6b118..54a246b10 100644
--- a/app/javascript/dashboard/i18n/locale/de/settings.json
+++ b/app/javascript/dashboard/i18n/locale/de/settings.json
@@ -26,10 +26,20 @@
         "TITLE": "E-Mail Benachrichtigungen",
         "NOTE": "Aktualisieren Sie hier Ihre E-Mail-Benachrichtigungseinstellungen",
         "CONVERSATION_ASSIGNMENT": "Senden Sie E-Mail-Benachrichtigungen, wenn mir ein Gespräch zugewiesen wurde",
-        "CONVERSATION_CREATION": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Konversation erstellt wird",
-        "UPDATE_SUCCESS": "Ihre E-Mail-Benachrichtigungseinstellungen wurden erfolgreich aktualisiert",
+        "CONVERSATION_CREATION": "Senden Sie E-Mail-Benachrichtigungen, wenn eine neue Konversation erstellt wird"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "UPDATE_ERROR": "Beim Aktualisieren der Einstellungen ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut"
       },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
       "PROFILE_IMAGE": {
         "LABEL": "Profilbild"
       },
@@ -38,6 +48,23 @@
         "ERROR": "Bitte geben Sie einen gültigen Namen ein",
         "PLACEHOLDER": "Bitte geben Sie Ihren Namen ein, dies wird in Gesprächen angezeigt"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Deine Emailadresse",
         "ERROR": "Bitte geben Sie eine gültige E-Mail-Adresse ein",
@@ -56,30 +83,32 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profileinstellungen",
     "LOGOUT": "Ausloggen"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "verbleibende Tage Probezeit.",
-    "TRAIL_BUTTON": "Kaufe jetzt"
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "Kopieren",
-      "COPY_SUCCESSFUL": "Code erfolgreich in die Zwischenablage kopiert"
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
     "FILE_BUBBLE": {
       "DOWNLOAD": "Herunterladen",
-      "UPLOADING": "Hochladen..."
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "Einreichen"
     }
   },
-  "CONFIRM_EMAIL": "Überprüfen...",
+  "CONFIRM_EMAIL": "Verifying...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "Posteingang hinzufügen"
+      "NEW_INBOX": "Add Inbox"
     }
   },
   "SIDEBAR": {
@@ -91,7 +120,7 @@
     "INBOXES": "Posteingänge",
     "CANNED_RESPONSES": "Vorgefertigte Antworten",
     "INTEGRATIONS": "Integrationen",
-    "ACCOUNT_SETTINGS": "Kontoeinstellungen"
+    "ACCOUNT_SETTINGS": "Kontoeinstellungen",
+    "LABELS": "Labels"
   }
-
 }
diff --git a/app/javascript/dashboard/i18n/locale/de/signup.json b/app/javascript/dashboard/i18n/locale/de/signup.json
index f0a504fc2..c38edf361 100644
--- a/app/javascript/dashboard/i18n/locale/de/signup.json
+++ b/app/javascript/dashboard/i18n/locale/de/signup.json
@@ -15,7 +15,7 @@
     },
     "PASSWORD": {
       "LABEL": "Passwort",
-      "PLACEHOLDER": "Password",
+      "PLACEHOLDER": "Passwort",
       "ERROR": "Das Passwort ist zu kurz"
     },
     "CONFIRM_PASSWORD": {
diff --git a/app/javascript/dashboard/i18n/locale/el/agentMgmt.json b/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
index b08408c7a..e2463ac6c 100644
--- a/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Πράκτορες",
     "HEADER_BTN_TXT": "Προσθήκη Πράκτορα",
     "LOADING": "Λήψη της λίστα των Πρακτόρων",
-    "SIDEBAR_TXT": "<p><b>Πράκτορες</b></p> <p> Ένας <b>Πράκτορας</b> είναι ένα μέλος της ομάδας υποστήριξής σας. </p><p> Οι πράκτορες θα μπορούν να δουν και να απαντήσουν στα μηνύματα των χρηστών. Στην λίστα φαίνονται όλοι οι πράκτορες που συμμετέχουν στον λογαριασμό σας. </p><p> Πατήστε στο <b>Προσθήκη Πράκτορα</b> για να προσθέσετε έναν νέο. Ο πράκτορας θα λάβει ένα email με σύνδεσμο επιβεβαίωσης για να ενεργοποιήσει τον λογαριασμό του, ύστερα θα μπορούν να δουν το Chatwoot και να ανταποκρίνονται στα μηνύματά τους. </p><p> Η πρόσβαση στις δυνατότητες του Chatwoot βαζίζεται στους παρακάτω ρόλους. </p><p> <b>Πράκτορας</b> - Οι χρήστες με αυτόν τον ρόλο έχουν πρόσβαση μόνο στα εισερχόμενα, αναφορές και τις συζητήσεις. Μπορούν επίσης να αναθέσουν συζητήσεις σε άλλους πράκτορες ή τον εαυτό τους και να τις ολοκληρώσουν.</p><p> <b>Διαχειριστής</b> - Ο διαχειριστής θα έχει πρόσβαση σε όλες τις δυνατότητες του Chatwoot που έχουν ενεργοποιηθεί για τον λογαριασμό, συμπεριλαμβανομένων των ρυθμίσεων της εφαρμογής, όπως επίσης και όλα τα δικαιώματα που έχει ένας πράκτορας.</p>",
+    "SIDEBAR_TXT": "<p><b>Πράκτορες</b></p> <p> Ένας <b>Πράκτορας</b> είναι ένα μέλος της ομάδας υποστήριξής σας. </p><p> Οι πράκτορες θα μπορούν να δουν και να απαντήσουν στα μηνύματα των χρηστών. Στην λίστα φαίνονται όλοι οι πράκτορες που συμμετέχουν στον λογαριασμό σας. </p><p> Πατήστε στο <b>Προσθήκη Πράκτορα</b> για να προσθέσετε έναν νέο. Ο πράκτορας θα λάβει ένα email με σύνδεσμο επιβεβαίωσης για να ενεργοποιήσει τον λογαριασμό του, ύστερα θα μπορούν να δουν το Chatwoot και να ανταποκρίνονται στα μηνύματά τους. </p><p> Η πρόσβαση στις δυνατότητες του Chatwoot βασίζεται στους παρακάτω ρόλους. </p><p> <b>Πράκτορας</b> - Οι χρήστες με αυτόν τον ρόλο έχουν πρόσβαση μόνο στα εισερχόμενα, αναφορές και τις συζητήσεις. Μπορούν επίσης να αναθέσουν συζητήσεις σε άλλους πράκτορες ή τον εαυτό τους και να τις ολοκληρώσουν.</p><p> <b>Διαχειριστής</b> - Ο διαχειριστής θα έχει πρόσβαση σε όλες τις δυνατότητες του Chatwoot που έχουν ενεργοποιηθεί για τον λογαριασμό, συμπεριλαμβανομένων των ρυθμίσεων της εφαρμογής, όπως επίσης και όλα τα δικαιώματα που έχει ένας πράκτορας.</p>",
     "AGENT_TYPES": [
       {
         "name": "administrator",
diff --git a/app/javascript/dashboard/i18n/locale/el/contact.json b/app/javascript/dashboard/i18n/locale/el/contact.json
index 378e479ac..2240f7258 100644
--- a/app/javascript/dashboard/i18n/locale/el/contact.json
+++ b/app/javascript/dashboard/i18n/locale/el/contact.json
@@ -11,11 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Ετικέτες συνομιλίας",
-      "UPDATE_BUTTON": "Ενημέρωση ετικετών",
-      "UPDATE_ERROR": "Δεν μπορούν να ενημερωθούν οι ετικέτες, προσπαθήστε ξανά.",
-      "TAG_PLACEHOLDER": "Προθήκη ετικέτας",
-      "PLACEHOLDER": "Αναζήτηση/Προσθήκη ετικέτας"
+      "MODAL": {
+        "TITLE": "Ετικέτες για",
+        "ACTIVE_LABELS": "Προστέθηκαν ετικέτες στην συνομιλία",
+        "INACTIVE_LABELS": "Υπάρχουν διαθέσιμες ετικέτες στον λογαριασμό",
+        "REMOVE": "Πατήστε στο εικονίδιο X για να απομακρύνετε την ετικέτα",
+        "ADD": "Πατήστε στο εικονίδιο + για να προσθέστε την ετικέτα",
+        "UPDATE_BUTTON": "Ενημέρωση Ετικετών",
+        "UPDATE_ERROR": "Δεν μπορούν να ενημερωθούν οι ετικέτες, προσπαθήστε ξανά."
+      },
+      "NO_LABELS_TO_ADD": "Δεν υπάρχουν άλλες ετικέτες στον λογαριασμό.",
+      "NO_AVAILABLE_LABELS": "Δεν υπάρχουν προστεθεί ετικέτες στην συνομιλία."
     },
-    "MUTE_CONTACT": "Παύση (Mute)"
+    "MUTE_CONTACT": "Παύση (Mute)",
+    "EDIT_LABEL": "Επεξεργασία"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/generalSettings.json b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
index 06b211b19..1849f2ab8 100644
--- a/app/javascript/dashboard/i18n/locale/el/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/el/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Ρυθμίσεις",
     "SUBMIT": "Ενημέρωση Ρυθμίσεων",
+    "BACK": "Πίσω",
     "UPDATE": {
       "ERROR": "Δεν μπορεί να ενημερωθεί η ρύθμιση προσπαθήστε ξανά!",
       "SUCCESS": "Επιτυχής Ενημέρωση Ρυθμίσεων"
diff --git a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
index 7622b72f1..01c3cfe19 100644
--- a/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/el/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Κιβώτια Εισερχομένων",
-    "SIDEBAR_TXT": "<p><b>Κιβώτιο Εισερχομένων</b></p> <p> Όταν συνδέετε σε μια Ιστοσελίδα ή μια σελίδα του Facebook με το Chatwoot, δημιουργείται ένα <b>Κιβώτιο</b>. Μπορείτε να έχετε απεριόριστα κιβώτια στον λογαριασμό σας στο Chatwoot. </p><p> Πατήστε στο <b>Προσθήκη Κιβωτίου</b> για να το συνδέσετε με μια ιστοσελίδα ή μια σελίδα στο Facebook. </p><p> Στον Πίνακα Ελέγχου, μπορείτε να δείτε τις συνομιλίες από όλα τα κιβώτια σε ένα μέρος και να απαντήσετε από την καρτέλα `Συνομιλίες`. </p><p> Μπορείτε επίσης να δείτε τις συνομιλίες από ένα κιβώτιο εισερχομένων πατώντας στο όνομά του στο αριστερό μέρος του πίνακα ελέγχου. </p>",
+    "SIDEBAR_TXT": "<p><b>Κιβώτιο Εισερχομένων</b></p> <p> Όταν συνδέετε μια ιστοσελίδα ή μια σελίδα του Facebook με το Chatwoot αυτό καλείται ως <b>Κιβώτιο Εισερχομένων</b>. Μπορείτε να έχετε απεριόριστα κιβώτια σε ένα λογαριασμό. </p><p> Πατήστε στο <b>Προσθήκη Κιβωτίου</b> για να συνδέετε μια ιστοσελίδα ή μια σελίδα Facebook. </p><p> Στον Πίνακα Ελέγχου (Dashboard), μπορείτε να δείτε όλες τις συνομιλίες από όλα τα κιβώτια σε ένα μέρος και να απαντήσετε στις συζητήσεις από την καρτέλα `Συνομιλίες`. </p><p> Μπορείτε επίσης να δείτε τις συνομιλίες που αφορούν ένα συγκεκριμένο κιβώτιο επιλέγοντάς το από το αριστερό τμήμα του πίνακα ελέγχου (dashboard). </p>",
     "LIST": {
       "404": "Δεν υπάρχουν κιβώτια εισερχομένων σε αυτόν τον λογαριασμό."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "ΥΓ: Με την είσοδο, θα έχουμε πρόσβαση μόνο στα μηνύματα της σελίδας σας. Τα ιδιωτικά μηνύματά σας ποτέ δεν προσπελαστούν από το Chatwoot."
+        "HELP": "ΥΓ: Με την είσοδο, θα έχουμε πρόσβαση μόνο στα μηνύματα της σελίδας σας. Τα ιδιωτικά μηνύματά σας ποτέ δεν προσπελαστούν από το Chatwoot.",
+        "CHOOSE_PAGE": "Διάλεξε Σελίδα",
+        "CHOOSE_PLACEHOLDER": "Επιλέξτε σελίδα από την Λίστα",
+        "INBOX_NAME": "Όνομα Κιβωτίου",
+        "ADD_NAME": "Ονοματίστε το κιβώτιο σας",
+        "PICK_NAME": "Διαλέξτε όνομα για το κιβώτιο",
+        "PICK_A_VALUE": "Επιλέξτε τιμή"
       },
       "TWITTER": {
         "HELP": "Για να προσθέσετε το Προφίλ Twitter ως κανάλι, πρέπει να επικυρώστε το Προφίλ σας στο Twiter κάνοντας click στο 'Είσοδος με το Twitter' "
@@ -38,6 +44,9 @@
         "TITLE": "Κανάλι Ιστοσελίδας",
         "DESC": "Δημιουργήστε ένα κανάλι Ιστοσελίδα για να υποστηρίξετε τους πελάτες σας μέσω του πρόσθετου επικοινωνίας (widget) που θα εγκαταστήσετε στην ιστοσελίδα σας.",
         "LOADING_MESSAGE": "Δημιουργία κανάλιού υποστήριξης ιστοσελίδας",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Avatar Καναλιού"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Ονομασία Ιστοσελίδας",
           "PLACEHOLDER": "Συμπληρώστε την ονομασία της ιστοσελίδας σας (π.χ: Ελληνικό Μεσογειακό Πανεπιστήμιο)"
@@ -55,9 +64,15 @@
           "PLACEHOLDER": "Είναι απλό να συνδεθείτε μαζί μας. Ζητήστε μας οτιδήποτε, ή μοιραστείτε την εμπειρία σας."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Μήνυμα όταν δεν υπάρχουν πράκτορες",
+          "LABEL": "Μήνυμα καλωσορίσματος στο Κανάλι",
           "PLACEHOLDER": "Τυπικά απαντάμε σε μερικές ώρες."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Ενεργοποίηση καλωσορίσματος",
+          "HELP_TEXT": "Στείλτε ένα καλωσόρισμα στον χρήστης όταν ξεκινάει την συζήτηση.",
+          "ENABLED": "Ενεργό",
+          "DISABLED": "Ανενεργό"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Χρώμα Widget",
           "PLACEHOLDER": "Ενημερώστε το χρώμα του 'widget' που θα εμφανίζεται στους χρήστες"
@@ -153,7 +168,7 @@
         "TITLE": "Επιβεβαίωση Διαγραφής",
         "MESSAGE": "Είσαστε σίγουρος για την διαγραφή ",
         "YES": "Ναι, Διέγραψε το ",
-        "NO": "Όχι, Κράτα το "
+        "NO": "Όχι, Κράτησε τον/την"
       },
       "API": {
         "SUCCESS_MESSAGE": "Το κιβώτιο διαγράφηκε επιτυχώς",
diff --git a/app/javascript/dashboard/i18n/locale/el/integrations.json b/app/javascript/dashboard/i18n/locale/el/integrations.json
index 20bc34e42..5bff0d351 100644
--- a/app/javascript/dashboard/i18n/locale/el/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/el/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Όχι, Κράτησε τον/την"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Διαγραφή",
+      "API": {
+        "SUCCESS_MESSAGE": "Η ενοποίηση διαγράφηκε επιτυχώς"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Σύνδεση"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
new file mode 100644
index 000000000..a6bb56165
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/el/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Ετικέτες",
+    "HEADER_BTN_TXT": "Προσθήκη Ετικέτας",
+    "LOADING": "Λήψη ετικετών",
+    "SEARCH_404": "Δεν υπάρχουν αντικείμενα να ταιριάζουν με αυτό το ερώτημα",
+    "SIDEBAR_TXT": "<p><b>Ετικέτες</b> <p>Οι ετικέτες βοηθούν στην κατηγοριοποίηση των συνομιλιών, και στην απόδοση προτεραιότητας. Μπορείτε να προσθέσετε ετικέτες από το πλευρικό μενού.. <br /><br />Οι Ετικέτες είναι συνδεδεμένες με τον λογαριασμό Οι ετικέτες συνδέονται με τον λογαριασμό και μπορούν να χρησιμοποιηθούν για τη δημιουργία προσαρμοσμένων ροών εργασίας στον οργανισμό σας. Μπορείτε να αντιστοιχίσετε χρώμα σε μια ετικέτα, διευκολύνοντας τον προσδιορισμό της. Μπορείτε επίσης να εμφανίσετε την ετικέτα στην πλευρική γραμμή για να φιλτράρετε εύκολα τις συνομιλίες.</p>",
+    "LIST": {
+      "404": "Δεν υπάρχουν ετικέτες διαθέσιμες σε αυτόν τον λογαριασμό.",
+      "TITLE": "Διαχείριση Ετικετών",
+      "DESC": "Οι ετικέτες σάς επιτρέπουν να ομαδοποιήσετε τις συνομιλίες.",
+      "TABLE_HEADER": [
+        "Όνομα",
+        "Περιγραφή",
+        "Χρώμα"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Όνομα Ετικέτας",
+        "PLACEHOLDER": "Όνομα ετικέτας",
+        "ERROR": "Το Όνομα Ετικέτας είναι απαραίτητο"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Περιγραφή",
+        "PLACEHOLDER": "Περιγραφή Ετικέτας"
+      },
+      "COLOR": {
+        "LABEL": "Χρώμα"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Εμφάνιση ετικέτας στο πλευρικό μενού"
+      },
+      "EDIT": "Επεξεργασία",
+      "CREATE": "Δημιουργία",
+      "DELETE": "Διαγραφή",
+      "CANCEL": "Άκυρο"
+    },
+    "ADD": {
+      "TITLE": "Προσθήκη Ετικέτας",
+      "DESC": "Οι ετικέτες σάς επιτρέπουν να ομαδοποιήσετε τις συνομιλίες.",
+      "API": {
+        "SUCCESS_MESSAGE": "Η ετικέτα προστέθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Επεξεργασία ετικέτας",
+      "API": {
+        "SUCCESS_MESSAGE": "Η ετικέτα ενημερώθηκε επιτυχώς",
+        "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Διαγραφή",
+      "API": {
+        "SUCCESS_MESSAGE": "Η ετικέτα διαγράφηκε επιτυχώς",
+        "ERROR_MESSAGE": "Υπήρξε ένα σφάλμα, παρακαλώ προσπαθήστε ξανά"
+      },
+      "CONFIRM": {
+        "TITLE": "Επιβεβαίωση Διαγραφής",
+        "MESSAGE": "Είσαστε σίγουροι για την διαγραφή ",
+        "YES": "Ναι, Διέγραψε το ",
+        "NO": "Όχι, Κράτησε τον/την"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/el/settings.json b/app/javascript/dashboard/i18n/locale/el/settings.json
index 1af3e5b01..6a1c1e9ae 100644
--- a/app/javascript/dashboard/i18n/locale/el/settings.json
+++ b/app/javascript/dashboard/i18n/locale/el/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Παρακαλώ εισάγετε ένα έγκυρο όνομα",
         "PLACEHOLDER": "Εισάγετε το Ονοματεπώνυμο σας, όπως θα εμφανίζεται στις συνομιλίες σας"
       },
+      "AVAILABILITY": {
+        "LABEL": "Διαθεσιμότητα",
+        "STATUSES_LIST": [
+          {
+            "value": "στη γραμμή",
+            "label": "Στην Γραμμή"
+          },
+          {
+            "value": "απασχολημένος",
+            "label": "Απασχολημένος"
+          },
+          {
+            "value": "εκτός",
+            "label": "Εκτός"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Η διεύθυνση email",
         "ERROR": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση email",
@@ -103,6 +120,7 @@
     "INBOXES": "Κιβώτια Εισερχομένων",
     "CANNED_RESPONSES": "Έτοιμες Απαντήσεις",
     "INTEGRATIONS": "Ενοποιήσεις",
-    "ACCOUNT_SETTINGS": "Ρυθμίσεις Λογαριασμού"
+    "ACCOUNT_SETTINGS": "Ρυθμίσεις Λογαριασμού",
+    "LABELS": "Ετικέτες"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
index b63680219..2b629a647 100644
--- a/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agentes",
     "HEADER_BTN_TXT": "Añadir agente",
     "LOADING": "Se están listando los agentes",
-    "SIDEBAR_TXT": "<p><b>Agentes</b></p> <p> Un <b>Agente</b> es miembro de su equipo de Atención al Cliente. </p><p> Los agentes podrán ver y responder a los mensajes de sus usuarios. La lista muestra todos los agentes actualmente en su cuenta. </p><p> Haga clic en <b>Añadir agente</b> para añadir un nuevo agente. Agente que añadas recibirá un correo electrónico con un enlace de confirmación para activar su cuenta, después de lo cual pueden acceder a Chatwoot y responder a los mensajes. </p><p> El acceso a las características de Chatwoot se basa en los siguientes roles. </p><p> <b>Agente</b> - Los agentes con este rol sólo pueden acceder a bandejas, informes y conversaciones. Pueden asignar conversaciones a otros agentes o a sí mismos y resolver conversaciones.</p><p> <b>Administrador</b> - El administrador tendrá acceso a todas las características de Chatwoot habilitadas para su cuenta, incluyendo configuración y facturación, junto con todos los privilegios de los agentes normales.</p>",
+    "SIDEBAR_TXT": "<p><b>Agentes</b></p> <p> Un <b>Agente</b> es miembro de su equipo de Atención al Cliente. </p><p> Los agentes podrán ver y responder a los mensajes de sus usuarios. La lista muestra todos los agentes actualmente en tu cuenta. </p><p> Haga clic en <b>Añadir agente</b> para añadir un nuevo agente. El agente que añadas recibirá un correo electrónico con un enlace de confirmación para activar su cuenta, después de lo cual podrá acceder a Chatwoot y responder a los mensajes. </p><p> El acceso a las características de Chatwoot se basa en los siguientes roles. </p><p> <b>Agente</b> - Los agentes con este rol solamente pueden acceder a bandejas, informes y conversaciones. Pueden asignar conversaciones a otros agentes o a sí mismos y resolver conversaciones.</p><p> <b>Administrador</b> - El administrador tendrá acceso a todas las características de Chatwoot habilitadas para su cuenta, incluyendo configuración y facturación, junto con todos los privilegios de los agentes normales.</p>",
     "AGENT_TYPES": [
       {
         "name": "administrator",
diff --git a/app/javascript/dashboard/i18n/locale/es/contact.json b/app/javascript/dashboard/i18n/locale/es/contact.json
index 14c4e9dd3..dc3be4cfa 100644
--- a/app/javascript/dashboard/i18n/locale/es/contact.json
+++ b/app/javascript/dashboard/i18n/locale/es/contact.json
@@ -11,11 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etiquetas de conversación",
-      "UPDATE_BUTTON": "Actualizar etiquetas",
-      "UPDATE_ERROR": "No se pudo actualizar las etiquetas, inténtelo de nuevo.",
-      "TAG_PLACEHOLDER": "Añadir nueva etiqueta",
-      "PLACEHOLDER": "Buscar o añadir una etiqueta"
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
     },
-    "MUTE_CONTACT": "Silenciar contacto"
+    "MUTE_CONTACT": "Silenciar contacto",
+    "EDIT_LABEL": "Editar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/generalSettings.json b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
index d33bc4630..06ea3b6ab 100644
--- a/app/javascript/dashboard/i18n/locale/es/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/es/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Configuración de la cuenta",
     "SUBMIT": "Actualizar ajustes",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "No se pudo actualizar la configuración, ¡inténtalo de nuevo!",
       "SUCCESS": "Configuración de cuenta actualizada correctamente"
diff --git a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
index 9c19709d2..b722e3ace 100644
--- a/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/es/inboxMgmt.json
@@ -64,9 +64,15 @@
           "PLACEHOLDER": "Facilitamos la conexión con nosotros. Pídanos cualquier cosa o comparte tus comentarios."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Mensaje de Agentes Ausentes",
+          "LABEL": "Mensaje de bienvenida del canal",
           "PLACEHOLDER": "Acme Inc normalmente responde en unas pocas horas."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Habilitar bienvenida al canal",
+          "HELP_TEXT": "Enviar un mensaje de bienvenida al usuario cuando inicie la conversación.",
+          "ENABLED": "Activado",
+          "DISABLED": "Deshabilitado"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Color del widget",
           "PLACEHOLDER": "Actualizar el color del widget usado en el widget"
diff --git a/app/javascript/dashboard/i18n/locale/es/integrations.json b/app/javascript/dashboard/i18n/locale/es/integrations.json
index 8a2d42d64..a66e5fc25 100644
--- a/app/javascript/dashboard/i18n/locale/es/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/es/integrations.json
@@ -49,6 +49,15 @@
           "NO": "No, mantenerlo"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Eliminar",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
new file mode 100644
index 000000000..3a9d38562
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/es/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "No hay elementos que coincidan con esta consulta",
+    "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": [
+        "Nombre",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Editar",
+      "CREATE": "Create",
+      "DELETE": "Eliminar",
+      "CANCEL": "Cancelar"
+    },
+    "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": "Eliminar",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirmar eliminación",
+        "MESSAGE": "¿Está seguro de eliminar ",
+        "YES": "Sí, eliminar ",
+        "NO": "No, mantenerlo "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/es/settings.json b/app/javascript/dashboard/i18n/locale/es/settings.json
index 0833a8f34..6f2cc0704 100644
--- a/app/javascript/dashboard/i18n/locale/es/settings.json
+++ b/app/javascript/dashboard/i18n/locale/es/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Por favor, introduzca un nombre válido",
         "PLACEHOLDER": "Por favor, introduzca su nombre, esto se mostrará en las conversaciones"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Tu dirección de correo",
         "ERROR": "Por favor, introduzca una dirección de correo válida",
@@ -103,6 +120,7 @@
     "INBOXES": "Entradas",
     "CANNED_RESPONSES": "Respuestas predefinidas",
     "INTEGRATIONS": "Integraciones",
-    "ACCOUNT_SETTINGS": "Configuración de la cuenta"
+    "ACCOUNT_SETTINGS": "Configuración de la cuenta",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/fi/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/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 shortcode",
+          "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/fi/chatlist.json b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/contact.json b/app/javascript/dashboard/i18n/locale/fi/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/conversation.json b/app/javascript/dashboard/i18n/locale/fi/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/generalSettings.json b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/index.js b/app/javascript/dashboard/i18n/locale/fi/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/fi/integrations.json b/app/javascript/dashboard/i18n/locale/fi/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/fi/login.json b/app/javascript/dashboard/i18n/locale/fi/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/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/fi/report.json b/app/javascript/dashboard/i18n/locale/fi/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/resetPassword.json b/app/javascript/dashboard/i18n/locale/fi/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/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/fi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/settings.json b/app/javascript/dashboard/i18n/locale/fi/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/signup.json b/app/javascript/dashboard/i18n/locale/fi/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fi/webhooks.json b/app/javascript/dashboard/i18n/locale/fi/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fi/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
index aefc9be58..6543ced23 100644
--- a/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/agentMgmt.json
@@ -3,10 +3,10 @@
     "HEADER": "Agents",
     "HEADER_BTN_TXT": "Ajouter un agent",
     "LOADING": "Récupération de la liste des agents",
-    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>agent</b> est un membre de votre équipe d'assistance clientèle. </p><p> Les agents pourront voir et répondre aux messages de vos utilisateurs. La liste montre tous les agents actuellement dans votre compte. </p><p> Cliquez sur <b>Ajouter un agent</b> pour ajouter un nouvel agent. L'agent que vous ajoutez recevra un courriel avec un lien de confirmation pour activer son compte, après quoi il pourra accéder à Chatwoot et répondre aux messages. </p><p> L'accès aux fonctionnalités de Chatwoot est basé sur les rôles suivants. </p><p> <b>Agent</b> - Les agents ayant ce rôle ne peuvent accéder qu'aux boîtes de réception, aux rapports et aux conversations. Ils peuvent assigner des conversations à d'autres agents ou eux-mêmes et résoudre des conversations.</p><p> <b>Administrateur</b> - Administrateur aura accès à toutes les fonctionnalités de Chatwoot activées pour votre compte, y compris les paramètres et la facturation, ainsi que tous les privilèges d'un agent normal.</p>",
+    "SIDEBAR_TXT": "<p><b>Agents</b></p> <p> Un <b>agent</b> est un membre de votre équipe d'assistance clientèle. </p><p> Les agents pourront voir et répondre aux messages de vos utilisateurs. La liste montre tous les agents actuellement dans votre compte. </p><p> Cliquez sur <b>Ajouter un agent</b> pour ajouter un nouvel agent. L'agent que vous ajoutez recevra un courriel avec un lien de confirmation pour activer son compte, après quoi il pourra accéder à Chatwoot et répondre aux messages. </p><p> L'accès aux fonctionnalités de Chatwoot est basé sur les rôles suivants. </p><p> <b>Agent</b> - Les agents ayant ce rôle ne peuvent accéder qu'aux boîtes de réception, aux rapports et aux conversations. Ils peuvent assigner des conversations à d'autres agents ou eux-mêmes et résoudre des conversations.</p><p> <b>Administrateur</b> - Administrateur aura accès à toutes les fonctionnalités de Chatwoot activées pour votre compte, y compris les paramètres, ainsi que tous les privilèges d'un agent normal.</p>",
     "AGENT_TYPES": [
       {
-        "name": "administrator",
+        "name": "administrateur",
         "label": "Administrateur"
       },
       {
diff --git a/app/javascript/dashboard/i18n/locale/fr/contact.json b/app/javascript/dashboard/i18n/locale/fr/contact.json
index 2b3ff41b9..6c23d57b2 100644
--- a/app/javascript/dashboard/i18n/locale/fr/contact.json
+++ b/app/javascript/dashboard/i18n/locale/fr/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Étiquettes de conversation",
-      "UPDATE_BUTTON": "Mettre à jour les étiquettes",
-      "UPDATE_ERROR": "Impossible de mettre à jour les étiquettes. Veuillez réessayer.",
-      "TAG_PLACEHOLDER": "Ajouter une nouvelle étiquette",
-      "PLACEHOLDER": "Rechercher ou ajouter une étiquette"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Impossible de mettre à jour les étiquettes. Veuillez réessayer."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mettre en sourdine le contact",
+    "EDIT_LABEL": "Modifier"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
index a9f86dd8f..134161fe9 100644
--- a/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Paramètres du compte",
     "SUBMIT": "Mettre à jour les paramètres",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Impossible de mettre à jour les paramètres, essayez à nouveau !",
       "SUCCESS": "Paramètres du compte mis à jour avec succès"
diff --git a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
index 48bf6f51c..9511f47d8 100644
--- a/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/fr/inboxMgmt.json
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS : En vous connectant, nous avons seulement accès aux messages de votre page. Vos messages privés ne peuvent jamais être consultés par Chatwoot."
+        "HELP": "PS : En vous connectant, nous avons seulement accès aux messages de votre page. Vos messages privés ne peuvent jamais être consultés par Chatwoot.",
+        "CHOOSE_PAGE": "Choisir la page",
+        "CHOOSE_PLACEHOLDER": "Sélectionnez une page dans la liste",
+        "INBOX_NAME": "Nom de la boîte de réception",
+        "ADD_NAME": "Ajouter un nom pour votre boîte de réception",
+        "PICK_NAME": "Choisissez un nom pour votre boîte de réception",
+        "PICK_A_VALUE": "Choisir une valeur"
       },
       "TWITTER": {
         "HELP": "Pour ajouter votre profil Twitter en tant que canal, vous devez lier votre profil Twitter en cliquant sur 'Se connecter avec Twitter' "
@@ -38,6 +44,9 @@
         "TITLE": "Canal site Web",
         "DESC": "Créez un canal pour votre site Web et commencez à assister vos clients à l'aide de notre widget de site Web.",
         "LOADING_MESSAGE": "Création du canal de support du site Web",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Avatar du canal"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Nom du site Web",
           "PLACEHOLDER": "Entrez le nom de votre site Web (ex : Acme Inc)"
@@ -55,9 +64,15 @@
           "PLACEHOLDER": "C'est simple de rentrer en contact avec nous. Demandez-nous quoi que ce soit ou partagez vos commentaires."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Message lorsque les agents sont absents",
+          "LABEL": "Channel greeting message",
           "PLACEHOLDER": "Acme Inc répond en général en quelques heures."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "ENABLED": "Activé",
+          "DISABLED": "Désactivé"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Couleur du Widget",
           "PLACEHOLDER": "Mettre à jour la couleur utilisée dans le widget"
@@ -153,7 +168,7 @@
         "TITLE": "Confirmer la suppression",
         "MESSAGE": "Êtes-vous sûr de vouloir supprimer ",
         "YES": "Oui, supprimer ",
-        "NO": "Non, conservez-le "
+        "NO": "Non, Conserver "
       },
       "API": {
         "SUCCESS_MESSAGE": "Boîte de réception supprimée avec succès",
diff --git a/app/javascript/dashboard/i18n/locale/fr/integrations.json b/app/javascript/dashboard/i18n/locale/fr/integrations.json
index 966cd70e0..13448377a 100644
--- a/app/javascript/dashboard/i18n/locale/fr/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/fr/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Non, conservez-le"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Supprimer",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
new file mode 100644
index 000000000..15ae99dfb
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/fr/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Il n'y a aucun élément correspondant à cette requête",
+    "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": [
+        "Nom",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Modifier",
+      "CREATE": "Create",
+      "DELETE": "Supprimer",
+      "CANCEL": "Annuler"
+    },
+    "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": "Supprimer",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirmer la suppression",
+        "MESSAGE": "Êtes-vous sûr de vouloir supprimer ",
+        "YES": "Oui, supprimer ",
+        "NO": "Non, Conserver "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/fr/settings.json b/app/javascript/dashboard/i18n/locale/fr/settings.json
index ba7d64d0b..214e9e336 100644
--- a/app/javascript/dashboard/i18n/locale/fr/settings.json
+++ b/app/javascript/dashboard/i18n/locale/fr/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Veuillez entrer un nom valide",
         "PLACEHOLDER": "Veuillez entrer votre nom, cela sera affiché dans les conversations"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Votre adresse de courriel",
         "ERROR": "Veuillez saisir une adresse de courriel valide",
@@ -103,6 +120,7 @@
     "INBOXES": "Boîtes de réception",
     "CANNED_RESPONSES": "Réponses standardisées",
     "INTEGRATIONS": "Intégrations",
-    "ACCOUNT_SETTINGS": "Paramètres du compte"
+    "ACCOUNT_SETTINGS": "Paramètres du compte",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hi/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/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 shortcode",
+          "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/hi/chatlist.json b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/contact.json b/app/javascript/dashboard/i18n/locale/hi/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/conversation.json b/app/javascript/dashboard/i18n/locale/hi/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/generalSettings.json b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/index.js b/app/javascript/dashboard/i18n/locale/hi/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/hi/integrations.json b/app/javascript/dashboard/i18n/locale/hi/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/hi/login.json b/app/javascript/dashboard/i18n/locale/hi/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/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/hi/report.json b/app/javascript/dashboard/i18n/locale/hi/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/resetPassword.json b/app/javascript/dashboard/i18n/locale/hi/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/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/hi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/settings.json b/app/javascript/dashboard/i18n/locale/hi/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/signup.json b/app/javascript/dashboard/i18n/locale/hi/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hi/webhooks.json b/app/javascript/dashboard/i18n/locale/hi/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hi/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/hu/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/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 shortcode",
+          "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/hu/chatlist.json b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/contact.json b/app/javascript/dashboard/i18n/locale/hu/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/conversation.json b/app/javascript/dashboard/i18n/locale/hu/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/generalSettings.json b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/index.js b/app/javascript/dashboard/i18n/locale/hu/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/hu/integrations.json b/app/javascript/dashboard/i18n/locale/hu/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/hu/login.json b/app/javascript/dashboard/i18n/locale/hu/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/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/hu/report.json b/app/javascript/dashboard/i18n/locale/hu/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/resetPassword.json b/app/javascript/dashboard/i18n/locale/hu/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/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/hu/setNewPassword.json b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/settings.json b/app/javascript/dashboard/i18n/locale/hu/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/signup.json b/app/javascript/dashboard/i18n/locale/hu/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/hu/webhooks.json b/app/javascript/dashboard/i18n/locale/hu/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/hu/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
index adf4da548..77c8bc768 100644
--- a/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenti",
     "HEADER_BTN_TXT": "Aggiungi Agente",
     "LOADING": "Recupero elenco Operatori",
-    "SIDEBAR_TXT": "<p><b>Agenti</b></p> <p> Un <b>Agente</b> è membro del tuo team di Assistenza. </p><p> Gli agenti saranno in grado di visualizzare e rispondere ai messaggi dei tuoi utenti. L'elenco mostra tutti gli agenti attualmente presenti nel tuo account. </p><p> Clicca su <b>Aggiungi Agente</b> per aggiungere un nuovo agente. L'operatore che aggiungi riceverà un'email con un link di conferma per attivare il proprio account, dopo di che potranno accedere a Chatwoot e rispondere ai messaggi. </p><p> Accesso alle funzionalità di Chatwoot, sono basate sui seguenti ruoli. </p><p> <b>Agente</b> - Gli agenti con questo ruolo possono accedere solo a caselle, segnalazioni e conversazioni. Possono assegnare conversazioni ad altri agenti o a se stessi e risolvere le conversazioni.</p><p> <b>Amministratore</b> - L'amministratore avrà accesso a tutte le funzionalità di Chatwoot abilitate per il tuo account, incluse impostazioni e fatturazione, insieme a tutti i privilegi dei normali agenti.</p>",
+    "SIDEBAR_TXT": "<p><b>Agenti</b></p> <p> Un <b>agente</b> è membro del tuo team di assistenza clienti. </p><p> Gli agenti saranno in grado di visualizzare e rispondere ai messaggi dei tuoi utenti. L'elenco mostra tutti gli agenti attualmente presenti nel tuo account. </p><p> Clicca su <b>Aggiungi agente</b> per aggiungere un nuovo agente. Ogni agente che aggiungi riceverà un'email con un link di conferma per attivare il loro account, dopo di che possono accedere a Chatwoot e rispondere ai messaggi. </p><p> L'accesso alle funzionalità di Chatwoot si basa sui seguenti ruoli. </p><p> <b>Agente</b> - Gli agenti con questo ruolo possono accedere solo a messaggi, report e conversazioni. Possono assegnare conversazioni ad altri agenti o a se stessi e risolvere le conversazioni.</p><p> <b>Amministratore</b> - L'amministratore avrà accesso a tutte le funzionalità di Chatwoot abilitate per il tuo account, comprese le impostazioni, insieme a tutti i privilegi di un agente normale.</p>",
     "AGENT_TYPES": [
       {
         "name": "amministratore",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Aggiungi agente al tuo team",
       "DESC": "Puoi aggiungere persone che saranno in grado di gestire il supporto per le tue caselle.",
+      "CANCEL_BUTTON_TEXT": "annulla",
       "FORM": {
         "NAME": {
           "LABEL": "Nome dell'Agente",
@@ -60,7 +61,7 @@
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina ",
-        "NO": "No, mantienilo "
+        "NO": "No, Conserva "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
index 54a48e272..3f44361c0 100644
--- a/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/it/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Aggiungi risposta predefinita",
       "DESC": "Le risposte predefinite sono modelli di risposta salvati che possono essere utilizzati per inviare rapidamente una risposta alla conversazione.",
+      "CANCEL_BUTTON_TEXT": "annulla",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Codice Breve",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Modifica risposta predefinita",
+      "CANCEL_BUTTON_TEXT": "annulla",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Codice Breve",
@@ -67,7 +69,7 @@
         "TITLE": "Conferma eliminazione",
         "MESSAGE": "Sei sicuro di voler eliminare ",
         "YES": "Sì, elimina ",
-        "NO": "No, mantienilo "
+        "NO": "No, Conserva "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/it/contact.json b/app/javascript/dashboard/i18n/locale/it/contact.json
index 24f1465e0..6a6920584 100644
--- a/app/javascript/dashboard/i18n/locale/it/contact.json
+++ b/app/javascript/dashboard/i18n/locale/it/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etichette conversazione",
-      "UPDATE_BUTTON": "Aggiorna etichette",
-      "UPDATE_ERROR": "Impossibile aggiornare le etichette, riprova.",
-      "TAG_PLACEHOLDER": "Aggiungi nuova etichetta",
-      "PLACEHOLDER": "Cerca o aggiungi un'etichetta"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Silenzia Contatto",
+    "EDIT_LABEL": "Modifica"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/generalSettings.json b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
new file mode 100644
index 000000000..5ebfaec38
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Impostazioni dell'account",
+    "SUBMIT": "Aggiorna impostazioni",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Impossibile aggiornare le impostazioni, riprova!",
+      "SUCCESS": "Impostazioni account aggiornate con successo"
+    },
+    "FORM": {
+      "ERROR": "Correggi gli errori del modulo",
+      "GENERAL_SECTION": {
+        "TITLE": "Impostazioni generali",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "Nome del conto",
+        "PLACEHOLDER": "Nome del tuo account",
+        "ERROR": "Inserisci un nome di conto valido"
+      },
+      "LANGUAGE": {
+        "LABEL": "Lingua del sito (Beta)",
+        "PLACEHOLDER": "Nome del tuo account",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Dominio",
+        "PLACEHOLDER": "Dominio del tuo sito",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "E-mail di supporto",
+        "PLACEHOLDER": "E-mail di supporto della tua azienda",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Abilita e-mail di dominio",
+        "PLACEHOLDER": "Abilita l'email di dominio personalizzata",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Abilitato",
+          "DISABLED": "Disabilitato"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
new file mode 100644
index 000000000..9c0a89202
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Posta",
+    "SIDEBAR_TXT": "<p><b>Posta in arrivo</b></p> <p> Quando colleghi un sito web o una pagina facebook a Chatwoot, si chiama <b>Posta in arrivo</b>. Puoi avere caselle di posta illimitate nel tuo account Chatwoot. </p><p> Clicca su <b>Aggiungi Posta in arrivo</b> per collegare un sito web o una pagina Facebook. </p><p> Nella Dashboard, puoi vedere tutte le conversazioni da tutte le tue caselle di posta in un unico posto e rispondere ad esse nella scheda `Conversazioni`. </p><p> È anche possibile visualizzare le conversazioni specifiche di una casella di posta in arrivo facendo clic sul nome della casella di posta in arrivo nel riquadro sinistro del cruscotto. </p>",
+    "LIST": {
+      "404": "Non ci sono caselle allegate a questo account."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Scegli il canale",
+        "route": "Nuovo",
+        "body": "Scegli il provider che vuoi integrare con Chatwoot."
+      },
+      {
+        "title": "Crea Inbox",
+        "route": "Canale",
+        "body": "Autenticare il tuo account e creare una casella di posta."
+      },
+      {
+        "title": "Aggiungi Agenti",
+        "route": "Inboxes_add_agenti",
+        "body": "Aggiungi agenti alla casella di posta creata."
+      },
+      {
+        "title": "Voila!",
+        "route": "Finitura",
+        "body": "Sei pronto per iniziare!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "PS: Accedendo, abbiamo accesso solo ai messaggi della tua pagina. Chatwoot, non potrà accedere ai tuoi messaggi privati.",
+        "CHOOSE_PAGE": "Scegli una Pagina",
+        "CHOOSE_PLACEHOLDER": "Seleziona una pagina dalla lista",
+        "INBOX_NAME": "Nome Posta In Arrivo",
+        "ADD_NAME": "Aggiungi un nome per la tua casella di posta in arrivo",
+        "PICK_NAME": "Scegli un nome per la tua casella di posta in arrivo",
+        "PICK_A_VALUE": "Scegli un valore"
+      },
+      "TWITTER": {
+        "HELP": "Per aggiungere il tuo profilo Twitter come canale, devi autenticare il tuo profilo Twitter cliccando su 'Accedi con Twitter' "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Canale sito web",
+        "DESC": "Crea un canale per il tuo sito web ed inizia a sostenere i tuoi clienti tramite il nostro widget per siti web.",
+        "LOADING_MESSAGE": "Creazione del Canale di Supporto Sito Web",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Avatar del canale"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Nome Sito Web",
+          "PLACEHOLDER": "Inserisci il nome del tuo sito web (es: Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Dominio del Sito",
+          "PLACEHOLDER": "Inserisci il dominio del tuo sito web (es: acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Intestazione di benvenuto",
+          "PLACEHOLDER": "Ciao!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Titolo di benvenuto",
+          "PLACEHOLDER": "Rendiamo semplice connetterci con noi. Chiedete qualsiasi cosa o condividete il vostro feedback."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "Messaggio di saluto del canale",
+          "PLACEHOLDER": "Acme Inc, in genere, risponde in poche ore."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Abilita messaggio di benvenuto sul canale",
+          "HELP_TEXT": "Invia un messaggio di saluto all'utente quando inizia la conversazione.",
+          "ENABLED": "Abilitato",
+          "DISABLED": "Disabilitato"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Colore del widget",
+          "PLACEHOLDER": "Aggiorna il colore del widget utilizzato nel widget"
+        },
+        "SUBMIT_BUTTON": "Crea posta in arrivo"
+      },
+      "TWILIO": {
+        "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",
+          "ERROR": "Questo campo è obbligatorio"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Tipo di canale",
+          "ERROR": "Seleziona il tipo di canale"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Token di autenticazione",
+          "PLACEHOLDER": "Inserisci il tuo Token Autenticazione Twilio",
+          "ERROR": "Questo campo è obbligatorio"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Nome canale",
+          "PLACEHOLDER": "Inserisci un nome del canale",
+          "ERROR": "Questo campo è obbligatorio"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Numero di telefono",
+          "PLACEHOLDER": "Inserisci il numero di telefono dal quale verrà inviato il messaggio.",
+          "ERROR": "Inserisci un valore valido. Il numero di telefono dovrebbe iniziare con segno `+`."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "È necessario configurare l'URL di callback del messaggio in Twilio con l'URL menzionato qui."
+        },
+        "SUBMIT_BUTTON": "Crea un canale Twilio",
+        "API": {
+          "ERROR_MESSAGE": "Non siamo stati in grado di autenticare le credenziali di Twilio, riprova"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Canali",
+        "DESC": "Attualmente supportiamo come piattaforme i widget della chat dal vivo del sito, le pagine Facebook e Twitter. Abbiamo più piattaforme come Whatsapp, Email, Telegram e Line nei lavori, che saranno disponibili a breve."
+      },
+      "AGENTS": {
+        "TITLE": "Agenti",
+        "DESC": "Qui puoi aggiungere agenti per gestire la tua posta in arrivo appena creata. Solo questi agenti selezionati avranno accesso alla tua casella di posta. Gli operatori che non fanno parte di questa casella di posta non saranno in grado di vedere o rispondere ai messaggi in questa casella di posta quando effettuano il login. <br> <b>PS:</b> come amministratore, se hai bisogno di accedere a tutte le caselle di posta in arrivo, dovresti aggiungerti come agente a tutte le caselle di entrata che crei."
+      },
+      "DETAILS": {
+        "TITLE": "Dettagli Inbox",
+        "DESC": "Dal menu a tendina sotto, seleziona la pagina Facebook che vuoi collegare a Chatwoot. Puoi anche assegnare un nome personalizzato alla tua posta in arrivo per una migliore identificazione."
+      },
+      "FINISH": {
+        "TITLE": "Lo Chioda!",
+        "DESC": "Hai completato con successo l'integrazione della tua pagina Facebook con il Chatwoot. La prossima volta che un cliente invia un messaggio alla tua pagina, la conversazione apparirà automaticamente nella tua casella di posta.<br>Ti forniamo anche uno script per widget che puoi facilmente aggiungere al tuo sito web. Una volta dal vivo sul tuo sito web, i clienti possono inviarti messaggi direttamente dal tuo sito web senza l'aiuto di alcuno strumento esterno e la conversazione apparirà proprio qui, su Chatwoot.<br>Bello, eh? Beh, cerchiamo di essere :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Autenticazione con Facebook...",
+      "ERROR_FB_AUTH": "Qualcosa è andato storto, per favore aggiorna la pagina...",
+      "CREATING_CHANNEL": "Creazione della posta in arrivo...",
+      "TITLE": "Configura dettagli posta in arrivo",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Aggiungi agenti",
+      "ADD_AGENTS": "Aggiunta di agenti alla tua posta in arrivo..."
+    },
+    "FINISH": {
+      "TITLE": "La posta in arrivo è pronta!",
+      "MESSAGE": "Ora puoi interagire con i tuoi clienti attraverso il nuovo canale. Buona assistenza ",
+      "BUTTON_TEXT": "Portami lì",
+      "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 di posta."
+    },
+    "REAUTH": "Riautorizza",
+    "VIEW": "Visualizza",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Impostazioni di Posta in arrivo, aggiornate con successo",
+        "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Cancellare",
+      "CONFIRM": {
+        "TITLE": "Conferma eliminazione",
+        "MESSAGE": "Sei sicuro di voler eliminare ",
+        "YES": "Sì, elimina ",
+        "NO": "No, Conserva "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox eliminato con successo",
+        "ERROR_MESSAGE": "Impossibile eliminare la posta in arrivo. Riprova più tardi."
+      }
+    },
+    "SETTINGS": "Impostazioni",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Script Messenger",
+      "MESSENGER_SUB_HEAD": "Posiziona questo pulsante all'interno del tuo tag",
+      "INBOX_AGENTS": "Agenti",
+      "INBOX_AGENTS_SUB_TEXT": "Aggiungi o rimuovi agenti da questa casella di posta",
+      "UPDATE": "Aggiornamento",
+      "AUTO_ASSIGNMENT": "Abilita assegnazione automatica",
+      "INBOX_UPDATE_TITLE": "Impostazioni della Posta In Arrivo",
+      "INBOX_UPDATE_SUB_TEXT": "Aggiorna le impostazioni della posta in arrivo",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Abilita o disabilita l'assegnazione automatica di nuove conversazioni agli agenti aggiunti a questa casella di posta."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/index.js b/app/javascript/dashboard/i18n/locale/it/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/it/integrations.json b/app/javascript/dashboard/i18n/locale/it/integrations.json
index e651e1163..080869fd1 100644
--- a/app/javascript/dashboard/i18n/locale/it/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/it/integrations.json
@@ -46,9 +46,18 @@
           "TITLE": "Conferma eliminazione",
           "MESSAGE": "Sei sicuro di voler eliminare ",
           "YES": "Sì, elimina ",
-          "NO": "No, mantienilo "
+          "NO": "No, Conserva"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Cancellare",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
new file mode 100644
index 000000000..ca917b832
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Non ci sono elementi che corrispondono a questa richiesta",
+    "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": [
+        "nome",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Modifica",
+      "CREATE": "Create",
+      "DELETE": "Cancellare",
+      "CANCEL": "annulla"
+    },
+    "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": "Cancellare",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Conferma eliminazione",
+        "MESSAGE": "Sei sicuro di voler eliminare ",
+        "YES": "Sì, elimina ",
+        "NO": "No, Conserva "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/login.json b/app/javascript/dashboard/i18n/locale/it/login.json
new file mode 100644
index 000000000..46fb0e367
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Accedi a Chatwoot",
+    "EMAIL": {
+      "LABEL": "email",
+      "PLACEHOLDER": "E-mail es.: qualcuno@esempio.com"
+    },
+    "PASSWORD": {
+      "LABEL": "password",
+      "PLACEHOLDER": "password"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Accesso riuscito",
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi",
+      "UNAUTH": "Nome utente / Password errati. Riprova"
+    },
+    "FORGOT_PASSWORD": "Password dimenticata?",
+    "CREATE_NEW_ACCOUNT": "Crea un nuovo account",
+    "SUBMIT": "Accedi"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/settings.json b/app/javascript/dashboard/i18n/locale/it/settings.json
new file mode 100644
index 000000000..69a5ef982
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Impostazioni profilo",
+    "TITLE": "Impostazioni profilo",
+    "BTN_TEXT": "Aggiorna Profilo",
+    "AFTER_EMAIL_CHANGED": "Il tuo profilo è stato aggiornato correttamente, effettua nuovamente il login quando le tue credenziali di accesso sono state modificate",
+    "FORM": {
+      "AVATAR": "Immagine del profilo",
+      "ERROR": "Correggi gli errori del modulo",
+      "REMOVE_IMAGE": "Rimuovi",
+      "UPLOAD_IMAGE": "Carica immagine",
+      "UPDATE_IMAGE": "Aggiorna immagine",
+      "PROFILE_SECTION": {
+        "TITLE": "Profilo",
+        "NOTE": "Il tuo indirizzo email è la tua identità e viene utilizzato per l'accesso."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "password",
+        "NOTE": "Aggiornare la tua password reimposterà i tuoi login in più dispositivi."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Token di accesso",
+        "NOTE": "Questo token può essere usato se stai costruendo un'integrazione basata su API"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Notifiche email",
+        "NOTE": "Aggiorna qui le tue preferenze di notifica email",
+        "CONVERSATION_ASSIGNMENT": "Invia notifiche via email quando viene assegnata una conversazione a me",
+        "CONVERSATION_CREATION": "Invia notifiche via email quando viene creata una nuova conversazione"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Le preferenze per le notifiche sono state aggiornate con successo",
+        "UPDATE_ERROR": "C'è stato un errore durante l'aggiornamento delle preferenze, si prega di riprovare"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "Notifiche Push",
+        "NOTE": "Aggiorna qui le tue preferenze di notifiche push",
+        "CONVERSATION_ASSIGNMENT": "Invia notifiche push quando una conversazione mi viene assegnata",
+        "CONVERSATION_CREATION": "Invia notifiche push quando una conversazione mi viene assegnata",
+        "HAS_ENABLED_PUSH": "Hai abilitato notifiche push per questo browser.",
+        "REQUEST_PUSH": "Abilita notifiche push"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Immagine del profilo"
+      },
+      "NAME": {
+        "LABEL": "Il tuo nome",
+        "ERROR": "Inserisci un nome valido",
+        "PLACEHOLDER": "Inserisci il tuo nome, questo verrà visualizzato nelle conversazioni"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Il tuo indirizzo email",
+        "ERROR": "Inserisci un indirizzo email valido",
+        "PLACEHOLDER": "Inserisci il tuo indirizzo email, che verrà visualizzato nelle conversazioni"
+      },
+      "PASSWORD": {
+        "LABEL": "password",
+        "ERROR": "Inserisci una password di lunghezza 6 o più",
+        "PLACEHOLDER": "Inserisci una nuova password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Conferma nuova password",
+        "ERROR": "La password di conferma deve corrispondere alla password",
+        "PLACEHOLDER": "Inserisci nuovamente la tua password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Cambia Profilo/Account",
+    "SELECTOR_SUBTITLE": "Seleziona un account dal seguente elenco",
+    "PROFILE_SETTINGS": "Impostazioni profilo",
+    "LOGOUT": "Disconnetti"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "giorni di prova rimanenti.",
+    "TRAIL_BUTTON": "Acquista Ora"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copia",
+      "COPY_SUCCESSFUL": "Codice copiato negli appunti con successo"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Scaricare",
+      "UPLOADING": "Caricamento..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Invia"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifica...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Aggiungi Posta In Arrivo"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversazioni",
+    "REPORTS": "Segnalazioni",
+    "SETTINGS": "Impostazioni",
+    "HOME": "Home",
+    "AGENTS": "Agenti",
+    "INBOXES": "Posta",
+    "CANNED_RESPONSES": "Risposte predefinite",
+    "INTEGRATIONS": "Integrazioni",
+    "ACCOUNT_SETTINGS": "Impostazioni Account",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/it/signup.json b/app/javascript/dashboard/i18n/locale/it/signup.json
new file mode 100644
index 000000000..9b082e1aa
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/it/signup.json
@@ -0,0 +1,32 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "Registra un account",
+    "TITLE": "Registrazione",
+    "TERMS_ACCEPT": "Registrandoti, accetti la nostra <a href=\"https://www.chatwoot.com/terms\">T & C</a> e <a href=\"https://www.chatwoot.com/privacy-policy\">informativa sulla privacy</a>",
+    "ACCOUNT_NAME": {
+      "LABEL": "Nome del conto",
+      "PLACEHOLDER": "Wayne Enterprises",
+      "ERROR": "Nome account troppo corto"
+    },
+    "EMAIL": {
+      "LABEL": "email",
+      "PLACEHOLDER": "bruce@wayne.imprese",
+      "ERROR": "Email non valida"
+    },
+    "PASSWORD": {
+      "LABEL": "password",
+      "PLACEHOLDER": "password",
+      "ERROR": "Password troppo corta"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Conferma Password",
+      "PLACEHOLDER": "Conferma Password",
+      "ERROR": "La password non corrisponde"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registrazione riuscita",
+      "ERROR_MESSAGE": "Impossibile connettersi al server Woot, riprova più tardi"
+    },
+    "SUBMIT": "Invia"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ja/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/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 shortcode",
+          "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/ja/chatlist.json b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/contact.json b/app/javascript/dashboard/i18n/locale/ja/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/conversation.json b/app/javascript/dashboard/i18n/locale/ja/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/generalSettings.json b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/index.js b/app/javascript/dashboard/i18n/locale/ja/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ja/integrations.json b/app/javascript/dashboard/i18n/locale/ja/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/ja/login.json b/app/javascript/dashboard/i18n/locale/ja/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/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/ja/report.json b/app/javascript/dashboard/i18n/locale/ja/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/resetPassword.json b/app/javascript/dashboard/i18n/locale/ja/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/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/ja/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/settings.json b/app/javascript/dashboard/i18n/locale/ja/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/signup.json b/app/javascript/dashboard/i18n/locale/ja/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ja/webhooks.json b/app/javascript/dashboard/i18n/locale/ja/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ja/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ko/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/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 shortcode",
+          "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/ko/chatlist.json b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/contact.json b/app/javascript/dashboard/i18n/locale/ko/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/conversation.json b/app/javascript/dashboard/i18n/locale/ko/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/generalSettings.json b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/index.js b/app/javascript/dashboard/i18n/locale/ko/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ko/integrations.json b/app/javascript/dashboard/i18n/locale/ko/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/ko/login.json b/app/javascript/dashboard/i18n/locale/ko/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/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/ko/report.json b/app/javascript/dashboard/i18n/locale/ko/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/resetPassword.json b/app/javascript/dashboard/i18n/locale/ko/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/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/ko/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/settings.json b/app/javascript/dashboard/i18n/locale/ko/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/signup.json b/app/javascript/dashboard/i18n/locale/ko/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ko/webhooks.json b/app/javascript/dashboard/i18n/locale/ko/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ko/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
index 34f19c9c3..a8dd6b127 100644
--- a/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "ഏജന്റുമാർ",
     "HEADER_BTN_TXT": "ഏജന്റിനെ ചേർക്കുക",
     "LOADING": "ഏജന്റ് പട്ടിക ലഭ്യമാക്കുന്നു",
-    "SIDEBAR_TXT": "<p><b>ഏജന്റുമാർ</b></p><p> ഒരു <b>ഏജൻറ്</b> നിങ്ങളുടെ ഉപഭോക്തൃ പിന്തുണാ ടീമിലെ ഒരു അംഗമാണ്. </p><p> ഏജന്റുമാർക്ക് നിങ്ങളുടെ ഉപയോക്താക്കളിൽ നിന്നുള്ള സന്ദേശങ്ങൾ കാണാനും മറുപടി നൽകാനും കഴിയും. നിങ്ങളുടെ അക്കൗണ്ടിലുള്ള എല്ലാ ഏജന്റുമാരെയും ഈ പട്ടിക കാണിക്കുന്നു. </ p> <p> ഒരു പുതിയ ഏജന്റിനെ ചേർക്കുന്നതിന് <b> ഏജന്റിനെ ചേർക്കുക </ b> ബട്ടൺ ക്ലിക്കുചെയ്യുക. നിങ്ങൾ ചേർത്ത ഏജന്റിന് അവരുടെ അക്കൗണ്ട് സജീവമാക്കുന്നതിന് ഒരു സ്ഥിരീകരണ ലിങ്കുള്ള ഇമെയിൽ ലഭിക്കും. അതിനുശേഷം അവർക്ക് ചാറ്റ് വൂട്ട് ആക്സസ് ചെയ്യാനും സന്ദേശങ്ങളോട് പ്രതികരിക്കാനും കഴിയും.</p> <p> ചാറ്റ് വൂട്ടിന്റെ സവിശേഷതകളിലേക്കുള്ള ആക്സസ് ഇനിപ്പറയുന്ന റോളുകളെ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. </p><p> <b>ഏജൻറ്</ b> - ഈ റോൾ‌ ഉള്ള ഏജന്റുമാർ‌ക്ക് ഇൻ‌ബോക്‍സുകൾ‌, റിപ്പോർ‌ട്ടുകൾ‌, സംഭാഷണങ്ങൾ‌ എന്നിവ മാത്രമേ ആക്‌സസ് ചെയ്യാൻ‌ കഴിയൂ. അവർക്ക് മറ്റ് ഏജന്റുമാരുടെയോ അല്ലെങ്കിൽ‌ തങ്ങളുടേയോ സംഭാഷണങ്ങൾ‌ നിർ‌ണ്ണയിക്കാനും സംഭാഷണങ്ങൾ‌ പരിഹരിക്കാനും കഴിയും.</p><p> <b>അഡ്മിനിസ്ട്രേറ്റർ</b> - ഒരു സാധാരണ ഏജന്റിന്റെ പ്രത്യേകാവകാശങ്ങളോടൊപ്പം ക്രമീകരണങ്ങളും ബില്ലിംഗും ഉൾപ്പെടെ നിങ്ങളുടെ അക്കൗണ്ടിൽ ലഭ്യമായ എല്ലാ ചാറ്റ് വൂട്ട് സവിശേഷതകളിലേക്കും ആക്‌സസ് ഉണ്ടായിരിക്കുക. </ p> ",
+    "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": [
       {
         "name": "അഡ്മിനിസ്‌ട്രേറ്റർ",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "നിങ്ങളുടെ ടീമിലേക്ക് ഏജന്റിനെ ചേർക്കുക",
       "DESC": "നിങ്ങളുടെ ഇൻ‌ബോക്സുകൾ‌ക്കുള്ള പിന്തുണ കൈകാര്യം ചെയ്യാൻ‌ കഴിയുന്ന ആളുകളെ നിങ്ങൾ‌ക്ക് ചേർ‌ക്കാൻ‌ കഴിയും.",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
       "FORM": {
         "NAME": {
           "LABEL": "ഏജന്റിന്റെ പേര്",
@@ -60,7 +61,7 @@
         "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
         "MESSAGE": "<p><b>ഏജന്റുമാർ</b></p><p> ഒരു <b>ഏജൻറ്</b> നിങ്ങളുടെ ഉപഭോക്തൃ പിന്തുണാ ടീമിലെ ഒരു അംഗമാണ്. </p><p> ഏജന്റുമാർക്ക് നിങ്ങളുടെ ഉപയോക്താക്കളിൽ നിന്നുള്ള സന്ദേശങ്ങൾ കാണാനും മറുപടി നൽകാനും കഴിയും. നിങ്ങളുടെ അക്കൗണ്ടിലുള്ള എല്ലാ ഏജന്റുമാരെയും ഈ പട്ടിക കാണിക്കുന്നു. </ p> <p> ഒരു പുതിയ ഏജന്റിനെ ചേർക്കുന്നതിന് <b> ഏജന്റിനെ ചേർക്കുക </ b> ബട്ടൺ ക്ലിക്കുചെയ്യുക. നിങ്ങൾ ചേർത്ത ഏജന്റിന് അവരുടെ അക്കൗണ്ട് സജീവമാക്കുന്നതിന് ഒരു സ്ഥിരീകരണ ലിങ്കുള്ള ഇമെയിൽ ലഭിക്കും. അതിനുശേഷം അവർക്ക് ചാറ്റ് വൂട്ട് ആക്സസ് ചെയ്യാനും സന്ദേശങ്ങളോട് പ്രതികരിക്കാനും കഴിയും.</p> <p> ചാറ്റ് വൂട്ടിന്റെ സവിശേഷതകളിലേക്കുള്ള ആക്സസ് ഇനിപ്പറയുന്ന റോളുകളെ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. </p><p> <b>ഏജൻറ്</ b> - ഈ റോൾ‌ ഉള്ള ഏജന്റുമാർ‌ക്ക് ഇൻ‌ബോക്‍സുകൾ‌, റിപ്പോർ‌ട്ടുകൾ‌, സംഭാഷണങ്ങൾ‌ എന്നിവ മാത്രമേ ആക്‌സസ് ചെയ്യാൻ‌ കഴിയൂ. അവർക്ക് മറ്റ് ഏജന്റുമാരുടെയോ അല്ലെങ്കിൽ‌ തങ്ങളുടേയോ സംഭാഷണങ്ങൾ‌ നിർ‌ണ്ണയിക്കാനും സംഭാഷണങ്ങൾ‌ പരിഹരിക്കാനും കഴിയും.</p><p> <b>അഡ്മിനിസ്ട്രേറ്റർ</b> - ഒരു സാധാരണ ഏജന്റിന്റെ പ്രത്യേകാവകാശങ്ങളോടൊപ്പം ക്രമീകരണങ്ങളും ബില്ലിംഗും ഉൾപ്പെടെ നിങ്ങളുടെ അക്കൗണ്ടിൽ ലഭ്യമായ എല്ലാ ചാറ്റ് വൂട്ട് സവിശേഷതകളിലേക്കും ആക്‌സസ് ഉണ്ടായിരിക്കുക. </ p> ",
         "YES": "അതെ, ഇല്ലാതാക്കുക ",
-        "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
index 0d7229a2b..bbf241f15 100644
--- a/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "ക്യാൻഡ് പ്രതികരണം ചേർക്കുക",
       "DESC": "മുൻ‌നിശ്ചയിച്ച മറുപടി ടെം‌പ്ലേറ്റുകളാണ് ക്യാൻഡ് പ്രതികരണങ്ങൾ‌, അവ സംഭാഷണങ്ങൾക് വേഗത്തിൽ‌ മറുപടികൾ‌ അയയ്‌ക്കാൻ‌ ഉപയോഗിക്കാം.",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "ഹ്രസ്വ കോഡ്",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "ക്യാൻഡ് പ്രതികരണം എഡിറ്റുചെയ്യുക",
+      "CANCEL_BUTTON_TEXT": "റദ്ദാക്കുക",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "ഹ്രസ്വ കോഡ്",
@@ -67,7 +69,7 @@
         "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
         "MESSAGE": "ഇല്ലാതാക്കണമെന്ന് ഉറപ്പാണോ",
         "YES": "അതെ, ഇല്ലാതാക്കുക",
-        "NO": "ഇല്ല, സൂക്ഷിക്കുക"
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/contact.json b/app/javascript/dashboard/i18n/locale/ml/contact.json
index 9ff59450d..485c20888 100644
--- a/app/javascript/dashboard/i18n/locale/ml/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ml/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "സംഭാഷണ ലേബലുകൾ",
-      "UPDATE_BUTTON": "ലേബലുകൾ അപ്‌ഡേറ്റുചെയ്യുക",
-      "UPDATE_ERROR": "ലേബലുകൾ അപ്‌ഡേറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല, വീണ്ടും ശ്രമിക്കുക.",
-      "TAG_PLACEHOLDER": "പുതിയ ലേബൽ ചേർക്കുക",
-      "PLACEHOLDER": "ഒരു ലേബൽ തിരയുക അല്ലെങ്കിൽ ചേർക്കുക"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "ലേബലുകൾ അപ്‌ഡേറ്റ് ചെയ്യാൻ കഴിഞ്ഞില്ല, വീണ്ടും ശ്രമിക്കുക."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "എഡിറ്റുചെയ്യുക"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
index 9915288e0..1e69e8706 100644
--- a/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ",
     "SUBMIT": "ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റു ചെയ്യുക",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "ക്രമീകരണങ്ങൾ അപ്‌ഡേറ്റു ചെയ്യാനായില്ല, വീണ്ടും ശ്രമിക്കുക!",
       "SUCCESS": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ വിജയകരമായി അപ്‌ഡേറ്റു ചെയ്‌തു"
@@ -21,6 +22,25 @@
         "LABEL": "സൈറ്റ് ഭാഷ (ബീറ്റ)",
         "PLACEHOLDER": "നിങ്ങളുടെ അക്കൗണ്ടിന്റെ പേര്",
         "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+          "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
index 2f87a0f67..e2f427963 100644
--- a/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ml/inboxMgmt.json
@@ -1,27 +1,52 @@
 {
   "INBOX_MGMT": {
     "HEADER": "ഇൻ‌ബോക്സുകൾ",
-    "SIDEBAR_TXT": "<p> <b> ഇൻ‌ബോക്സ് </b> </p> <p> ചാറ്റ് വൂട്ടിലേക്ക് നിങ്ങൾ ഒരു വെബ്‌സൈറ്റോ ഫേസ്ബുക്ക് പേജോ കണക്റ്റുചെയ്യുമ്പോൾ, അതിനെ <b> ഇൻ‌ബോക്സ് </b> എന്ന് വിളിക്കുന്നു. നിങ്ങളുടെ ചാറ്റ് വൂട്ട് അക്കൗണ്ടിൽ പരിധിയില്ലാത്ത ഇൻബോക്സുകൾ ഉണ്ടായിരിക്കാൻ‌ കഴിയും. </p> <p> ഒരു വെബ്‌സൈറ്റ് അല്ലെങ്കിൽ‌ ഫേസ്ബുക് പേജ് ബന്ധിപ്പിക്കുന്നതിന് <b> ഇൻ‌ബോക്സ് ചേർക്കുക </b> ക്ലിക്കുചെയ്യുക. </p> <p> ഡാഷ്‌ബോർഡ്, നിങ്ങളുടെ എല്ലാ ഇൻ‌ബോക്‌സുകളിൽ‌ നിന്നുമുള്ള എല്ലാ സംഭാഷണങ്ങളും ഒരൊറ്റ സ്ഥലത്ത് കാണാനും `സംഭാഷണങ്ങൾ‌` ടാബിന് കീഴിൽ അവയോട് പ്രതികരിക്കാനും കഴിയും. </p> <p> ഡാഷ്‌ബോർഡിന്റെ ഇടത് പാളിയിലെ ഇൻ‌ബോക്സ് ബട്ടണിൽ ക്ലിക്കുചെയ്ത് ഇൻബോക്സിൽ ഉള്ള സംഭാഷണങ്ങൾ കാണാൻ നിങ്ങൾക്കു സാധിക്കും . </p>",
+    "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": "ഈ അക്കൗണ്ടിലേക്കു ഇൻ‌ബോക്സുകളൊന്നും ബന്ധിപ്പിച്ചിട്ടില്ല."
     },
     "CREATE_FLOW": [
-      { "title": "ചാനൽ തിരഞ്ഞെടുക്കുക", "route": "settings_inbox_new", "body": "ചാറ്റ് വൂട്ടുമായി സംയോജിപ്പിക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്ന ദാതാവിനെ തിരഞ്ഞെടുക്കുക." },
-      { "title": "ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുക", "route": "settings_inboxes_page_channel", "body": "നിങ്ങളുടെ അക്കൗണ്ട്  പ്രാമാണീകരിക്കുകയും ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുകയും ചെയ്യുക." },
-      { "title": "ഏജന്റുമാരെ ചേർക്കുക", "route": "settings_inboxes_add_agents", "body": "സൃഷ്ടിച്ച ഇൻ‌ബോക്സിലേക്ക് ഏജന്റുമാരെ ചേർക്കുക." },
-      { "title": "പൊളിച്ചു!", "route": "settings_inbox_finish", "body": "എല്ലാം ഭംഗിയായി പാപര്യവസാനിച്ചിരിക്കുന്നു. വരൂ നമുക്ക്‌ പോകാം." }
+      {
+        "title": "ചാനൽ തിരഞ്ഞെടുക്കുക",
+        "route": "settings_inbox_new",
+        "body": "ചാറ്റ് വൂട്ടുമായി സംയോജിപ്പിക്കാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്ന ദാതാവിനെ തിരഞ്ഞെടുക്കുക."
+      },
+      {
+        "title": "ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുക",
+        "route": "settings_inboxes_page_channel",
+        "body": "നിങ്ങളുടെ അക്കൗണ്ട്  പ്രാമാണീകരിക്കുകയും ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുകയും ചെയ്യുക."
+      },
+      {
+        "title": "ഏജന്റുമാരെ ചേർക്കുക",
+        "route": "settings_inboxes_add_agents",
+        "body": "സൃഷ്ടിച്ച ഇൻ‌ബോക്സിലേക്ക് ഏജന്റുമാരെ ചേർക്കുക."
+      },
+      {
+        "title": "പൊളിച്ചു!",
+        "route": "settings_inbox_finish",
+        "body": "എല്ലാം ഭംഗിയായി പാപര്യവസാനിച്ചിരിക്കുന്നു. വരൂ നമുക്ക്‌ പോകാം!"
+      }
     ],
     "ADD": {
       "FB": {
-        "HELP": "സൈൻ ഇൻ ചെയ്യുന്നതിലൂടെ, നിങ്ങളുടെ പേജിന്റെ സന്ദേശങ്ങളിലേക്ക് മാത്രമേ ഞങ്ങൾക്ക് പ്രവേശനം ലഭിക്കൂ. നിങ്ങളുടെ സ്വകാര്യ സന്ദേശങ്ങൾ ഒരിക്കലും ചാറ്റ് വൂട്ട് ഉപയോഗിച്ച് ആക്സസ് ചെയ്യാൻ കഴിയില്ല."
+        "HELP": "സൈൻ ഇൻ ചെയ്യുന്നതിലൂടെ, നിങ്ങളുടെ പേജിന്റെ സന്ദേശങ്ങളിലേക്ക് മാത്രമേ ഞങ്ങൾക്ക് പ്രവേശനം ലഭിക്കൂ. നിങ്ങളുടെ സ്വകാര്യ സന്ദേശങ്ങൾ ഒരിക്കലും ചാറ്റ് വൂട്ട് ഉപയോഗിച്ച് ആക്സസ് ചെയ്യാൻ കഴിയില്ല.",
+        "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": "നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ ഒരു ചാനലായി ചേർക്കുന്നതിന്, 'ട്വിറ്ററിനൊപ്പം പ്രവേശിക്കുക' ക്ലിക്കുചെയ്ത് നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ പ്രാമാണീകരിക്കേണ്ടതുണ്ട്. "
+        "HELP": "നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ ഒരു ചാനലായി ചേർക്കുന്നതിന്, 'ട്വിറ്ററിനൊപ്പം പ്രവേശിക്കുക' ക്ലിക്കുചെയ്ത് നിങ്ങളുടെ ട്വിറ്റർ പ്രൊഫൈൽ പ്രാമാണീകരിക്കേണ്ടതുണ്ട് "
       },
       "WEBSITE_CHANNEL": {
         "TITLE": "വെബ്‌സൈറ്റ് ചാനൽ",
         "DESC": "നിങ്ങളുടെ വെബ്‌സൈറ്റിനായി ഒരു ചാനൽ സൃഷ്‌ടിച്ച് ഞങ്ങളുടെ വെബ്‌സൈറ്റ് വിജറ്റ് വഴി ഉപഭോക്താക്കളെ പിന്തുണയ്ക്കാൻ ആരംഭിക്കുക.",
         "LOADING_MESSAGE": "വെബ്‌സൈറ്റ് സപ്പോർട്ട് ചാനൽ സൃഷ്‌ടിക്കുന്നു",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
         "CHANNEL_NAME": {
           "LABEL": "വെബ്‌സൈറ്റിന്റെ പേര്",
           "PLACEHOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റിന്റെ പേര് നൽകുക (ഉദാ: പുണ്ണ്യാളൻ അഗർബത്തീസ്)"
@@ -30,20 +55,42 @@
           "LABEL": "വെബ്സൈറ്റ് ഡൊമെയ്ൻ",
           "PLACEHOLDER": "നിങ്ങളുടെ വെബ്‌സൈറ്റ് ഡൊമെയ്ൻ നൽകുക (ഉദാ: punnyalan.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 user when he starts the conversation.",
+          "ENABLED": "പ്രവർത്തനക്ഷമമാക്കി",
+          "DISABLED": "പ്രവർത്തനരഹിതമാക്കി"
+        },
         "WIDGET_COLOR": {
           "LABEL": "വിജറ്റ് നിറം",
           "PLACEHOLDER": "വിജറ്റിൽ ഉപയോഗിച്ച വിജറ്റ് നിറം അപ്‌ഡേറ്റ് ചെയ്യുക"
         },
-        "SUBMIT_BUTTON":"ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുക"
+        "SUBMIT_BUTTON": "ഇൻ‌ബോക്സ് സൃഷ്ടിക്കുക"
       },
       "TWILIO": {
         "TITLE": "ട്വിലിയോ എസ്.എം.എസ് ചാനൽ",
         "DESC": "ട്വിലിയോ സംയോജിപ്പിച്ച് എസ്.എം.എസ് വഴി നിങ്ങളുടെ ഉപഭോക്താക്കളെ പിന്തുണയ്ക്കാൻ ആരംഭിക്കുക.",
         "ACCOUNT_SID": {
-          "LABEL": "അക്കൗണ്ട് എസ്.ഐ.ഡി",
-          "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ട്വിലിയോ അക്കൗണ്ട് എസ്.ഐ.ഡി നൽകുക",
+          "LABEL": "അക്കൗണ്ട് എസ്ഐഡി",
+          "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ട്വിലിയോ അക്കൗണ്ട് എസ്ഐഡി നൽകുക",
           "ERROR": "ഈ ഫീൽഡ് ആവശ്യമാണ്"
         },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
         "AUTH_TOKEN": {
           "LABEL": "ഓത്ത് ടോക്കൺ",
           "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ട്വിലിയോ ഓത്ത് ടോക്കൺ നൽകുക",
@@ -59,9 +106,13 @@
           "PLACEHOLDER": "ദയവായി സന്ദേശം അയയ്‌ക്കുന്ന ഫോൺ നമ്പർ നൽകുക.",
           "ERROR": "ദയവായി സാധുവായ ഒരു ഫോൺ നമ്പർ നൽകുക. ഫോൺ നമ്പർ `+`ചിഹ്നത്തിൽ ആരംഭിക്കണം."
         },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
         "SUBMIT_BUTTON": "ട്വിലിയോ ചാനൽ സൃഷ്ടിക്കുക",
         "API": {
-          "ERROR_MESSAGE": "ഞങ്ങൾക്ക് ട്വിലിയോ ക്രെഡൻഷ്യലുകൾ പ്രാമാണീകരിക്കാൻ കഴിഞ്ഞില്ല, ദയവായി വീണ്ടും ശ്രമിക്കുക."
+          "ERROR_MESSAGE": "ഞങ്ങൾക്ക് ട്വിലിയോ ക്രെഡൻഷ്യലുകൾ പ്രാമാണീകരിക്കാൻ കഴിഞ്ഞില്ല, ദയവായി വീണ്ടും ശ്രമിക്കുക"
         }
       },
       "AUTH": {
@@ -76,8 +127,8 @@
         "TITLE": "ഇൻ‌ബോക്സ് വിശദാംശങ്ങൾ",
         "DESC": "ചുവടെയുള്ള ഡ്രോപ്പ്ഡൗണിൽ നിന്ന്, നിങ്ങൾക്ക് ചാറ്റ് വൂട്ടിലേക്ക് കണക്റ്റുചെയ്യാൻ ആഗ്രഹിക്കുന്ന ഫേസ്ബുക്ക് പേജ് തിരഞ്ഞെടുക്കുക. തിരിച്ചറിയലിനായി നിങ്ങളുടെ ഇൻബോക്സിനു ഒരു ഇച്ഛാനുസൃത പേര് നല്കാൻ കഴിയും."
       },
-      "FINISH":{
-        "TITLE": "പൊളിച്ചു അടുക്കി",
+      "FINISH": {
+        "TITLE": "പൊളിച്ചു അടുക്കി!",
         "DESC": "നിങ്ങളുടെ ഫേസ്ബുക്ക് പേജ് ചാറ്റ് വൂട്ടുമായി സമന്വയിപ്പിക്കുന്നത് നിങ്ങൾ വിജയകരമായി പൂർത്തിയാക്കി. അടുത്ത തവണ ഒരു ഉപയോക്താവ് നിങ്ങളുടെ പേജിലേക്ക് സന്ദേശമയയ്ക്കുമ്പോൾ, സംഭാഷണം ഓട്ടോമാറ്റിക്കലി നിങ്ങളുടെ ഇൻ‌ബോക്സിൽ ദൃശ്യമാകും. <br> നിങ്ങൾക്ക് എളുപ്പത്തിൽ സംയോജിപ്പിക്കാൻ കഴിയുന്ന ഒരു വിജറ്റ് സ്ക്രിപ്റ്റും ഞങ്ങൾ നിങ്ങൾക്ക് നൽകുന്നു. ഇത് നിങ്ങളുടെ വെബ്‌സൈറ്റിലേക്ക് ചേർക്കുക. ഇത് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ തത്സമയമായിക്കഴിഞ്ഞാൽ, ഉപയോക്താക്കൾക്ക് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ നിന്ന് നിങ്ങൾക്ക് സന്ദേശം അയയ്‌ക്കാൻ കഴിയും, ഒപ്പം സംഭാഷണം ചാറ്റ് വൂട്ടിൽ തന്നെ ദൃശ്യമാകും. <br> കൊള്ളാം, അല്ലേ? :)"
       }
     },
@@ -94,7 +145,7 @@
     },
     "FINISH": {
       "TITLE": "നിങ്ങളുടെ ഇൻ‌ബോക്സ് തയ്യാറാണ്!",
-      "MESSAGE": "നിങ്ങളുടെ പുതിയ ചാനലിലൂടെ നിങ്ങൾക്ക് ഇപ്പോൾ ഉപഭോക്താക്കളുമായി ഇടപഴകാൻ കഴിയും. പിന്തുണയ്ക്കുന്നതിൽ സന്തോഷിക്കൂ.",
+      "MESSAGE": "നിങ്ങളുടെ പുതിയ ചാനലിലൂടെ നിങ്ങൾക്ക് ഇപ്പോൾ ഉപഭോക്താക്കളുമായി ഇടപഴകാൻ കഴിയും. പിന്തുണയ്ക്കുന്നതിൽ സന്തോഷിക്കൂ",
       "BUTTON_TEXT": "എന്നെ അവിടേക്ക് കൊണ്ടുപോകുക",
       "WEBSITE_SUCCESS": "നിങ്ങൾ ഒരു വെബ്‌സൈറ്റ് ചാനൽ സൃഷ്ടിക്കുന്നത് വിജയകരമായി പൂർത്തിയാക്കി. ചുവടെ കാണിച്ചിരിക്കുന്ന കോഡ് പകർത്തി നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ചേർക്കുക. അടുത്ത തവണ ഒരു ഉപഭോക്താവ് തത്സമയ ചാറ്റ് ഉപയോഗിക്കുമ്പോൾ, സംഭാഷണം ഓട്ടോമാറ്റിക് ആയി  നിങ്ങളുടെ ഇൻ‌ബോക്സിൽ ദൃശ്യമാകും."
     },
@@ -117,7 +168,7 @@
         "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
         "MESSAGE": "ഇല്ലാതാക്കണമെന്നു ഉറപ്പാണോ ",
         "YES": "അതെ, ഇല്ലാതാക്കുക ",
-        "NO": "ഇല്ല, സൂക്ഷിക്കുക "
+        "NO": "No, Keep "
       },
       "API": {
         "SUCCESS_MESSAGE": "ഇൻ‌ബോക്സ് വിജയകരമായി ഇല്ലാതാക്കിയിരിക്കുന്നു",
@@ -132,6 +183,8 @@
       "INBOX_AGENTS_SUB_TEXT": "ഈ ഇൻ‌ബോക്സിൽ നിന്ന് ഏജന്റുമാരെ ചേർക്കുക അല്ലെങ്കിൽ നീക്കംചെയ്യുക",
       "UPDATE": "അപ്‌ഡേറ്റ്",
       "AUTO_ASSIGNMENT": "ഓട്ടോ അസൈൻമെന്റ് പ്രവർത്തനക്ഷമമാക്കുക",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
       "AUTO_ASSIGNMENT_SUB_TEXT": "പുതിയ സംഭാഷണങ്ങളിൽ ലഭ്യമായ ഏജന്റുമാരുടെ ഓട്ടോമാറ്റിക് അസൈൻമെന്റ് പ്രാപ്തമാക്കുകയോ അപ്രാപ്തമാക്കുകയോ ചെയ്യുക"
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/ml/integrations.json b/app/javascript/dashboard/i18n/locale/ml/integrations.json
index 9a72b8c86..e88d9d128 100644
--- a/app/javascript/dashboard/i18n/locale/ml/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ml/integrations.json
@@ -49,6 +49,15 @@
           "NO": "ഇല്ല, സൂക്ഷിക്കുക"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "ഇല്ലാതാക്കുക",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
new file mode 100644
index 000000000..5525be0c2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ml/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "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": [
+        "പേര്",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "എഡിറ്റുചെയ്യുക",
+      "CREATE": "Create",
+      "DELETE": "ഇല്ലാതാക്കുക",
+      "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": "ഇല്ലാതാക്കുക",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "ഇല്ലാതാക്കൽ സ്ഥിരീകരിക്കുക",
+        "MESSAGE": "<p><b>ഏജന്റുമാർ</b></p><p> ഒരു <b>ഏജൻറ്</b> നിങ്ങളുടെ ഉപഭോക്തൃ പിന്തുണാ ടീമിലെ ഒരു അംഗമാണ്. </p><p> ഏജന്റുമാർക്ക് നിങ്ങളുടെ ഉപയോക്താക്കളിൽ നിന്നുള്ള സന്ദേശങ്ങൾ കാണാനും മറുപടി നൽകാനും കഴിയും. നിങ്ങളുടെ അക്കൗണ്ടിലുള്ള എല്ലാ ഏജന്റുമാരെയും ഈ പട്ടിക കാണിക്കുന്നു. </ p> <p> ഒരു പുതിയ ഏജന്റിനെ ചേർക്കുന്നതിന് <b> ഏജന്റിനെ ചേർക്കുക </ b> ബട്ടൺ ക്ലിക്കുചെയ്യുക. നിങ്ങൾ ചേർത്ത ഏജന്റിന് അവരുടെ അക്കൗണ്ട് സജീവമാക്കുന്നതിന് ഒരു സ്ഥിരീകരണ ലിങ്കുള്ള ഇമെയിൽ ലഭിക്കും. അതിനുശേഷം അവർക്ക് ചാറ്റ് വൂട്ട് ആക്സസ് ചെയ്യാനും സന്ദേശങ്ങളോട് പ്രതികരിക്കാനും കഴിയും.</p> <p> ചാറ്റ് വൂട്ടിന്റെ സവിശേഷതകളിലേക്കുള്ള ആക്സസ് ഇനിപ്പറയുന്ന റോളുകളെ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. </p><p> <b>ഏജൻറ്</ b> - ഈ റോൾ‌ ഉള്ള ഏജന്റുമാർ‌ക്ക് ഇൻ‌ബോക്‍സുകൾ‌, റിപ്പോർ‌ട്ടുകൾ‌, സംഭാഷണങ്ങൾ‌ എന്നിവ മാത്രമേ ആക്‌സസ് ചെയ്യാൻ‌ കഴിയൂ. അവർക്ക് മറ്റ് ഏജന്റുമാരുടെയോ അല്ലെങ്കിൽ‌ തങ്ങളുടേയോ സംഭാഷണങ്ങൾ‌ നിർ‌ണ്ണയിക്കാനും സംഭാഷണങ്ങൾ‌ പരിഹരിക്കാനും കഴിയും.</p><p> <b>അഡ്മിനിസ്ട്രേറ്റർ</b> - ഒരു സാധാരണ ഏജന്റിന്റെ പ്രത്യേകാവകാശങ്ങളോടൊപ്പം ക്രമീകരണങ്ങളും ബില്ലിംഗും ഉൾപ്പെടെ നിങ്ങളുടെ അക്കൗണ്ടിൽ ലഭ്യമായ എല്ലാ ചാറ്റ് വൂട്ട് സവിശേഷതകളിലേക്കും ആക്‌സസ് ഉണ്ടായിരിക്കുക. </ p> ",
+        "YES": "അതെ, ഇല്ലാതാക്കുക ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ml/settings.json b/app/javascript/dashboard/i18n/locale/ml/settings.json
index d7e89fb3f..bf7b14186 100644
--- a/app/javascript/dashboard/i18n/locale/ml/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ml/settings.json
@@ -26,10 +26,20 @@
         "TITLE": "ഇമെയിൽ അറിയിപ്പുകൾ",
         "NOTE": "നിങ്ങളുടെ ഇമെയിൽ അറിയിപ്പ് മുൻ‌ഗണനകൾ ഇവിടെ അപ്‌ഡേറ്റു ചെയ്യുക",
         "CONVERSATION_ASSIGNMENT": "ഒരു സംഭാഷണം എനിക്ക് നിയോഗിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്‌ക്കുക",
-        "CONVERSATION_CREATION": "ഒരു പുതിയ സംഭാഷണം സൃഷ്ടിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്ക്കുക",
-        "UPDATE_SUCCESS": "നിങ്ങളുടെ ഇമെയിൽ അറിയിപ്പ് മുൻ‌ഗണനകൾ വിജയകരമായി അപ്‌ഡേറ്റു ചെയ്‌തു",
+        "CONVERSATION_CREATION": "ഒരു പുതിയ സംഭാഷണം സൃഷ്ടിക്കുമ്പോൾ ഇമെയിൽ അറിയിപ്പുകൾ അയയ്ക്കുക"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "Your notification preferences are updated successfully",
         "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
       "PROFILE_IMAGE": {
         "LABEL": "പ്രൊഫൈൽ ചിത്രം"
       },
@@ -38,6 +48,23 @@
         "ERROR": "ദയവായി സാധുവായ ഒരു പേര് നൽകുക",
         "PLACEHOLDER": "ദയവായി നിങ്ങളുടെ പേര് നൽകുക, ഇത് സംഭാഷണങ്ങളിൽ ദൃശ്യമാകും"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം",
         "ERROR": "ദയവായി സാധുവായ ഒരു ഇമെയിൽ വിലാസം നൽകുക",
@@ -56,41 +83,44 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "പ്രൊഫൈൽ ക്രമീകരണങ്ങൾ",
     "LOGOUT": "ലോഗൗട്ട്"
   },
   "APP_GLOBAL": {
-    "TRIAL_MESSAGE": "ദിവസത്തെ ട്രയൽ ശേഷിക്കുന്നു.",
-    "TRAIL_BUTTON": "ഇപ്പോൾ വാങ്ങുക"
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
   },
   "COMPONENTS": {
     "CODE": {
-      "BUTTON_TEXT": "പകർത്തുക",
-      "COPY_SUCCESSFUL": "കോഡ് വിജയകരമായി ക്ലിപ്പ്ബോർഡിലേക്ക് പകർത്തി"
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
     },
     "FILE_BUBBLE": {
-      "DOWNLOAD": "ഡൗൺലോഡുചെയ്യുക",
-      "UPLOADING": "അപ്‌ലോഡുചെയ്യുന്നു..."
+      "DOWNLOAD": "ഡൗൺലോഡ്",
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "സമർപ്പിക്കുക"
     }
   },
-  "CONFIRM_EMAIL": "പരിശോധിച്ചുറപ്പിക്കുന്നു...",
+  "CONFIRM_EMAIL": "Verifying...",
   "SETTINGS": {
     "INBOXES": {
-      "NEW_INBOX": "ഇൻ‌ബോക്സ് ചേർക്കുക"
+      "NEW_INBOX": "Add Inbox"
     }
   },
   "SIDEBAR": {
     "CONVERSATIONS": "സംഭാഷണങ്ങൾ",
     "REPORTS": "റിപ്പോർട്ടുകൾ",
     "SETTINGS": "ക്രമീകരണങ്ങൾ",
-    "HOME": "ഹോം",
+    "HOME": "Home",
     "AGENTS": "ഏജന്റുമാർ",
-    "INBOXES": "ഇൻബോക്സുകൾ",
+    "INBOXES": "ഇൻ‌ബോക്സുകൾ",
     "CANNED_RESPONSES": "ക്യാൻഡ് പ്രതികരണങ്ങൾ",
     "INTEGRATIONS": "സംയോജനങ്ങൾ",
-    "ACCOUNT_SETTINGS": "അക്കൗണ്ട് ക്രമീകരണങ്ങൾ"
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
index fce0a8ff5..2f9fa444e 100644
--- a/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Medewerkers",
     "HEADER_BTN_TXT": "Medewerker toevoegen",
     "LOADING": "Ophalen van medewerkerslijst",
-    "SIDEBAR_TXT": "<p><b>Medewerkers</b></p> <p> Een <b>Medewerker</b> is lid van uw Klantenservice-team. </p><p> Medewerkers kunnen berichten van uw gebruikers bekijken en beantwoorden. De lijst toont alle medewerkers die momenteel in uw account bestaan. </p><p> Klik op <b>Medewerker toevoegen</b> om een nieuwe medewerker toe te voegen. De medewerker die je toevoegt, ontvangt een e-mail met een bevestigingslink om zijn account te activeren, waarna hij Chatwoot kan bezoeken en op berichten kan reageren. </p><p> Toegang tot Chatwoot-functies zijn gebaseerd op de volgende rollen. </p><p> <b>Medewerker</b> - Medewerkers met deze rol kunnen alleen inboxen, rapporten en gesprekken gebruiken. Ze kunnen gesprekken toewijzen aan andere medewerkers of zichzelf en gesprekken oplossen.</p><p> <b>Beheerder</b> - Een beheerder heeft toegang tot alle Chatwoot-functies ingeschakeld voor uw account, inclusief instellingen en facturering, aangevuld met de gebruikelijke rechten van een medewerker.</p>",
+    "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": [
       {
         "name": "administrator",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Voeg medewerker toe aan je team",
       "DESC": "U kunt medewerkers toevoegen die de ondersteuning verzorgen voor berichten in uw inboxen.",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
       "FORM": {
         "NAME": {
           "LABEL": "Naam medewerker",
@@ -60,7 +61,7 @@
         "TITLE": "Verwijderen bevestigen",
         "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
         "YES": "Ja, verwijderen ",
-        "NO": "Nee, bewaar het "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
index 648404aa2..c74b404d3 100644
--- a/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Standaard antwoord toevoegen",
       "DESC": "Standaard antwoorden zijn opgeslagen antwoordsjablonen die kunnen worden gebruikt om snel te reageren op gesprek.",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Korte code",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Bewerk standaard antwoord",
+      "CANCEL_BUTTON_TEXT": "Annuleren",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Korte code",
@@ -67,7 +69,7 @@
         "TITLE": "Verwijdering bevestigen",
         "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
         "YES": "Ja, verwijderen ",
-        "NO": "Nee, bewaar het "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/nl/contact.json b/app/javascript/dashboard/i18n/locale/nl/contact.json
index 3d44e664a..bc40a08c0 100644
--- a/app/javascript/dashboard/i18n/locale/nl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/nl/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Labels voor gesprekken",
-      "UPDATE_BUTTON": "Labels bijwerken",
-      "UPDATE_ERROR": "Kon labels niet updaten, probeer het opnieuw.",
-      "TAG_PLACEHOLDER": "Nieuw label toevoegen",
-      "PLACEHOLDER": "Zoek of voeg een label toe"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Kon labels niet updaten, probeer het opnieuw."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Bewerken"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
index 9c1a0cca6..e5c6cb3c7 100644
--- a/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Accountinstellingen",
     "SUBMIT": "Instellingen bijwerken",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Instellingen konden niet worden bijgewerkt, probeer het opnieuw!",
       "SUCCESS": "Accountinstellingen succesvol bijgewerkt"
diff --git a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
index 74f3e97ac..6fc50aa4f 100644
--- a/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/nl/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Inboxen",
-    "SIDEBAR_TXT": "<p><b>Inboxen</b></p> <p> Wanneer u een website of een Facebook-pagina verbindt met Chatwoot, het heet een <b>inbox</b>. U kunt een oneindig aantal inboxen hebben in uw Chatwoot account. </p><p> Klik op <b>Voeg Postvak in</b> toe om een website of een Facebook-pagina te verbinden. </p><p> in het Dashboard, u kunt alle gesprekken van al uw inboxen op één plek zien en erop reageren onder het `Conversations` tabblad. </p><p> U kunt ook gesprekken zien die specifiek zijn voor een inbox door te klikken op de naam van de inbox op het linkerpaneel van het dashboard. </p>",
+    "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": "Er zijn geen inboxen aan dit account gekoppeld."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: Door in te loggen krijgen we alleen toegang tot berichten van uw Pagina. Chatwood heeft nooit toegang tot je privéberichten."
+        "HELP": "PS: Door in te loggen krijgen we alleen toegang tot berichten van uw Pagina. Chatwood heeft nooit toegang tot je privéberichten.",
+        "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": "Om uw Twitterprofiel als kanaal toe te voegen moet u uw Twitterprofiel verifiëren door te klikken op 'Meld je aan met Twitter' "
@@ -38,6 +44,9 @@
         "TITLE": "Website kanaal",
         "DESC": "Maak een kanaal voor uw website en begin met het ondersteunen van uw klanten via onze website widget.",
         "LOADING_MESSAGE": "Website ondersteuningskanaal aanmaken",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Website naam",
           "PLACEHOLDER": "Voer de naam van je website in (bv. Acme Inc)"
@@ -55,14 +64,14 @@
           "PLACEHOLDER": "We maken het eenvoudig om met ons te verbinden. Vraag ons iets of deel uw feedback."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Kanaalbegroeting",
-          "PLACEHOLDER": "Acme Inc antwoordt meestal binnen een paar uur."
+          "LABEL": "Channel greeting message",
+          "PLACEHOLDER": "Acme Inc reageert meestal binnen een paar uur."
         },
         "CHANNEL_GREETING_TOGGLE": {
-          "LABEL": "Kanaalbegroeting inschakelen",
-          "HELP_TEXT": "Stuur een begroetingsbericht naar de gebruiker wanneer hij het gesprek start.",
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
           "ENABLED": "Ingeschakeld",
-          "DISABLED": "Gehandicapt"
+          "DISABLED": "Uitgeschakeld"
         },
         "WIDGET_COLOR": {
           "LABEL": "Kleur van widget",
@@ -159,7 +168,7 @@
         "TITLE": "Verwijdering bevestigen",
         "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
         "YES": "Ja, verwijderen ",
-        "NO": "Nee, Bewaar het "
+        "NO": "No, Keep "
       },
       "API": {
         "SUCCESS_MESSAGE": "Inbox succesvol verwijderd",
diff --git a/app/javascript/dashboard/i18n/locale/nl/index.js b/app/javascript/dashboard/i18n/locale/nl/index.js
index 558cc9b3a..5dfc44e4b 100644
--- a/app/javascript/dashboard/i18n/locale/nl/index.js
+++ b/app/javascript/dashboard/i18n/locale/nl/index.js
@@ -1,5 +1,5 @@
-/* eslint-disable */
 import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.json';
 import { default as _cannedMgmt } from './cannedMgmt.json';
 import { default as _chatlist } from './chatlist.json';
 import { default as _contact } from './contact.json';
@@ -23,6 +23,7 @@ export default {
   ..._inboxMgmt,
   ..._login,
   ..._report,
+  ..._labelsMgmt,
   ..._resetPassword,
   ..._setNewPassword,
   ..._settings,
diff --git a/app/javascript/dashboard/i18n/locale/nl/integrations.json b/app/javascript/dashboard/i18n/locale/nl/integrations.json
index 173dbabe4..2dc1cd8b9 100644
--- a/app/javascript/dashboard/i18n/locale/nl/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/nl/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Nee, Bewaar het"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Verwijderen",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
new file mode 100644
index 000000000..45f131f1c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/nl/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labelen",
+    "HEADER_BTN_TXT": "Label toevoegen",
+    "LOADING": "Labels ophalen",
+    "SEARCH_404": "Er zijn geen items die overeenkomen met deze zoekopdracht",
+    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels helpen u om gesprekken te categoriseren en ze prioriteit te geven. Vanaf het zijpaneel kunt u het label toewijzen aan een gesprek. <br /><br />Labels zijn gekoppeld aan het account en kunnen worden gebruikt om aangepaste workflows in uw organisatie te creëren. U kunt aangepaste kleur aan een label toewijzen, het maakt het gemakkelijker om het label te identificeren. Je kunt het label op de zijbalk weergeven om de gesprekken gemakkelijk te filteren.</p>",
+    "LIST": {
+      "404": "Er zijn geen labels beschikbaar in dit account.",
+      "TITLE": "Beheer labels",
+      "DESC": "Labels laten je gesprekken groeperen.",
+      "TABLE_HEADER": [
+        "Naam",
+        "Beschrijving",
+        "Kleur"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label naam",
+        "PLACEHOLDER": "Label naam",
+        "ERROR": "Labelnaam is vereist"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Beschrijving",
+        "PLACEHOLDER": "Beschrijving label"
+      },
+      "COLOR": {
+        "LABEL": "Kleur"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Label op zijbalk weergeven"
+      },
+      "EDIT": "Bewerken",
+      "CREATE": "Aanmaken",
+      "DELETE": "Verwijderen",
+      "CANCEL": "Annuleren"
+    },
+    "ADD": {
+      "TITLE": "Label toevoegen",
+      "DESC": "Labels laten je gesprekken groeperen.",
+      "API": {
+        "SUCCESS_MESSAGE": "Label succesvol toegevoegd",
+        "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Bewerk label",
+      "API": {
+        "SUCCESS_MESSAGE": "Label succesvol bijgewerkt",
+        "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Verwijderen",
+      "API": {
+        "SUCCESS_MESSAGE": "Label succesvol verwijderd",
+        "ERROR_MESSAGE": "Er is een fout opgetreden, probeer het opnieuw"
+      },
+      "CONFIRM": {
+        "TITLE": "Verwijdering bevestigen",
+        "MESSAGE": "Weet u zeker dat u wilt verwijderen ",
+        "YES": "Ja, verwijderen ",
+        "NO": "Nee, Behouden "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/nl/settings.json b/app/javascript/dashboard/i18n/locale/nl/settings.json
index e013885d4..94bd497a1 100644
--- a/app/javascript/dashboard/i18n/locale/nl/settings.json
+++ b/app/javascript/dashboard/i18n/locale/nl/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Voer een geldige naam in",
         "PLACEHOLDER": "Voer je naam in, dit zou worden weergegeven in gesprekken"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Uw e-mailadres",
         "ERROR": "Voer een geldig e-mailadres in",
@@ -66,8 +83,8 @@
     }
   },
   "SIDEBAR_ITEMS": {
-    "CHANGE_ACCOUNTS": "Verwissel van profiel",
-    "SELECTOR_SUBTITLE": "Selecteer een account in de volgende lijst",
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Profiel instellingen",
     "LOGOUT": "Afmelden"
   },
@@ -103,6 +120,7 @@
     "INBOXES": "Inboxen",
     "CANNED_RESPONSES": "Standaard antwoorden",
     "INTEGRATIONS": "Integraties",
-    "ACCOUNT_SETTINGS": "Accountinstellingen"
+    "ACCOUNT_SETTINGS": "Accountinstellingen",
+    "LABELS": "Labelen"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
index 6aff12658..5604dff14 100644
--- a/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenci",
     "HEADER_BTN_TXT": "Dodaj agenta",
     "LOADING": "Pobieranie listy agentów",
-    "SIDEBAR_TXT": "<p><b>Agenci</b></p> <p> <b>Agent</b> jest członkiem Twojego zespołu wsparcia klienta. </p><p> Agenci będą mogli przeglądać i odpowiadać na wiadomości od Twoich użytkowników. Lista wyświetla wszystkich agentów aktualnie na Twoim koncie. </p><p> Kliknij <b>Dodaj agenta</b> , aby dodać nowego agenta. Dodany przez Ciebie przedstawiciel otrzyma e-mail z linkiem potwierdzającym, aby aktywować swoje konto, po którym będą mogli uzyskać dostęp do Chatwoot i odpowiadać na wiadomości. </p><p> Dostęp do funkcji Chatwoot opiera się na następujących rolach. </p><p> <b>Agent</b> - Agenci z tą rolą mogą mieć dostęp tylko do skrzynki odbiorczej, raportów i konwersacji. Mogą nadawać rozmowy innym agentom lub sami i rozwiązywać rozmowy.</p><p> <b>Administrator</b> - Administrator będzie miał dostęp do wszystkich funkcji Chatwoot włączonych dla Twojego konta, łącznie z ustawieniami i rozliczeniami, wraz ze wszystkimi uprawnieniami zwykłych agentów.</p>",
+    "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": [
       {
         "name": "administrator",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Dodaj agenta do swojego zespołu",
       "DESC": "Możesz dodać osoby, które będą w stanie obsłużyć wsparcie dla twoich skrzynek odbiorczych.",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "NAME": {
           "LABEL": "Nazwa agenta",
@@ -60,7 +61,7 @@
         "TITLE": "Potwierdź usunięcie",
         "MESSAGE": "Czy na pewno chcesz usunąć ",
         "YES": "Tak, usuń ",
-        "NO": "Nie, Zachowaj "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
index 2c9f298f7..075520cf7 100644
--- a/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pl/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Dodaj Gotową odpowiedź",
       "DESC": "Gotowe odpowiedzi są zapisanymi szablonami odpowiedzi, które mogą być użyte do szybkiego wysyłania odpowiedzi do konwersacji.",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krótki kod",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Edytuj Gotową odpowiedź",
+      "CANCEL_BUTTON_TEXT": "Anuluj",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Krótki kod",
@@ -67,7 +69,7 @@
         "TITLE": "Potwierdź usunięcie",
         "MESSAGE": "Czy na pewno chcesz usunąć ",
         "YES": "Tak, usuń ",
-        "NO": "Nie, Zachowaj "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pl/contact.json b/app/javascript/dashboard/i18n/locale/pl/contact.json
index 9069f148a..e3adfb7ca 100644
--- a/app/javascript/dashboard/i18n/locale/pl/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pl/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etykiety konwersacji",
-      "UPDATE_BUTTON": "Aktualizuj etykiety",
-      "UPDATE_ERROR": "Nie można zaktualizować etykiet, spróbuj ponownie.",
-      "TAG_PLACEHOLDER": "Dodaj nową etykietę",
-      "PLACEHOLDER": "Szukaj lub dodaj etykietę"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edytuj"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pl/generalSettings.json b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
new file mode 100644
index 000000000..cab6f01b0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Ustawienia konta",
+    "SUBMIT": "Aktualizuj ustawienia",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Nie można zaktualizować ustawień, spróbuj ponownie!",
+      "SUCCESS": "Pomyślnie zaktualizowano ustawienia konta"
+    },
+    "FORM": {
+      "ERROR": "Proszę naprawić błędy formularza",
+      "GENERAL_SECTION": {
+        "TITLE": "Ustawienia ogólne",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "Nazwa konta",
+        "PLACEHOLDER": "Nazwa konta",
+        "ERROR": "Wprowadź prawidłową nazwę konta"
+      },
+      "LANGUAGE": {
+        "LABEL": "Język witryny (beta)",
+        "PLACEHOLDER": "Nazwa konta",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Włączone",
+          "DISABLED": "Wyłączone"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
new file mode 100644
index 000000000..3c8ebbbf4
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Skrzynki",
+    "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": "Nie ma żadnych skrzynek dołączonych do tego konta."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Wybierz kanał",
+        "route": "settings_inbox_new",
+        "body": "Wybierz dostawcę, który chcesz zintegrować z chatwootem."
+      },
+      {
+        "title": "Utwórz skrzynkę odbiorczą",
+        "route": "settings_inboxes_page_channel",
+        "body": "Uwierzytelnij swoje konto i utwórz skrzynkę odbiorczą."
+      },
+      {
+        "title": "Dodaj agentów",
+        "route": "settings_inboxes_add_agents",
+        "body": "Dodaj agentów do utworzonej skrzynki odbiorczej."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "Wszystko jest gotowe!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "PS: Logując się, uzyskujemy dostęp tylko do wiadomości Twojej strony. Chatwoot nigdy nie może uzyskać dostępu do prywatnych wiadomości.",
+        "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": "Aby dodać swój profil na Twitterze jako kanał, musisz uwierzytelnić swój profil Twitter klikając na 'Zaloguj się przez Twittera' "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Kanał strony internetowej",
+        "DESC": "Utwórz kanał dla swojej strony internetowej i zacznij wspierać swoich klientów za pomocą naszego widżetu na stronie.",
+        "LOADING_MESSAGE": "Tworzenie kanału wsparcia strony internetowej",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Nazwa witryny",
+          "PLACEHOLDER": "Wprowadź nazwę swojej strony (np. Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Domena strony internetowej",
+          "PLACEHOLDER": "Wprowadź domenę witryny (np. acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Nagłówek powitalny",
+          "PLACEHOLDER": "Cześć!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Tagline powitalny",
+          "PLACEHOLDER": "Łatwo się z nami połączyć. Zapytaj nas o coś lub podziel się swoją opinią."
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Włączone",
+          "DISABLED": "Wyłączone"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Kolor widżetu",
+          "PLACEHOLDER": "Aktualizuj kolor widżetu używany w widżecie"
+        },
+        "SUBMIT_BUTTON": "Utwórz skrzynkę odbiorczą"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/Whatsapp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Karta SID konta",
+          "PLACEHOLDER": "Wprowadź SID konta Twilio",
+          "ERROR": "To pole jest wymagane"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Token uwierzytelniania",
+          "PLACEHOLDER": "Wprowadź swój token uwierzytelniania Twilio",
+          "ERROR": "To pole jest wymagane"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Nazwa kanału",
+          "PLACEHOLDER": "Wprowadź nazwę kanału",
+          "ERROR": "To pole jest wymagane"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Numer telefonu",
+          "PLACEHOLDER": "Wprowadź numer telefonu, z którego zostanie wysłana wiadomość.",
+          "ERROR": "Wprowadź prawidłową wartość. Numer telefonu powinien zaczynać się od znaku `+`."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Utwórz kanał Twilio",
+        "API": {
+          "ERROR_MESSAGE": "Nie byliśmy w stanie uwierzytelnić danych logowania Twilio, spróbuj ponownie"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Kanały",
+        "DESC": "Obecnie obsługujemy widżety czatu na żywo, strony na Facebooku i profile Twittera jako platformy. Mamy więcej platform takich jak Whatsapp, E-mail, Telegram i Line w pracach, które wkrótce się zakończą."
+      },
+      "AGENTS": {
+        "TITLE": "Agenci",
+        "DESC": "Tutaj możesz dodać agentów do zarządzania swoją nowo utworzoną skrzynką odbiorczą. Tylko ci wybrani agenci będą mieli dostęp do Twojej skrzynki odbiorczej. Agenci, którzy nie są częścią tej skrzynki odbiorczej nie będą mogli zobaczyć ani odpowiadać na wiadomości w tej skrzynce odbiorczej podczas logowania. <br> <b>PS:</b> Jako administrator, jeśli potrzebujesz dostępu do wszystkich skrzynek odbiorczych, powinieneś dodać siebie jako agenta do wszystkich skrzynek odbiorczych, które tworzysz."
+      },
+      "DETAILS": {
+        "TITLE": "Szczegóły skrzynki odbiorczej",
+        "DESC": "Z listy rozwijanej poniżej wybierz stronę na Facebooku, którą chcesz połączyć z czatwootem. Możesz również podać własną nazwę swojej skrzynki odbiorczej w celu lepszej identyfikacji."
+      },
+      "FINISH": {
+        "TITLE": "Zgadzony!",
+        "DESC": "Pomyślnie zakończyłeś integrację strony na Facebooku z czatwootem. Następnym razem, gdy klient komunikuje Twoją stronę, konwersacja pojawi się automatycznie na twojej skrzynce odbiorczej.<br>Dostarczamy również skrypt widżetu, który można łatwo dodać do swojej witryny. Gdy tylko będzie on dostępny na Twojej stronie internetowej, klienci mogą wysyłać Ci wiadomości bezpośrednio z Twojej strony bez pomocy żadnego zewnętrznego narzędzia, a konwersacja pojawi się tutaj w Chatwoot.<br>Coś, co? Cóż, na pewno spróbujemy być :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Uwierzytelnianie za pomocą Facebooka...",
+      "ERROR_FB_AUTH": "Coś poszło nie tak. Proszę odświeżyć stronę...",
+      "CREATING_CHANNEL": "Tworzenie skrzynki odbiorczej...",
+      "TITLE": "Skonfiguruj szczegóły skrzynki odbiorczej",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Dodaj agentów",
+      "ADD_AGENTS": "Dodawanie agentów do skrzynki odbiorczej..."
+    },
+    "FINISH": {
+      "TITLE": "Twoja skrzynka odbiorcza jest gotowa!",
+      "MESSAGE": "Teraz możesz współpracować ze swoimi klientami poprzez swój nowy kanał. Szczęśliwego wsparcia ",
+      "BUTTON_TEXT": "Zabierz mnie tam",
+      "WEBSITE_SUCCESS": "Pomyślnie zakończyłeś tworzenie kanału internetowego. Skopiuj poniższy kod i wklej go na swojej stronie. Następnym razem, gdy klient korzysta z czatu na żywo, konwersacja pojawi się automatycznie na twojej skrzynce odbiorczej."
+    },
+    "REAUTH": "Ponowna autoryzacja",
+    "VIEW": "Widok",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Ustawienia skrzynki odbiorczej zostały zaktualizowane",
+        "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Usuń",
+      "CONFIRM": {
+        "TITLE": "Potwierdź usunięcie",
+        "MESSAGE": "Czy na pewno chcesz usunąć ",
+        "YES": "Tak, usuń ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Skrzynka odbiorcza została usunięta",
+        "ERROR_MESSAGE": "Nie można usunąć skrzynki odbiorczej. Spróbuj ponownie później."
+      }
+    },
+    "SETTINGS": "Ustawienia",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Skrypt Messengera",
+      "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",
+      "UPDATE": "Aktualizuj",
+      "AUTO_ASSIGNMENT": "Włącz automatyczne przypisanie",
+      "INBOX_UPDATE_TITLE": "Ustawienia skrzynki odbiorczej",
+      "INBOX_UPDATE_SUB_TEXT": "Zaktualizuj ustawienia skrzynki odbiorczej",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Włącz lub wyłącz automatyczne przypisywanie nowych rozmów do agentów dodanych do tej skrzynki odbiorczej."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/index.js b/app/javascript/dashboard/i18n/locale/pl/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/pl/integrations.json b/app/javascript/dashboard/i18n/locale/pl/integrations.json
new file mode 100644
index 000000000..6c1f86d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integracje",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Skonfiguruj",
+      "HEADER": "Ustawienia webhooka",
+      "HEADER_BTN_TXT": "Dodaj nowy webhook",
+      "INTEGRATION_TXT": "Wydarzenia Webhook dostarczają informacji o tym, co dzieje się na Twoim koncie Chatwoot. Możesz wykorzystać webhooki do przekazywania wydarzeń do ulubionych aplikacji, takich jak Slack lub Github. Kliknij na Konfiguruj, aby skonfigurować webhooki.",
+      "LOADING": "Pobieranie dołączonych webhooków",
+      "SEARCH_404": "Brak elementów pasujących do tego zapytania",
+      "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": "Brak skonfigurowanych webhooków dla tego konta.",
+        "TITLE": "Zarządzaj webhookami",
+        "DESC": "Webhooki to predefiniowane szablony odpowiedzi, które mogą być używane do szybkiego wysyłania odpowiedzi na zgłoszenia.",
+        "TABLE_HEADER": [
+          "Punkt końcowy Webhooka",
+          "Akcje"
+        ]
+      },
+      "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",
+          "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Usuń",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook został usunięty",
+          "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później"
+        },
+        "CONFIRM": {
+          "TITLE": "Potwierdź usunięcie",
+          "MESSAGE": "Czy na pewno chcesz usunąć ",
+          "YES": "Tak, usuń ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Usuń",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
new file mode 100644
index 000000000..f3046f990
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Brak elementów pasujących do tego zapytania",
+    "SIDEBAR_TXT": "<p><b>Labels</b> <p>Labels help you to categorize conversations and prioritize them. You can assign label to a conversation from the sidepanel. <br /><br />Labels are tied to the account and can be used to create custom workflows in your organization. You can assign custom color to a label, it makes it easier to identify the label. You will be able to display the label on the sidebar to filter the conversations easily.</p>",
+    "LIST": {
+      "404": "There are no labels available in this account.",
+      "TITLE": "Manage labels",
+      "DESC": "Labels let you group the conversations together.",
+      "TABLE_HEADER": [
+        "Nazwisko",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Edytuj",
+      "CREATE": "Create",
+      "DELETE": "Usuń",
+      "CANCEL": "Anuluj"
+    },
+    "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": "Usuń",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Potwierdź usunięcie",
+        "MESSAGE": "Czy na pewno chcesz usunąć ",
+        "YES": "Tak, usuń ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/login.json b/app/javascript/dashboard/i18n/locale/pl/login.json
new file mode 100644
index 000000000..071339803
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Zaloguj się do Chatwoot",
+    "EMAIL": {
+      "LABEL": "E-mail",
+      "PLACEHOLDER": "E-mail np. someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Hasło",
+      "PLACEHOLDER": "Hasło"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Logowanie powiodło się",
+      "ERROR_MESSAGE": "Nie można połączyć się z Woot Server, spróbuj ponownie później",
+      "UNAUTH": "Nieprawidłowa nazwa użytkownika / hasło. Spróbuj ponownie"
+    },
+    "FORGOT_PASSWORD": "Zapomniałeś hasła?",
+    "CREATE_NEW_ACCOUNT": "Utwórz nowe konto",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pl/settings.json b/app/javascript/dashboard/i18n/locale/pl/settings.json
new file mode 100644
index 000000000..05d230716
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pl/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Ustawienia profilu",
+    "TITLE": "Ustawienia profilu",
+    "BTN_TEXT": "Aktualizuj profil",
+    "AFTER_EMAIL_CHANGED": "Twój profil został pomyślnie zaktualizowany, zaloguj się ponownie po zmianie danych logowania",
+    "FORM": {
+      "AVATAR": "Zdjęcie profilowe",
+      "ERROR": "Proszę naprawić błędy formularza",
+      "REMOVE_IMAGE": "Usuń",
+      "UPLOAD_IMAGE": "Prześlij obraz",
+      "UPDATE_IMAGE": "Aktualizuj obraz",
+      "PROFILE_SECTION": {
+        "TITLE": "Profil",
+        "NOTE": "Twój adres e-mail jest Twoją tożsamością i jest używany do logowania."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Hasło",
+        "NOTE": "Aktualizacja hasła spowoduje zresetowanie logowania na wielu urządzeniach."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Token dostępu",
+        "NOTE": "Ten token może być użyty, jeśli budujesz integrację opartą na API"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "Powiadomienia e-mail",
+        "NOTE": "Zaktualizuj ustawienia powiadomień e-mail tutaj",
+        "CONVERSATION_ASSIGNMENT": "Wysyłaj powiadomienia e-mail, gdy konwersacja jest przypisana do mnie",
+        "CONVERSATION_CREATION": "Wysyłaj powiadomienia e-mail po utworzeniu nowej rozmowy"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Zdjęcie profilowe"
+      },
+      "NAME": {
+        "LABEL": "Twoje imię",
+        "ERROR": "Wprowadź prawidłową nazwę",
+        "PLACEHOLDER": "Wprowadź swoje imię i nazwisko, które będzie wyświetlane w rozmowach"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Twój adres e-mail",
+        "ERROR": "Wprowadź poprawny adres e-mail",
+        "PLACEHOLDER": "Wprowadź swój adres e-mail, który będzie wyświetlany w rozmowach"
+      },
+      "PASSWORD": {
+        "LABEL": "Hasło",
+        "ERROR": "Wprowadź hasło o długości 6 lub więcej",
+        "PLACEHOLDER": "Wprowadź nowe hasło"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Potwierdź nowe hasło",
+        "ERROR": "Potwierdź hasło powinno być zgodne z hasłem",
+        "PLACEHOLDER": "Wprowadź ponownie hasło"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Ustawienia profilu",
+    "LOGOUT": "Wyloguj się"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Pobierz",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Prześlij"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Rozmowy",
+    "REPORTS": "Raporty",
+    "SETTINGS": "Ustawienia",
+    "HOME": "Home",
+    "AGENTS": "Agenci",
+    "INBOXES": "Skrzynki",
+    "CANNED_RESPONSES": "Gotowe odpowiedzi",
+    "INTEGRATIONS": "Integracje",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
index c6bca88c2..c2b8209fb 100644
--- a/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agentes",
     "HEADER_BTN_TXT": "Adicionar Agente",
     "LOADING": "Buscando lista de agente",
-    "SIDEBAR_TXT": "<p><b>Agentes</b></p> <p> Um <b>Agente</b> é membro de sua equipe de Suporte ao Cliente. </p><p> Os agentes serão capazes de ver e responder as mensagens dos seus usuários. A lista mostra todos os agentes atualmente em sua conta. </p><p> Clique em <b>Adicionar Agente</b> para adicionar um novo agente. Agente que você adicionar receberá um e-mail com um link de confirmação para ativar sua conta, após o que eles podem acessar o Chatwoot e responder às mensagens. </p><p> Acesso aos recursos do Chatwoot são baseados nas seguintes funções. </p><p> <b>Agentes</b> - Agentes com essa função só podem acessar caixas de entrada, relatórios e conversas. Eles podem atribuir conversas a outros agentes ou a eles próprios e resolver conversas.</p><p> <b>Administrador</b> - Administrador terá acesso a todos os recursos do Chatwoot ativados para sua conta, incluindo configurações e faturamento, juntamente com todos os privilégios normais dos agentes.</p>",
+    "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": [
       {
         "name": "administrator",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Adicionar agente à sua equipe",
       "DESC": "Você pode adicionar pessoas que serão capazes de lidar com o suporte de suas caixas de entrada.",
+      "CANCEL_BUTTON_TEXT": "cancelar",
       "FORM": {
         "NAME": {
           "LABEL": "Nome do Representante",
@@ -60,7 +61,7 @@
         "TITLE": "Confirmar Exclusão",
         "MESSAGE": "Tem certeza que deseja excluir ",
         "YES": "Sim, excluir ",
-        "NO": "Não, mantenha isso "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
index 9474955f2..9d8fd0096 100644
--- a/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Adicionar resposta pronta",
       "DESC": "Respostas prontas são salvas nos modelos de resposta que podem ser usados para enviar rapidamente uma resposta para a conversa.",
+      "CANCEL_BUTTON_TEXT": "cancelar",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Código curto",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Editar resposta pronta",
+      "CANCEL_BUTTON_TEXT": "cancelar",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Código curto",
@@ -67,7 +69,7 @@
         "TITLE": "Confirmar Exclusão",
         "MESSAGE": "Tem certeza que deseja excluir ",
         "YES": "Sim, excluir ",
-        "NO": "Não, mantenha isso "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/pt/contact.json b/app/javascript/dashboard/i18n/locale/pt/contact.json
index 8a409682d..056c4cd87 100644
--- a/app/javascript/dashboard/i18n/locale/pt/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Rótulos da conversa",
-      "UPDATE_BUTTON": "Atualizar Marcadores",
-      "UPDATE_ERROR": "Não foi possível atualizar os rótulos, tente novamente.",
-      "TAG_PLACEHOLDER": "Adicionar nova etiqueta",
-      "PLACEHOLDER": "Pesquisar ou adicionar um rótulo"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Não foi possível atualizar os rótulos, tente novamente."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Alterar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
index 1e986217b..c18dc7c55 100644
--- a/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Configurações da conta",
     "SUBMIT": "Atualizar configurações",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Não foi possível atualizar as configurações, tente novamente!",
       "SUCCESS": "Configurações de conta atualizadas com sucesso"
diff --git a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
index 4fca33c25..6ff9f90fe 100644
--- a/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Caixas de Entrada",
-    "SIDEBAR_TXT": "<p><b>Caixa de entrada</b></p> <p> Quando você conectar um site ou uma página de Facebook ao Chatwoot, é chamado de <b>caixa de entrada</b>. Você pode ter caixas de entrada ilimitadas na sua conta de Chatwoot. </p><p> Clique em <b>Adicionar caixa de entrada</b> para conectar um site ou uma página do Facebook. </p><p> No Painel, você pode ver todas as conversas de todas as suas caixas de entrada em um único lugar e responder a elas sob a guia `Conversations`. </p><p> Você também pode ver conversas específicas para uma caixa de entrada, clicando no nome da caixa de entrada no painel esquerdo do painel. </p>",
+    "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": "Não há caixas de entrada anexadas a esta conta."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: ao fazer login, só teremos acesso às mensagens da sua página. Suas mensagens privadas nunca poderão ser acessadas pelo Chatwoot."
+        "HELP": "PS: ao fazer login, só teremos acesso às mensagens da sua página. Suas mensagens privadas nunca poderão ser acessadas pelo 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": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' "
@@ -38,6 +44,9 @@
         "TITLE": "Canal do site",
         "DESC": "Crie um canal para seu site e comece a oferecer suporte a seus clientes através do nosso widget do site.",
         "LOADING_MESSAGE": "Criando canal de suporte ao site",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Nome do site",
           "PLACEHOLDER": "Digite o nome do seu site (por exemplo: Acme Inc)"
@@ -55,9 +64,15 @@
           "PLACEHOLDER": "Nós simplificamos nos conectar com a gente. Pergunte a nós qualquer coisa ou compartilhe seus comentários."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Mensagem Ausente dos Agentes",
+          "LABEL": "Channel greeting message",
           "PLACEHOLDER": "Acme Inc normalmente responde em algumas horas."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "ENABLED": "Ativado",
+          "DISABLED": "Desabilitado"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Cor do widget",
           "PLACEHOLDER": "Atualizar a cor do widget usada no widget"
@@ -72,6 +87,10 @@
           "PLACEHOLDER": "Por favor, insira sua Conta Twilio SID",
           "ERROR": "Este campo é obrigatório"
         },
+        "CHANNEL_TYPE": {
+          "LABEL": "Tipo de canal",
+          "ERROR": "Por favor, selecione seu tipo de canal"
+        },
         "AUTH_TOKEN": {
           "LABEL": "Token de autenticação",
           "PLACEHOLDER": "Por favor, digite seu Token de Autenticação Twilio",
@@ -87,6 +106,10 @@
           "PLACEHOLDER": "Por favor, insira o número de telefone do qual a mensagem será enviada.",
           "ERROR": "Por favor, insira um valor válido. O número de telefone deve começar com o sinal `+`."
         },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
         "SUBMIT_BUTTON": "Criar canal Twilio",
         "API": {
           "ERROR_MESSAGE": "Não fomos capazes de autenticar as credenciais Twilio, por favor, tente novamente"
@@ -145,7 +168,7 @@
         "TITLE": "Confirmar Exclusão",
         "MESSAGE": "Tem certeza que deseja excluir ",
         "YES": "Sim, excluir ",
-        "NO": "Não, mantenha isso "
+        "NO": "No, Keep "
       },
       "API": {
         "SUCCESS_MESSAGE": "Caixa de entrada excluída com sucesso",
diff --git a/app/javascript/dashboard/i18n/locale/pt/integrations.json b/app/javascript/dashboard/i18n/locale/pt/integrations.json
index 414261bac..4b21b1f2f 100644
--- a/app/javascript/dashboard/i18n/locale/pt/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Não, mantenha isso"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
new file mode 100644
index 000000000..801613806
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "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": [
+        "Nome:",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Alterar",
+      "CREATE": "Create",
+      "DELETE": "excluir",
+      "CANCEL": "cancelar"
+    },
+    "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": "excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirmar Exclusão",
+        "MESSAGE": "Tem certeza que deseja excluir ",
+        "YES": "Sim, excluir ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt/settings.json b/app/javascript/dashboard/i18n/locale/pt/settings.json
index 95d891773..d8d47942e 100644
--- a/app/javascript/dashboard/i18n/locale/pt/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt/settings.json
@@ -26,9 +26,19 @@
         "TITLE": "Notificações por e-mail",
         "NOTE": "Atualize suas preferências de notificação por e-mail aqui",
         "CONVERSATION_ASSIGNMENT": "Enviar notificações por email quando uma conversa é atribuída a mim",
-        "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa é criada",
-        "UPDATE_SUCCESS": "Suas preferências de notificação de e-mail foram atualizadas com sucesso",
-        "UPDATE_ERROR": "Ocorreu um erro ao atualizar as preferências, por favor, tente novamente"
+        "CONVERSATION_CREATION": "Enviar notificações por email quando uma nova conversa é criada"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
       },
       "PROFILE_IMAGE": {
         "LABEL": "Imagem do perfil"
@@ -38,6 +48,23 @@
         "ERROR": "Por favor, insira um nome válido",
         "PLACEHOLDER": "Por favor, insira seu nome, isto seria exibido em conversas"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Seu endereço de e-mail",
         "ERROR": "Por favor, insira um endereço de e-mail válido",
@@ -56,18 +83,44 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Configurações do perfil",
     "LOGOUT": "Desconectar"
   },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "BAIXAR",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "submeter"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
   "SIDEBAR": {
     "CONVERSATIONS": "Conversas",
-    "REPORTS": "Relatórios",
-    "SETTINGS": "Definições",
-    "HOME": "Casa",
-    "AGENTS": "Agentes",
-    "INBOXES": "Caixas de entrada",
-    "CANNED_RESPONSES": "Respostas Enlatadas",
+    "REPORTS": "relatórios",
+    "SETTINGS": "Confirgurações",
+    "HOME": "Home",
+    "AGENTS": "agentes",
+    "INBOXES": "Caixas de Entrada",
+    "CANNED_RESPONSES": "Respostas Prontas",
     "INTEGRATIONS": "Integrações",
-    "ACCOUNT_SETTINGS": "Configurações da conta"
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
index a511519ed..7003360a1 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agentes",
     "HEADER_BTN_TXT": "Adicionar Agente",
     "LOADING": "Buscando lista de agente",
-    "SIDEBAR_TXT": "<p> Um <b> Agente </b> é um membro da equipe de Suporte ao Cliente. </p> <p> Os agentes poderão visualizar e responder às mensagens dos seus usuários. A lista mostra todos os agentes de sua conta. </p> <p> Clique em <b> Adicionar agente </b> para adicionar um novo agente. O agente que você adicionar receberá um e-mail com um link de confirmação ativar a conta, e após clicar no link de ativação o Agente poderá acessar o Chatwoot. </p> <p> O acesso aos recursos do Chatwoot é baseado nos seguintes perfis: </p> <p> <b> Agente </b> - função que pode acessar apenas caixas de entrada, relatórios e conversas. Eles podem atribuir conversas a outros agentes ou a eles próprios e resolver conversas. </p> <p> <b> Administrador </b> - essa função terá acesso a todos os recursos do Chatwoot ativados para sua conta, incluindo configurações e cobrança, além de todos os dos privilégios de um agente normal. <p>",
+    "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": [
       {
         "name": "administrador",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
index 67c2e7412..d11d6155f 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Marcador da conversa",
-      "UPDATE_BUTTON": "Atualizar Marcadores",
-      "UPDATE_ERROR": "Não foi possível atualizar os marcadores, tente novamente.",
-      "TAG_PLACEHOLDER": "Adicionar novo marcador",
-      "PLACEHOLDER": "Pesquisar ou adicionar"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Não foi possível atualizar os marcadores, tente novamente."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Silenciar Contato",
+    "EDIT_LABEL": "Alterar"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
index 8d52aa666..7af731c6b 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Configurações da conta",
     "SUBMIT": "Atualizar configurações",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Não foi possível atualizar as configurações, tente novamente!",
       "SUCCESS": "Configurações de conta atualizadas com sucesso"
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
index 7198a343e..eff5e8043 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Caixas de Entrada",
-    "SIDEBAR_TXT": "<p><b> Caixa de entrada </b> </p> <p> Quando você conecta um site ou uma página do Facebook ao Chatwoot, isso é denominado como <b> Caixa de entrada </b>. Você pode ter caixas de entrada ilimitadas na sua conta do Chatwoot. </p> <p> Clique em <b> Adicionar caixa de entrada </b> para conectar um site ou uma página do Facebook. </p> <p> No <a href=\\\"/app/dashboard\\\"> Painel </a>, você pode ver todas as conversas de todas as suas caixas de entrada em um único local e responder a elas na guia Conversas. </p> <p> Você também pode ver conversas específicas para uma caixa de entrada clicando no nome da caixa de entrada no painel esquerdo do painel. </p>",
+    "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": "Não há caixas de entrada anexadas a esta conta."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "Obs: ao fazer login, apenas temos acesso às mensagens da sua página. Suas mensagens privadas nunca podem ser acessadas pelo Chatwoot."
+        "HELP": "Obs: ao fazer login, apenas temos acesso às mensagens da sua página. Suas mensagens privadas nunca podem ser acessadas pelo Chatwoot.",
+        "CHOOSE_PAGE": "Escolher Página",
+        "CHOOSE_PLACEHOLDER": "Selecione uma página da lista",
+        "INBOX_NAME": "Nome da Caixa de Entrada",
+        "ADD_NAME": "Adicione um nome para sua caixa de entrada",
+        "PICK_NAME": "Escolha Um Nome Para Sua Caixa de Entrada",
+        "PICK_A_VALUE": "Escolha um valor"
       },
       "TWITTER": {
         "HELP": "Para adicionar seu perfil do Twitter como um canal, você precisa autenticar seu perfil do Twitter clicando em 'Entrar com o Twitter' "
@@ -38,6 +44,9 @@
         "TITLE": "Canal do website",
         "DESC": "Crie um canal para seu site e comece a oferecer suporte a seus clientes através do nosso widget do site.",
         "LOADING_MESSAGE": "Criando canal de suporte ao site",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Imagem do Canal"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Nome do website",
           "PLACEHOLDER": "Informe o nome do seu site (por exemplo: Acme Inc)"
@@ -55,9 +64,15 @@
           "PLACEHOLDER": "Nós tornamos simples a conexão conosco. Pergunte qualquer assunto ou compartilhe seus comentários."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Mensagem de agente ausente",
+          "LABEL": "Channel greeting message",
           "PLACEHOLDER": "Acme Inc tipicamente retorna em algumas horas."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Enable channel greeting",
+          "HELP_TEXT": "Send a greeting message to the user when he starts the conversation.",
+          "ENABLED": "Ativado",
+          "DISABLED": "Desativado"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Cor do Widget",
           "PLACEHOLDER": "Atualize a cor do widget"
@@ -153,7 +168,7 @@
         "TITLE": "Confirmar exclusão",
         "MESSAGE": "Você tem certeza que deseja excluir ",
         "YES": "Sim, excluir ",
-        "NO": "Não, mantenha "
+        "NO": "Não, Mantenha "
       },
       "API": {
         "SUCCESS_MESSAGE": "Agente excluído com sucesso",
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
index 556fe82ff..bf0b9a448 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Não, mantenha"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
new file mode 100644
index 000000000..1f1022f74
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Não existem itens correspondentes a esta consulta",
+    "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": [
+        "Nome",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Alterar",
+      "CREATE": "Create",
+      "DELETE": "Excluir",
+      "CANCEL": "Cancelar"
+    },
+    "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": "Excluir",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirmar exclusão",
+        "MESSAGE": "Você tem certeza que deseja excluir ",
+        "YES": "Sim, excluir ",
+        "NO": "Não, Mantenha "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
index 65b7dc8e2..09bd51811 100644
--- a/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
+++ b/app/javascript/dashboard/i18n/locale/pt_BR/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Por favor, insira um nome válido",
         "PLACEHOLDER": "Por favor, insira seu nome, isto seria exibido em conversas"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Seu e-mail",
         "ERROR": "Por favor, insira um endereço de e-mail válido",
@@ -66,6 +83,8 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Trocar Conta",
+    "SELECTOR_SUBTITLE": "Selecione uma conta da lista a seguir",
     "PROFILE_SETTINGS": "Configurações do Perfil",
     "LOGOUT": "Sair"
   },
@@ -101,6 +120,7 @@
     "INBOXES": "Caixas de Entrada",
     "CANNED_RESPONSES": "Atalhos",
     "INTEGRATIONS": "Integrações",
-    "ACCOUNT_SETTINGS": "Configurações da conta"
+    "ACCOUNT_SETTINGS": "Configurações da conta",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/contact.json b/app/javascript/dashboard/i18n/locale/ro/contact.json
index 1556cfa1c..14ddb1a59 100644
--- a/app/javascript/dashboard/i18n/locale/ro/contact.json
+++ b/app/javascript/dashboard/i18n/locale/ro/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etichete conversație",
-      "UPDATE_BUTTON": "Actualizare etichete",
-      "UPDATE_ERROR": "Nu s-au putut actualiza etichetele, încercați din nou.",
-      "TAG_PLACEHOLDER": "Adaugă o etichetă nouă",
-      "PLACEHOLDER": "Caută sau adaugă o etichetă"
-    }
+      "MODAL": {
+        "TITLE": "Etichete pentru",
+        "ACTIVE_LABELS": "Etichete adăugate la conversație",
+        "INACTIVE_LABELS": "Etichete disponibile în cont",
+        "REMOVE": "Faceți clic pe pictograma X pentru a elimina eticheta",
+        "ADD": "Faceți clic pe + pictogramă pentru a adăuga eticheta",
+        "UPDATE_BUTTON": "Actualizare etichete",
+        "UPDATE_ERROR": "Nu s-au putut actualiza etichetele, încercați din nou."
+      },
+      "NO_LABELS_TO_ADD": "Nu mai sunt etichete definite în cont.",
+      "NO_AVAILABLE_LABELS": "Nu există etichete adăugate la această conversație."
+    },
+    "MUTE_CONTACT": "Oprește contactul",
+    "EDIT_LABEL": "Editare"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
index fbb62263a..a9e7194d3 100644
--- a/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Setări cont",
     "SUBMIT": "Actualizați setările",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Nu s-au putut actualiza setările, încercați din nou!",
       "SUCCESS": "Setările contului actualizate cu succes"
diff --git a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
index 581121dbb..3299bd6eb 100644
--- a/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/ro/inboxMgmt.json
@@ -1,7 +1,7 @@
 {
   "INBOX_MGMT": {
     "HEADER": "Căsuțe",
-    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> Când conectezi un site web sau o pagină de Facebook la Chatwoot, se numește <b>Inbox</b>. Poți avea inbox-uri nelimitate în contul tău din Chatwoot. </p><p> Faceţi clic pe <b>Adăugaţi Inbox</b> pentru a conecta un website sau o pagină Facebook. </p><p> În Panoul de control, poți vedea toate conversațiile din toate cutiile tale într-un singur loc și să le răspunzi sub fila `Conversations`. </p><p> De asemenea, poți vedea conversații specifice unei căsuțe poștale făcând clic pe numele inbox-ului din panoul stâng al tabloului de bord. </p>",
+    "SIDEBAR_TXT": "<p><b>Inbox</b></p> <p> Când conectezi un site web sau o pagină de Facebook la Chatwoot, se numește <b>Inbox</b>. Poți avea inbox-uri nelimitate în contul tău din Chatwoot. </p><p> Faceţi clic pe <b>Adăugaţi Inbox</b> pentru a conecta un website sau o pagină Facebook. </p><p> În tabloul de bord, poți vedea toate conversațiile din toate cutiile tale într-un singur loc și să le răspunzi sub fila `Conversations`. </p><p> De asemenea, poți vedea conversații specifice unei căsuțe poștale făcând clic pe numele inbox-ului din panoul stâng al tabloului de bord. </p>",
     "LIST": {
       "404": "Nu există căsuțe poștale atașate acestui cont."
     },
@@ -29,7 +29,13 @@
     ],
     "ADD": {
       "FB": {
-        "HELP": "PS: Prin conectare, vom avea acces doar la mesajele paginii tale. Mesajele tale private nu pot fi accesate niciodată de Chatwoot."
+        "HELP": "PS: Prin conectare, vom avea acces doar la mesajele paginii tale. Mesajele tale private nu pot fi accesate niciodată de Chatwoot.",
+        "CHOOSE_PAGE": "Alege pagina",
+        "CHOOSE_PLACEHOLDER": "Selectaţi o pagină din listă",
+        "INBOX_NAME": "Nume Inbox",
+        "ADD_NAME": "Adaugă un nume pentru inbox-ul tău",
+        "PICK_NAME": "Alege un nume pentru Inbox-ul tău",
+        "PICK_A_VALUE": "Alege o valoare"
       },
       "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\" "
@@ -38,6 +44,9 @@
         "TITLE": "Canal web",
         "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"
+        },
         "CHANNEL_NAME": {
           "LABEL": "Nume website",
           "PLACEHOLDER": "Introduceți numele website-ului dvs. (de exemplu: Acme Inc)"
@@ -55,9 +64,15 @@
           "PLACEHOLDER": "Noi facem conectarea cu noi simplă. Întreabă-ne orice, sau partajează-ți feedback-ul."
         },
         "CHANNEL_GREETING_MESSAGE": {
-          "LABEL": "Mesaj Agent Indisponibil",
+          "LABEL": "Mesaj de întâmpinare canal",
           "PLACEHOLDER": "De obicei, Acme Inc răspunde în câteva ore."
         },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "Activare salut canal",
+          "HELP_TEXT": "Trimite un mesaj de salut utilizatorului atunci când începe conversația.",
+          "ENABLED": "Activat",
+          "DISABLED": "Dezactivat"
+        },
         "WIDGET_COLOR": {
           "LABEL": "Culoare widget",
           "PLACEHOLDER": "Actualizează culoarea folosită în widget"
diff --git a/app/javascript/dashboard/i18n/locale/ro/integrations.json b/app/javascript/dashboard/i18n/locale/ro/integrations.json
index 511db3f07..3d760607c 100644
--- a/app/javascript/dashboard/i18n/locale/ro/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/ro/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Nu, păstreaza"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Şterge",
+      "API": {
+        "SUCCESS_MESSAGE": "Integrare ștearsă cu succes"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Conectează-te"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
new file mode 100644
index 000000000..7da6a484a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ro/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Etichete",
+    "HEADER_BTN_TXT": "Adăugare etichetă",
+    "LOADING": "Preluarea etichetelor",
+    "SEARCH_404": "Nu există elemente care să corespundă acestei interogări",
+    "SIDEBAR_TXT": "<p><b>Etichete</b> <p>Etichetele vă ajută să clasificați conversațiile și să le prioritizați. Poți atribui eticheta unei conversații din sidepanel. <br /><br />Etichetele sunt legate de cont și pot fi utilizate pentru a crea fluxuri de lucru personalizate în organizația dvs. Puteți atribui o culoare personalizată unei etichete, aceasta facilitează identificarea etichetei. Veți putea afișa eticheta pe bara laterală pentru a filtra ușor conversațiile.</p>",
+    "LIST": {
+      "404": "Nu există răspunsuri predefinite disponibile în acest cont.",
+      "TITLE": "Gestionați etichetele",
+      "DESC": "Etichetele vă permit să grupați conversațiile împreună.",
+      "TABLE_HEADER": [
+        "Nume",
+        "Descriere",
+        "Culoare"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Nume etichetă",
+        "PLACEHOLDER": "Nume etichetă",
+        "ERROR": "Numele etichetei este necesar"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Descriere",
+        "PLACEHOLDER": "Descriere etichetă"
+      },
+      "COLOR": {
+        "LABEL": "Culoare"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Arată eticheta în bara laterală"
+      },
+      "EDIT": "Editare",
+      "CREATE": "Creeaza",
+      "DELETE": "Şterge",
+      "CANCEL": "Renunță"
+    },
+    "ADD": {
+      "TITLE": "Adăugare etichetă",
+      "DESC": "Etichetele vă permit să grupați conversațiile împreună.",
+      "API": {
+        "SUCCESS_MESSAGE": "Etichetă adăugată cu succes",
+        "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Editează eticheta",
+      "API": {
+        "SUCCESS_MESSAGE": "Etichetă actualizată cu succes",
+        "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Şterge",
+      "API": {
+        "SUCCESS_MESSAGE": "Etichetă ștearsă cu succes",
+        "ERROR_MESSAGE": "A apărut o eroare, încercați din nou"
+      },
+      "CONFIRM": {
+        "TITLE": "Confirmă ștergerea",
+        "MESSAGE": "Sigur doriți să ștergeți ",
+        "YES": "Da, șterge ",
+        "NO": "Nu, păstreaza"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ro/settings.json b/app/javascript/dashboard/i18n/locale/ro/settings.json
index 0f8551131..49336ee3a 100644
--- a/app/javascript/dashboard/i18n/locale/ro/settings.json
+++ b/app/javascript/dashboard/i18n/locale/ro/settings.json
@@ -48,6 +48,23 @@
         "ERROR": "Te rugăm să introduci un nume valid",
         "PLACEHOLDER": "Te rugăm să introduci numele tău, care va fi folosit în conversații"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Adresa ta de email",
         "ERROR": "Vă rugăm să introduceți o adresă de e-mail validă",
@@ -103,6 +120,7 @@
     "INBOXES": "Căsuțe",
     "CANNED_RESPONSES": "Răspunsuri predefinite",
     "INTEGRATIONS": "Integrări",
-    "ACCOUNT_SETTINGS": "Setările contului"
+    "ACCOUNT_SETTINGS": "Setările contului",
+    "LABELS": "Etichete"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ru/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/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 shortcode",
+          "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/ru/chatlist.json b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/contact.json b/app/javascript/dashboard/i18n/locale/ru/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/conversation.json b/app/javascript/dashboard/i18n/locale/ru/conversation.json
new file mode 100644
index 000000000..a8758010a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Статус разговора изменен",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/generalSettings.json b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/index.js b/app/javascript/dashboard/i18n/locale/ru/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ru/integrations.json b/app/javascript/dashboard/i18n/locale/ru/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/ru/login.json b/app/javascript/dashboard/i18n/locale/ru/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/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/ru/report.json b/app/javascript/dashboard/i18n/locale/ru/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/resetPassword.json b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
new file mode 100644
index 000000000..dcf367700
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "Reset Password",
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "Пожалуйста, введите ваш email",
+      "ERROR": "Пожалуйста, введите правильный 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/ru/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/settings.json b/app/javascript/dashboard/i18n/locale/ru/settings.json
new file mode 100644
index 000000000..4c72ddbd5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Настройки профиля",
+    "TITLE": "Настройки профиля",
+    "BTN_TEXT": "Обновить профиль",
+    "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": "Удалить",
+      "UPLOAD_IMAGE": "Загрузить изображение",
+      "UPDATE_IMAGE": "Обновить изображение",
+      "PROFILE_SECTION": {
+        "TITLE": "Профиль",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Пароль",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Токен доступа",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Изображение профиля"
+      },
+      "NAME": {
+        "LABEL": "Ваше имя",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Ваш адрес электронной почты",
+        "ERROR": "Пожалуйста, введите действительный адрес электронной почты",
+        "PLACEHOLDER": "Please enter your email address, this would be displayed in conversations"
+      },
+      "PASSWORD": {
+        "LABEL": "Пароль",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Пожалуйста, введите новый пароль"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Подтвердите новый пароль",
+        "ERROR": "Подтверждение пароля должно соответствовать паролю",
+        "PLACEHOLDER": "Пожалуйста, введите пароль еще раз"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Настройки профиля",
+    "LOGOUT": "Выйти"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/signup.json b/app/javascript/dashboard/i18n/locale/ru/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ru/webhooks.json b/app/javascript/dashboard/i18n/locale/ru/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ru/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/sk/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/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 shortcode",
+          "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/sk/chatlist.json b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/contact.json b/app/javascript/dashboard/i18n/locale/sk/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/conversation.json b/app/javascript/dashboard/i18n/locale/sk/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/generalSettings.json b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/index.js b/app/javascript/dashboard/i18n/locale/sk/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/sk/integrations.json b/app/javascript/dashboard/i18n/locale/sk/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/sk/login.json b/app/javascript/dashboard/i18n/locale/sk/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/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/sk/report.json b/app/javascript/dashboard/i18n/locale/sk/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/resetPassword.json b/app/javascript/dashboard/i18n/locale/sk/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/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/sk/setNewPassword.json b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/settings.json b/app/javascript/dashboard/i18n/locale/sk/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/signup.json b/app/javascript/dashboard/i18n/locale/sk/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sk/webhooks.json b/app/javascript/dashboard/i18n/locale/sk/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sk/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
index 0b297eecd..b82f16c2e 100644
--- a/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/agentMgmt.json
@@ -3,7 +3,7 @@
     "HEADER": "Agenter",
     "HEADER_BTN_TXT": "Lägg till agentur",
     "LOADING": "Hämtar agentlista",
-    "SIDEBAR_TXT": "<p><b>Agenter</b></p> <p> En <b>Agent</b> är medlem i ditt kundsupportteam. </p><p> Agenter kommer att kunna se och svara på meddelanden från dina användare. Listan visar alla agenter som finns på ditt konto. </p><p> Klicka på <b>Add Agent</b> för att lägga till en ny agent. Agent du lägger till kommer att få ett e-postmeddelande med en bekräftelselänk för att aktivera sitt konto, varefter de kan komma åt Chatwoot och svara på meddelanden. </p><p> Åtkomst till Chatwoots funktioner baseras på följande roller. </p><p> <b>Agent</b> - Agenter med denna roll kan endast komma åt inkorgar, rapporter och konversationer. De kan tilldela samtal till andra agenter eller sig själva och lösa konversationer.</p><p> <b>Administratör</b> - Administratör kommer att ha tillgång till alla Chatwoot-funktioner som är aktiverade för ditt konto, inklusive inställningar och fakturering, tillsammans med alla normala agenters privilegier.</p>",
+    "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": [
       {
         "name": "administrator",
@@ -28,6 +28,7 @@
     "ADD": {
       "TITLE": "Lägg till agent till ditt team",
       "DESC": "Du kan lägga till personer som kommer att kunna hantera stöd för dina inkorgar.",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
       "FORM": {
         "NAME": {
           "LABEL": "Agentens namn",
@@ -60,7 +61,7 @@
         "TITLE": "Bekräfta borttagning",
         "MESSAGE": "Är du säker på att ta bort ",
         "YES": "Ja, ta bort ",
-        "NO": "Nej, behåll den "
+        "NO": "No, Keep "
       }
     },
     "EDIT": {
diff --git a/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
index b2be95843..bf4805924 100644
--- a/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
+++ b/app/javascript/dashboard/i18n/locale/sv/cannedMgmt.json
@@ -18,6 +18,7 @@
     "ADD": {
       "TITLE": "Lägg till konserverat svar",
       "DESC": "Konserverade svar sparas svarsmallar som kan användas för att snabbt skicka svar till konversation.",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kort kod",
@@ -38,6 +39,7 @@
     },
     "EDIT": {
       "TITLE": "Redigera konserverat svar",
+      "CANCEL_BUTTON_TEXT": "Avbryt",
       "FORM": {
         "SHORT_CODE": {
           "LABEL": "Kort kod",
@@ -67,7 +69,7 @@
         "TITLE": "Bekräfta borttagning",
         "MESSAGE": "Är du säker på att ta bort ",
         "YES": "Ja, ta bort ",
-        "NO": "Nej, behåll den "
+        "NO": "No, Keep "
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/sv/contact.json b/app/javascript/dashboard/i18n/locale/sv/contact.json
index 9616123a0..2bc92ca1c 100644
--- a/app/javascript/dashboard/i18n/locale/sv/contact.json
+++ b/app/javascript/dashboard/i18n/locale/sv/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Etiketter för konversation",
-      "UPDATE_BUTTON": "Uppdatera etiketter",
-      "UPDATE_ERROR": "Kunde inte uppdatera etiketter, försök igen.",
-      "TAG_PLACEHOLDER": "Lägg till ny etikett",
-      "PLACEHOLDER": "Sök eller lägg till en etikett"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Redigera"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/generalSettings.json b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
new file mode 100644
index 000000000..14e638a2c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "Kontoinställningar",
+    "SUBMIT": "Uppdatera inställningar",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "Kunde inte uppdatera inställningar, försök igen!",
+      "SUCCESS": "Uppdaterade kontoinställningar"
+    },
+    "FORM": {
+      "ERROR": "Vänligen åtgärda formulärfel",
+      "GENERAL_SECTION": {
+        "TITLE": "Allmänna inställningar",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "Konto namn",
+        "PLACEHOLDER": "Ditt kontonamn",
+        "ERROR": "Ange ett giltigt kontonamn"
+      },
+      "LANGUAGE": {
+        "LABEL": "Webbplatsens språk (Beta)",
+        "PLACEHOLDER": "Ditt kontonamn",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Aktiverad",
+          "DISABLED": "Inaktiverad"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
new file mode 100644
index 000000000..e310841d0
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "Inkorgar",
+    "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": "Det finns inga inkorgar kopplade till detta konto."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Välj kanal",
+        "route": "settings_inbox_new",
+        "body": "Välj den leverantör du vill integrera med Chatwoot."
+      },
+      {
+        "title": "Skapa inkorg",
+        "route": "settings_inboxes_page_channel",
+        "body": "Autentisera ditt konto och skapa en inkorg."
+      },
+      {
+        "title": "Lägg till agenter",
+        "route": "settings_inboxes_add_agents",
+        "body": "Lägg till agenter till den skapade inkorgen."
+      },
+      {
+        "title": "Voila!",
+        "route": "settings_inbox_finish",
+        "body": "Ni är alla redo att gå!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "PS: Genom att logga in får vi bara tillgång till din Sidas meddelanden. Dina privata meddelanden kan aldrig nås av 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": "För att lägga till din Twitter-profil som en kanal måste du autentisera din Twitter-profil genom att klicka på \"Logga in med Twitter\" "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Webbplatsens kanal",
+        "DESC": "Skapa en kanal för din webbplats och börja stödja dina kunder via vår hemsida widget.",
+        "LOADING_MESSAGE": "Skapar supportkanal för webbplats",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Webbplatsens namn",
+          "PLACEHOLDER": "Ange ditt webbplatsnamn (t.ex. Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Webbplatsens domän",
+          "PLACEHOLDER": "Ange din webbplatsdomän (t.ex. acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "Välkomstrubrik",
+          "PLACEHOLDER": "Hej där!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "Välkommen Tagline",
+          "PLACEHOLDER": "Vi gör det enkelt att få kontakt med oss. Fråga oss något, eller dela din 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 user when he starts the conversation.",
+          "ENABLED": "Aktiverad",
+          "DISABLED": "Inaktiverad"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Widget färg",
+          "PLACEHOLDER": "Uppdatera widgetens färg som används i widget"
+        },
+        "SUBMIT_BUTTON": "Skapa inkorg"
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/Whatsapp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "ACCOUNT_SID": {
+          "LABEL": "Konto SID",
+          "PLACEHOLDER": "Ange ditt Twilio-konto SID",
+          "ERROR": "Detta fält är tvingande"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Auth token",
+          "PLACEHOLDER": "Ange din Twilio Auth Token",
+          "ERROR": "Detta fält är tvingande"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Kanalnamn",
+          "PLACEHOLDER": "Ange ett kanalnamn",
+          "ERROR": "Detta fält är tvingande"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Telefonnummer",
+          "PLACEHOLDER": "Ange telefonnummer från vilket meddelande som ska skickas.",
+          "ERROR": "Ange ett giltigt värde. Telefonnummer bör börja med `+`-tecken."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Skapa Twilio kanal",
+        "API": {
+          "ERROR_MESSAGE": "Vi kunde inte autentisera Twilio autentiseringsuppgifter, försök igen"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Kanaler",
+        "DESC": "För närvarande stöder vi Webbplats live chat widgets, Facebook-sidor och Twitter-profiler som plattformar. Vi har fler plattformar som Whatsapp, e-post, Telegram och Linje i verken, som kommer ut snart."
+      },
+      "AGENTS": {
+        "TITLE": "Agenter",
+        "DESC": "Här kan du lägga till agenter för att hantera din nyskapade inkorg. Endast dessa utvalda agenter har tillgång till din inkorg. Agenter som inte är en del av denna inkorg kommer inte att kunna se eller svara på meddelanden i denna inkorg när de loggar in. <br> <b>PS:</b> Som administratör om du behöver åtkomst till alla inkorgar, du bör lägga till dig själv som agent till alla inkorgar som du skapar."
+      },
+      "DETAILS": {
+        "TITLE": "Inkorg Detaljer",
+        "DESC": "Från rullgardinsmenyn nedan, välj den Facebook-sida du vill ansluta till Chatwoot. Du kan också ge ett anpassat namn till din inkorg för bättre identifiering."
+      },
+      "FINISH": {
+        "TITLE": "Spikade det!",
+        "DESC": "Du har framgångsrikt integrerat din Facebook-sida med Chatwoot. Nästa gång en kund meddelar din sida kommer konversationen automatiskt att visas på din inkorg.<br>Vi ger dig också en widget skript som du enkelt kan lägga till din webbplats. När detta är live på din webbplats, kunder kan meddela dig direkt från din webbplats utan hjälp av något externt verktyg och konversationen kommer att visas här på Chatwoot.<br>Cool, va? Tja, vi försöker säkert att vara :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Autentiserar dig med Facebook...",
+      "ERROR_FB_AUTH": "Något gick fel, vänligen uppdatera sidan...",
+      "CREATING_CHANNEL": "Skapar din inkorg...",
+      "TITLE": "Konfigurera Inkorg Detaljer",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Lägg till agenter",
+      "ADD_AGENTS": "Lägger till agenter i din inkorg..."
+    },
+    "FINISH": {
+      "TITLE": "Din inkorg är redo!",
+      "MESSAGE": "Du kan nu samarbeta med dina kunder genom din nya kanal. ",
+      "BUTTON_TEXT": "Ta mig dit",
+      "WEBSITE_SUCCESS": "Du har lyckats skapa en webbplats kanal. Kopiera koden som visas nedan och klistra in den på din webbplats. Nästa gång en kund använder livechatten visas konversationen automatiskt på din inkorg."
+    },
+    "REAUTH": "Återauktorisera",
+    "VIEW": "Visa",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inkorgen har uppdaterats",
+        "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Radera",
+      "CONFIRM": {
+        "TITLE": "Bekräfta borttagning",
+        "MESSAGE": "Är du säker på att ta bort ",
+        "YES": "Ja, ta bort ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inkorgen har tagits bort",
+        "ERROR_MESSAGE": "Kunde inte ta bort inkorgen. Försök igen senare."
+      }
+    },
+    "SETTINGS": "Inställningar",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Skript för budbärare",
+      "MESSENGER_SUB_HEAD": "Placera denna knapp i din kroppstagg",
+      "INBOX_AGENTS": "Agenter",
+      "INBOX_AGENTS_SUB_TEXT": "Lägg till eller ta bort agenter från denna inkorg",
+      "UPDATE": "Uppdatera",
+      "AUTO_ASSIGNMENT": "Aktivera automatisk tilldelning",
+      "INBOX_UPDATE_TITLE": "Inkorg inställningar",
+      "INBOX_UPDATE_SUB_TEXT": "Uppdatera inställningarna för din inkorg",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Aktivera eller inaktivera automatisk tilldelning av nya konversationer till de agenter som lagts till den här inkorgen."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/index.js b/app/javascript/dashboard/i18n/locale/sv/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/sv/integrations.json b/app/javascript/dashboard/i18n/locale/sv/integrations.json
index 52f4cd100..de461328f 100644
--- a/app/javascript/dashboard/i18n/locale/sv/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/sv/integrations.json
@@ -46,9 +46,18 @@
           "TITLE": "Bekräfta borttagning",
           "MESSAGE": "Är du säker på att ta bort ",
           "YES": "Ja, ta bort ",
-          "NO": "Nej, behåll den "
+          "NO": "No, Keep it"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Radera",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
new file mode 100644
index 000000000..4afecec2b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "SEARCH_404": "Det finns inga objekt som matchar denna fråga",
+    "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": [
+        "Namn",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Redigera",
+      "CREATE": "Create",
+      "DELETE": "Radera",
+      "CANCEL": "Avbryt"
+    },
+    "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": "Radera",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Bekräfta borttagning",
+        "MESSAGE": "Är du säker på att ta bort ",
+        "YES": "Ja, ta bort ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/login.json b/app/javascript/dashboard/i18n/locale/sv/login.json
new file mode 100644
index 000000000..e99ec7a73
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "Logga in till Chatwoot",
+    "EMAIL": {
+      "LABEL": "E-post",
+      "PLACEHOLDER": "E-post t.ex.: someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "Lösenord",
+      "PLACEHOLDER": "Lösenord"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Inloggning lyckades",
+      "ERROR_MESSAGE": "Kunde inte ansluta till Woot Server, försök igen senare",
+      "UNAUTH": "Användarnamn / felaktigt lösenord. Försök igen"
+    },
+    "FORGOT_PASSWORD": "Glömt ditt lösenord?",
+    "CREATE_NEW_ACCOUNT": "Skapa nytt konto",
+    "SUBMIT": "Login"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/sv/settings.json b/app/javascript/dashboard/i18n/locale/sv/settings.json
new file mode 100644
index 000000000..08a0d55fe
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/sv/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profilens inställningar",
+    "TITLE": "Profilens inställningar",
+    "BTN_TEXT": "Uppdatera profil",
+    "AFTER_EMAIL_CHANGED": "Din profil har uppdaterats framgångsrikt, vänligen logga in igen eftersom dina inloggningsuppgifter har ändrats",
+    "FORM": {
+      "AVATAR": "Profilbild",
+      "ERROR": "Vänligen åtgärda formulärfel",
+      "REMOVE_IMAGE": "Radera",
+      "UPLOAD_IMAGE": "Ladda upp bild",
+      "UPDATE_IMAGE": "Uppdatera bild",
+      "PROFILE_SECTION": {
+        "TITLE": "Profil",
+        "NOTE": "Din e-postadress är din identitet och används för att logga in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Lösenord",
+        "NOTE": "Uppdatering av ditt lösenord skulle återställa dina inloggningar på flera enheter."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Åtkomsttoken",
+        "NOTE": "Denna token kan användas om du bygger en API-baserad integration"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "E-post aviseringar",
+        "NOTE": "Uppdatera dina e-postaviseringsinställningar här",
+        "CONVERSATION_ASSIGNMENT": "Skicka e-postmeddelanden när en konversation är tilldelad till mig",
+        "CONVERSATION_CREATION": "Skicka e-postmeddelanden när en ny konversation skapas"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profilbild"
+      },
+      "NAME": {
+        "LABEL": "Ditt namn",
+        "ERROR": "Ange ett giltigt namn",
+        "PLACEHOLDER": "Ange ditt namn, detta skulle visas i konversationer"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "Din e-postadress",
+        "ERROR": "Ange en giltig e-postadress",
+        "PLACEHOLDER": "Ange din e-postadress, detta skulle visas i konversationer"
+      },
+      "PASSWORD": {
+        "LABEL": "Lösenord",
+        "ERROR": "Ange ett lösenord av längd 6 eller mer",
+        "PLACEHOLDER": "Ange ett nytt lösenord"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Bekräfta nytt lösenord",
+        "ERROR": "Bekräfta att lösenordet måste matcha lösenordet",
+        "PLACEHOLDER": "Ange ditt lösenord igen"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profilens inställningar",
+    "LOGOUT": "Utloggning"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Hämta",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Skicka"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Konversationer",
+    "REPORTS": "Rapporter",
+    "SETTINGS": "Inställningar",
+    "HOME": "Home",
+    "AGENTS": "Agenter",
+    "INBOXES": "Inkorgar",
+    "CANNED_RESPONSES": "Konserverade svar",
+    "INTEGRATIONS": "Integrationer",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json b/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
new file mode 100644
index 000000000..838ed4b77
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "AGENT_MGMT": {
+    "HEADER": "ஏஜென்ட்கள்",
+    "HEADER_BTN_TXT": "ஏஜென்ட்களைச் சேர்க்க",
+    "LOADING": "ஏஜென்ட் பட்டியலைப் பெறபடுகிறது",
+    "SIDEBAR_TXT": "<p> <b>ஏஜென்ட்கள் </ b> </ p> <p> ஒரு <b> ஏஜென்ட் </ b> உங்கள் வாடிக்கையாளர் சேவை குழுவில் உறுப்பினராக உள்ளார். </p> <p> ஏஜென்ட்கள் உங்கள் பயனர்களிடமிருந்து வரும் செய்திகளைக் காணவும் பதிலளிக்கவும் முடியும். தற்போது உங்கள் கணக்கில் உள்ள அனைத்து ஏஜென்ட்களையும் இந்த பட்டியல் காட்டுகிறது. </p> <p> புதிய ஏஜென்ட்களைச் சேர்க்க <b> முகவரைச் சேர் </ b> என்பதைக் கிளிக் செய்யவும். நீங்கள் சேர்க்கும் ஏஜென்ட் தங்கள் கணக்கைச் செயல்படுத்த உறுதிப்படுத்தல் இணைப்பைக் கொண்ட ஈமெயிலைப் பெறுவார், அதன் பிறகு அவர்கள் சாட்வூட்டை அணுகலாம் மற்றும் செய்திகளுக்கு பதிலளிக்கலாம். </p> <p> சாட்வூட்டின் அம்சங்களுக்கான அணுகல் பின்வரும் பாத்திரங்களை அடிப்படையாகக் கொண்டது. </p> <p> <b> ஏஜென்ட் </ b> - இந்த பாத்திரத்தைக் கொண்ட ஏஜென்ட்கள் இன்பாக்ஸ்கள், அறிக்கைகள் மற்றும் உரையாடல்களை மட்டுமே அணுக முடியும். அவர்கள் மற்ற ஏஜென்ட்களுக்கோ அல்லது தங்களுக்கோ உரையாடல்களை ஒதுக்கலாம் மற்றும் உரையாடல்களை தீர்க்கலாம். </ P> <p> <b> நிர்வாகி </ b> - அமைப்புகள் உட்பட, உங்கள் கணக்கில் இயக்கப்பட்ட அனைத்து சாட்வூட் அம்சங்களுக்கும் மற்றும் இதர சாதாரண சலுகைகளும் அடங்கும்</ p>",
+    "AGENT_TYPES": [
+      {
+        "name": "administrator",
+        "label": "நிர்வாகி"
+      },
+      {
+        "name": "agent",
+        "label": "ஏஜென்ட்"
+      }
+    ],
+    "LIST": {
+      "404": "இந்த கணக்குடன் எந்த ஏஜென்ட்டும் இல்லை",
+      "TITLE": "உங்கள் அணியில் ஏஜென்ட்களை நிர்வகிக்கவும்",
+      "DESC": "உங்கள் அணியில் / ஏஜென்ட்களை நீங்கள் சேர்க்கலாம் / அகற்றலாம்.",
+      "NAME": "பெயர்",
+      "EMAIL": "ஈ-மெயில்",
+      "STATUS": "நிலை",
+      "ACTIONS": "செயல்கள்",
+      "VERIFIED": "சரிபார்க்கப்பட்டது",
+      "VERIFICATION_PENDING": "சரிபார்ப்பு நிலுவையில் உள்ளது"
+    },
+    "ADD": {
+      "TITLE": "உங்கள் குழுவில் ஏஜெண்டைச் சேர்க்கவும்",
+      "DESC": "உங்கள் இன்பாக்ஸிற்கான சேவையைக் கையாளக்கூடியவர்களை நீங்களே சேர்க்கலாம்.",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "FORM": {
+        "NAME": {
+          "LABEL": "ஏஜென்ட் பெயர்",
+          "PLACEHOLDER": "ஏஜென்ட்ன் பெயரை உள்ளிடவும்"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "ஏஜென்ட் வகை",
+          "PLACEHOLDER": "தயவுசெய்து ஒரு வகையைத் தேர்ந்தெடுக்கவும்",
+          "ERROR": "ஏஜென்ட் வகை தேவையானது"
+        },
+        "EMAIL": {
+          "LABEL": "ஈ-மெயில் முகவரி",
+          "PLACEHOLDER": "ஏஜெண்டின் ஈ-மெயில் முகவரியை உள்ளிடவும்"
+        },
+        "SUBMIT": "ஏஜென்ட்களைச் சேர்க்க"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "ஏஜென்ட் வெற்றிகரமாக சேர்க்கப்பட்டார்",
+        "EXIST_MESSAGE": "ஏஜென்ட் வெற்றிகரமாக சேர்க்கப்பட்டார்",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "ஏஜென்ட் வெற்றிகரமாக நீக்கப்பட்டார்",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      },
+      "CONFIRM": {
+        "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+        "YES": "ஆம், நீக்கு ",
+        "NO": "இல்லை, வைத்திரு "
+      }
+    },
+    "EDIT": {
+      "TITLE": "ஏஜெண்டில் திருத்து",
+      "FORM": {
+        "NAME": {
+          "LABEL": "ஏஜென்ட் பெயர்",
+          "PLACEHOLDER": "ஏஜென்ட்ன் பெயரை உள்ளிடவும்"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "ஏஜென்ட் வகை",
+          "PLACEHOLDER": "தயவுசெய்து ஒரு வகையைத் தேர்ந்தெடுக்கவும்",
+          "ERROR": "ஏஜென்ட் வகை தேவையானது"
+        },
+        "EMAIL": {
+          "LABEL": "ஈ-மெயில் முகவரி",
+          "PLACEHOLDER": "ஏஜெண்டின் ஈ-மெயில் முகவரியை உள்ளிடவும்"
+        },
+        "SUBMIT": "ஏஜெண்டில் திருத்து"
+      },
+      "BUTTON_TEXT": "திருத்து",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "API": {
+        "SUCCESS_MESSAGE": "ஏஜென்ட் வெற்றிகரமாக புதுப்பிக்கப்பட்டார்",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "பாஸ்வேர்ட்டை மீட்டமைக்கவும்",
+        "ADMIN_SUCCESS_MESSAGE": "பாஸ்வேர்டை மீட்டமைக்கும் வழிமுறைகள் கொண்ட ஈமெயில் ஏஜெண்ட்டுக்கு அனுப்பப்பட்டுள்ளது",
+        "SUCCESS_MESSAGE": "ஏஜென்ட் பாஸ்வேர்டு வெற்றிகரமாக மீட்டமைக்கப்பட்டது",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "ஏஜென்ட்கள் யாரும் இல்லை."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
new file mode 100644
index 000000000..d36521132
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "HEADER": "பதிவு செய்யப்பட்ட பதில்கள்",
+    "HEADER_BTN_TXT": "பதிவு செய்யப்பட்ட பதில்களை சேர்க்க",
+    "LOADING": "பதிவு செய்யப்பட்ட பதில்களைப் பெற",
+    "SEARCH_404": "இந்த கேள்விக்கு பொருந்தக்கூடியவை எதுவும் இல்லை",
+    "SIDEBAR_TXT": "<p> <b> பதிவு செய்யப்பட்ட பதில்கள் </b> </p> <p> பதிவு செய்யப்பட்ட பதில்கள் சேமிக்கப்பட்ட பதில் மாதிரிகளாக சேமிக்கப்படுகின்றன, அவை உரையாடலுக்கு விரைவாக பதிலை அனுப்ப பயன்படும். </p> <p> பதிவு செய்யப்பட்ட பதிலை உருவாக்க, <b> பதிவு செய்யப்பட்ட பதிலைச் சேர் </b> என்பதைக் கிளிக் செய்யவும். திருத்து என்பதைக் கிளிக் செய்வதன் மூலம் ஏற்கனவே உள்ள பதிவு செய்யப்பட்ட பதிலைத் திருத்தலாம் அல்லது நீக்கலாம்</p> <p> பதிவு செய்யப்பட்ட பதில்கள் <b>குறுகிய குறியீடுகள் </b> உதவியுடன் பயன்படுத்தப்படுகின்றன. அரட்டையில் இருக்கும்போது முகவர்கள் பதிவு செய்யப்பட்ட பதில்களை <b> '/' </b> எனத் தட்டச்சு செய்வதன் மூலம் குறுகிய குறியீட்டை அணுகலாம். </p>",
+    "LIST": {
+      "404": "இந்த கணக்கில் பதிவு செய்யப்பட்ட பதில்கள் எதுவும் இல்லை.",
+      "TITLE": "பதிவு செய்யப்பட்ட பதில்களை நிர்வகிக்கவும்",
+      "DESC": "பதிவு செய்யப்பட்ட பதில்கள் முன் வரையறுக்கப்பட்ட பதில் மாதிரிகள், அவை டிக்கெட்டுகளுக்கு விரைவாக பதில்களை அனுப்ப பயன்படும்.",
+      "TABLE_HEADER": [
+        "குறுகிய குறியீடு",
+        "கன்டென்ட்",
+        "செயல்கள்"
+      ]
+    },
+    "ADD": {
+      "TITLE": "பதிவு செய்யப்பட்ட பதில்களை சேர்க்க",
+      "DESC": "பதிவு செய்யப்பட்ட பதில்கள் சேமிக்கப்பட்ட பதில்கலாக மாறி உரையாடலுக்கு விரைவாக பதிலை அனுப்ப பயன்படும்.",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "குறுகிய குறியீடு",
+          "PLACEHOLDER": "ஷார்ட் கோடை உள்ளிடவும்",
+          "ERROR": "ஷார்ட் கோடு தேவை"
+        },
+        "CONTENT": {
+          "LABEL": "கன்டென்ட்",
+          "PLACEHOLDER": "கண்டென்டை பதியவும்",
+          "ERROR": "கன்டென்ட் தேவை"
+        },
+        "SUBMIT": "சமர்பிக்கவும்"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "பதிவு செய்யப்பட்ட பதில் வெற்றிகரமாக சேர்க்கப்பட்டது",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "EDIT": {
+      "TITLE": "பதிவு செய்யப்பட்ட பதிலைத் திருத்து",
+      "CANCEL_BUTTON_TEXT": "ரத்துசெய்",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "குறுகிய குறியீடு",
+          "PLACEHOLDER": "ஷார்ட் கோடை உள்ளிடவும்",
+          "ERROR": "ஷார்ட் கோடு தேவை"
+        },
+        "CONTENT": {
+          "LABEL": "கன்டென்ட்",
+          "PLACEHOLDER": "கன்டென்ட் உள்ளிடவும்",
+          "ERROR": "கன்டென்ட் தேவை"
+        },
+        "SUBMIT": "சமர்பிக்கவும்"
+      },
+      "BUTTON_TEXT": "திருத்து",
+      "API": {
+        "SUCCESS_MESSAGE": "பதிவு செய்யப்பட்ட பதில் வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "பதிவு செய்யப்பட்ட பதில் வெற்றிகரமாக நீக்கப்பட்டது",
+        "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+      },
+      "CONFIRM": {
+        "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "நீக்குவதில் உறுதியா ",
+        "YES": "ஆம்,, நீக்கவும் ",
+        "NO": "இல்லை, வைத்திரு "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/chatlist.json b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
new file mode 100644
index 000000000..5ef96a502
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "CHAT_LIST": {
+    "LOADING": "உரையாடல்களைப் பெறுகிறது",
+    "LOAD_MORE_CONVERSATIONS": "மேலும் உரையாடல்களை ஏற்றவும்",
+    "EOF": "எல்லா உரையாடல்களும் ஏற்றப்பட்டன",
+    "LIST": {
+      "404": "இந்த குழுவில் செயலில் உள்ள உரையாடல்கள் எதுவும் இல்லை."
+    },
+    "TAB_HEADING": "உரையாடல்கள்",
+    "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"
+      }
+    ],
+    "CHAT_STATUS_ITEMS": [
+      {
+        "TEXT": "திற",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "தீர்க்கப்பட்டது",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "பட செய்தி"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "ஆடியோ செய்தி"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "வீடியோ செய்தி"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "பைல் இணைப்புகள்"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "இருப்பிடம்"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "ஒரு URL ஐப் பகிர்ந்துள்ளார்"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/contact.json b/app/javascript/dashboard/i18n/locale/ta/contact.json
new file mode 100644
index 000000000..5b5bfad44
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "உரையாடல் விவரங்கள்",
+    "BROWSER": "புரவுஸர்",
+    "OS": "ஆப்பரேட்டிங் சிஸ்டம்",
+    "INITIATED_FROM": "இருந்து தொடங்கப்பட்டது",
+    "INITIATED_AT": "இல் தொடங்கப்பட்டது",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "இந்த தொடர்புடன் முந்தைய உரையாடல்கள் எதுவும் இல்லை.",
+      "TITLE": "முந்தைய உரையாடல்கள்"
+    },
+    "LABELS": {
+      "TITLE": "உரையாடல் லேபிள்கள்",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "லேபிள்களைப் புதுப்பிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "தொடர்பின் உரையாடல்களை முடக்கு",
+    "EDIT_LABEL": "திருத்து"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/conversation.json b/app/javascript/dashboard/i18n/locale/ta/conversation.json
new file mode 100644
index 000000000..f88235b28
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "இடது பலகத்தில் இருந்து உரையாடலைத் தேர்ந்தெடுக்கவும்",
+    "NO_MESSAGE_1": "அடடா! உங்கள் இன்பாக்ஸில் வாடிக்கையாளர்களிடமிருந்து செய்திகள் எதுவும் இல்லை.",
+    "NO_MESSAGE_2": " உங்கள் பக்கத்திற்கு ஒரு செய்தியை அனுப்ப!",
+    "NO_INBOX_1": "அடடே! நீங்கள் இதுவரை எந்த இன்பாக்ஸையும் சேர்க்கவில்லை.",
+    "NO_INBOX_2": " தொடங்குவதற்கு",
+    "NO_INBOX_AGENT": "அட டா! நீங்கள் எந்த இன்பாக்ஸின் பகுதியும் இல்லை என்று தெரிகிறது. உங்கள் நிர்வாகியைத் தொடர்பு கொள்ளவும்",
+    "CLICK_HERE": "இங்கே கிளிக் செய்யவும்",
+    "LOADING_INBOXES": "இன்பாக்ஸை ஏற்றுகிறது",
+    "LOADING_CONVERSATIONS": "மேலும் உரையாடல்களை ஏற்றுகிறோம்",
+    "DOWNLOAD": "பதிவிறக்கம்",
+    "HEADER": {
+      "RESOLVE_ACTION": "தீர்",
+      "REOPEN_ACTION": "மீண்டும் திற",
+      "OPEN": "மேலும்",
+      "CLOSE": "மூடு",
+      "DETAILS": "விவரங்கள்"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "புதிய வரிக்கு Shift + Enter ஐ அழுத்தவும். பதிவு செய்யப்பட்ட பதிலைத் தேர்ந்தெடுக்க '/' உடன் தொடங்கவும்.",
+      "PRIVATE_MSG_INPUT": "புதிய வரிக்கு Shift + Enter ஐ அழுத்தவும். இது ஏஜென்ட்களுக்கு மட்டுமே தெரியும்"
+    },
+    "REPLYBOX": {
+      "REPLY": "பதில்",
+      "PRIVATE_NOTE": "தனிப்பட்ட குறிப்பு",
+      "SEND": "அனுப்பு",
+      "CREATE": "குறிப்பு சேர்க்க",
+      "TWEET": "ட்வீட்"
+    },
+    "VISIBLE_TO_AGENTS": "தனிப்பட்ட குறிப்பு: உங்களுக்கும் உங்கள் குழுவினருக்கும் மட்டுமே தெரியும்",
+    "CHANGE_STATUS": "உரையாடலின் நிலை மாற்றப்பட்டது",
+    "CHANGE_AGENT": "உரையாடல் ஒதுக்கீட்டாளர் மாற்றப்பட்டார்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/generalSettings.json b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
new file mode 100644
index 000000000..8861d37bc
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "GENERAL_SETTINGS": {
+    "TITLE": "கணக்கு அமைப்புகள்",
+    "SUBMIT": "அமைப்புகளைப் புதுப்பிக்கவும்",
+    "BACK": "Back",
+    "UPDATE": {
+      "ERROR": "அமைப்புகளைப் புதுப்பிக்க முடியவில்லை, மீண்டும் முயற்சிக்கவும்!",
+      "SUCCESS": "கணக்கு அமைப்புகளை வெற்றிகரமாக புதுப்பிக்கப்பட்டுள்ளது"
+    },
+    "FORM": {
+      "ERROR": "படிவ பிழைகளை சரிசெய்யவும்",
+      "GENERAL_SECTION": {
+        "TITLE": "பொது அமைப்புகள்",
+        "NOTE": ""
+      },
+      "NAME": {
+        "LABEL": "கணக்கின் பெயர்",
+        "PLACEHOLDER": "உங்கள் கணக்கின் பெயர்",
+        "ERROR": "செல்லுபடியாகும் கணக்கு பெயரை உள்ளிடவும்"
+      },
+      "LANGUAGE": {
+        "LABEL": "தள மொழி (சோதனை பதிப்பு)",
+        "PLACEHOLDER": "உங்கள் கணக்கின் பெயர்",
+        "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "களம்",
+        "PLACEHOLDER": "உங்கள் வலைத்தள களம்",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "சேவைக்கான ஈ-மெயில் முகவரி",
+        "PLACEHOLDER": "உங்கள் நிறுவனத்தின் சேவைக்கான ஈ-மெயில் முகவரி",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "களத்தின் ஈ-மெயிலை இயக்கு",
+        "PLACEHOLDER": "தனிப்பயன் களத்தின் ஈ-மெயிலை இயக்கு",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "இயக்கப்பட்டது",
+          "DISABLED": "முடக்கப்பட்டது"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
new file mode 100644
index 000000000..86a809ab6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "INBOX_MGMT": {
+    "HEADER": "இன்பாக்ஸ்கள்",
+    "SIDEBAR_TXT": "<p> <b> இன்பாக்ஸ் <b> </p> <p> நீங்கள் ஒரு வலைத்தளம் அல்லது ஃபேஸ்புக் பக்கத்தை சாட்வூட்டுடன் இணைக்கும்போது, அது <b> இன்பாக்ஸ் <b> என அழைக்கப்படுகிறது. உங்கள் சாட்வூட் கணக்கில் வரம்பற்ற இன்பாக்ஸை வைத்திருக்க முடியும். </p> <p> ஒரு வலைத்தளம் அல்லது பேஸ்புக் பக்கத்தை இணைக்க <b> இன்பாக்ஸைச் சேர் <b> என்பதைக் கிளிக் செய்க. </p> <p> டாஷ்போர்டில், உங்கள் எல்லா இன்பாக்ஸிலிருந்தும் எல்லா உரையாடல்களையும் ஒரே இடத்தில் காணலாம் மற்றும் அவற்றுக்கு `உரையாடல்கள்` தாவலின் கீழ் பதிலளிக்கலாம். </p> <p> டாஷ்போர்டின் இடது பலகத்தில் உள்ள இன்பாக்ஸ் பெயரைக் கிளிக் செய்வதன் மூலம் இன்பாக்ஸிற்கான குறிப்பிட்ட உரையாடல்களையும் நீங்கள் காணலாம். </p>",
+    "LIST": {
+      "404": "இந்த கணக்கில் இன்பாக்ஸ்கள் எதுவும் இணைக்கப்படவில்லை."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "சேனலைத் தேர்வுசெய்யவும்",
+        "route": "settings_inbox_new",
+        "body": "நீங்கள் சாட்வூட்டுடன் ஒருங்கிணைக்க விரும்பும் வழங்குநரைத் தேர்வுசெய்யவும்."
+      },
+      {
+        "title": "இன்பாக்ஸை உருவாக்கவும்",
+        "route": "settings_inboxes_page_channel",
+        "body": "உங்கள் கணக்கை அங்கீகரித்து இன்பாக்ஸை உருவாக்கவும்."
+      },
+      {
+        "title": "ஏஜென்ட்களைச் சேர்க்கவும்",
+        "route": "settings_inboxes_add_agents",
+        "body": "உருவாக்கப்பட்ட இன்பாக்ஸில் ஏஜென்ட்களைச் சேர்க்கவும்."
+      },
+      {
+        "title": "அடடே மகிழ்ச்சி!",
+        "route": "settings_inbox_finish",
+        "body": "நீங்கள் மேற்கொண்டு பயன்படுத்தலாம்!"
+      }
+    ],
+    "ADD": {
+      "FB": {
+        "HELP": "கவனத்திற்கு: உள்நுழைவதன் மூலம், உங்கள் பக்கத்தின் செய்திகளை மட்டுமே நாங்கள் அணுகுவோம். உங்கள் தனிப்பட்ட செய்திகளை ஒருபோதும் சாட்வூட்டால் அணுக முடியாது.",
+        "CHOOSE_PAGE": "பக்கத்தைத் தேர்வுசெய்க",
+        "CHOOSE_PLACEHOLDER": "பட்டியலிலிருந்து ஒரு பக்கத்தைத் தேர்ந்தெடுக்கவும்",
+        "INBOX_NAME": "இன்பாக்ஸ் பெயர்",
+        "ADD_NAME": "உங்கள் இன்பாக்ஸுக்கு ஒரு பெயரைச் சேர்க்கவும்",
+        "PICK_NAME": "உங்கள் இன்பாக்ஸின் பெயரைத் தேர்ந்தெடுக்கவும்",
+        "PICK_A_VALUE": "மதிப்பைத் தேர்ந்தெடுங்கள்"
+      },
+      "TWITTER": {
+        "HELP": "உங்கள் ட்விட்டர் சுயவிவரத்தை ஒரு சேனலாக சேர்க்க, 'ட்விட்டருடன் உள்நுழைக' என்பதைக் கிளிக் செய்யாவும், இதன் மூலம் உங்கள் சுயவிவரத்தை ட்விட்டர் வாயிலாக அங்கீகரிக்கிறீர்கள் "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "வலைத்தள சேனல்",
+        "DESC": "உங்கள் வலைத்தளத்திற்கு ஒரு சேனலை உருவாக்கி, எங்கள் வலைத்தள விட்ஜெட் வழியாக உங்கள் வாடிக்கையாளர்களுக்கு சேவையளிக்கத் தொடங்குங்கள்.",
+        "LOADING_MESSAGE": "வலைத்தள சேவை சேனலை உருவாக்குதல்",
+        "CHANNEL_AVATAR": {
+          "LABEL": "சேனல் அவதார்"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "வலைத்தளத்தின் பெயர்",
+          "PLACEHOLDER": "உங்கள் இணையதள பெயரை உள்ளிடவும் (eg: உதாரணமாக Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "இணையதள களம்",
+          "PLACEHOLDER": "உங்கள் இணையதள களத்தை உள்ளிடவும் (eg: உதாரணமாக acme.com)"
+        },
+        "CHANNEL_WELCOME_TITLE": {
+          "LABEL": "வரவேற்பு தலைப்பு",
+          "PLACEHOLDER": "ஹாய்!"
+        },
+        "CHANNEL_WELCOME_TAGLINE": {
+          "LABEL": "வரவேற்பு டேக்லைன்",
+          "PLACEHOLDER": "எங்களுடன் இணைவதை எளிதாக்குகிறோம். இதன் மூலம் எங்களிடம் எதையும் கேட்கலாம் அல்லது உங்கள் கருத்தைப் பகிர்ந்து கொள்ளலாம்."
+        },
+        "CHANNEL_GREETING_MESSAGE": {
+          "LABEL": "சேனல் வாழ்த்து செய்தி",
+          "PLACEHOLDER": "ஆக்மி இன்க் பொதுவாக சில மணிநேரங்களில் பதிலளிக்கும்."
+        },
+        "CHANNEL_GREETING_TOGGLE": {
+          "LABEL": "சேனல் வாழ்த்தை இயக்கு",
+          "HELP_TEXT": "உரையாடலைத் தொடங்கும்போது பயனருக்கு வாழ்த்துச் செய்தியை அனுப்பவும்.",
+          "ENABLED": "இயக்கப்பட்டது",
+          "DISABLED": "முடக்கப்பட்டது"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "விட்ஜெட் நிறம்",
+          "PLACEHOLDER": "விட்ஜெட்டில் பயன்படுத்தப்படும் விட்ஜெட் நிறத்தைப் புதுப்பிக்கவும்"
+        },
+        "SUBMIT_BUTTON": "இன்பாக்ஸை உருவாக்கவும்"
+      },
+      "TWILIO": {
+        "TITLE": "ட்விலியோ எஸ்எம்எஸ் / வாட்ஸ்அப் சேனல்",
+        "DESC": "ட்விலியோவை ஒருங்கிணைத்து, எஸ்எம்எஸ் அல்லது வாட்ஸ்அப் வழியாக உங்கள் வாடிக்கையாளர்களுக்கு சேவை வழங்க தொடங்குங்கள்.",
+        "ACCOUNT_SID": {
+          "LABEL": "கணக்கின் SID",
+          "PLACEHOLDER": "உங்கள் ட்விலியோ கணக்கின் SID ஐ உள்ளிடவும்",
+          "ERROR": "இந்த புலம் தேவை"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "சேனல் வகை",
+          "ERROR": "உங்கள் சேனல் வகையைத் தேர்ந்தெடுக்கவும்"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "அங்கீகார டோக்கன்",
+          "PLACEHOLDER": "உங்கள் ட்விலியோ அங்கீகார டோக்கனை உள்ளிடவும்",
+          "ERROR": "இந்த புலம் தேவை"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "சேனலின் பெயர்",
+          "PLACEHOLDER": "சேனலின் பெயரை உள்ளிடவும்",
+          "ERROR": "இந்த புலம் தேவை"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "தொலைபேசி எண்",
+          "PLACEHOLDER": "செய்தி அனுப்பப்படும் தொலைபேசி எண்ணை உள்ளிடவும்.",
+          "ERROR": "சரியான நம்பரை உள்ளிடவும். தொலைபேசி எண் `+` அடையாளத்துடன் தொடங்க வேண்டும்."
+        },
+        "API_CALLBACK": {
+          "TITLE": "கால்பேக் URL",
+          "SUBTITLE": "இங்கே குறிப்பிடப்பட்டுள்ள URL உடன் ட்விலியோவில் கால்பேக் URL ஐ நீங்கள் கட்டமைக்க வேண்டும்."
+        },
+        "SUBMIT_BUTTON": "ட்விலியோ சேனலை உருவாக்கவும்",
+        "API": {
+          "ERROR_MESSAGE": "ட்விலியோ கிரேடின்டியல்செய் எங்களால் அங்கீகரிக்க முடியவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்"
+        }
+      },
+      "AUTH": {
+        "TITLE": "சேனல்கள்",
+        "DESC": "தற்போது வலைத்தள நேரடி சாட் விட்ஜெட்டுகள், பேஸ்புக் பக்கங்கள் மற்றும் ட்விட்டர் சுயவிவரங்களை தளங்களாக ஆதரிக்கிறோம். விரைவில் வாட்ஸ்அப், ஈ-மெயில், டெலிகிராம் மற்றும் லைன் போன்ற பல தளங்களிலும் வர இருக்கிறது."
+      },
+      "AGENTS": {
+        "TITLE": "ஏஜென்ட்கள்",
+        "DESC": "புதிதாக உருவாக்கப்பட்ட இன்பாக்ஸை நிர்வகிக்க ஏஜெண்டுகளை இங்கே சேர்க்கலாம். தேர்ந்தெடுக்கப்பட்ட ஏஜெண்டுகளுக்கு மட்டுமே உங்கள் இன்பாக்ஸிற்கான அணுகல் இருக்கும். இந்த இன்பாக்ஸின் பகுதியாக இல்லாத ஏஜெண்டுகள் உள்நுழையும்போது இந்த இன்பாக்ஸில் உள்ள செய்திகளைக் காணவோ அல்லது பதிலளிக்கவோ முடியாது. <br> <b> கவனத்திற்கு: </b> ஒரு நிர்வாகியாக, உங்களுக்கு எல்லா இன்பாக்ஸுக்கும் அணுகல் தேவைப்பட்டால், நீங்கள் உருவாக்கும் அனைத்து இன்பாக்ஸுக்கும் உங்களை ஏஜெண்டாக சேர்க்க வேண்டும்."
+      },
+      "DETAILS": {
+        "TITLE": "இன்பாக்ஸ் விவரங்கள்",
+        "DESC": "இங்கேயுள்ள ட்ராப்டௌனில் இருந்து, நீங்கள் சாட்வூட்டுடன் இணைக்க விரும்பும் பேஸ்புக் பக்கத்தைத் தேர்ந்தெடுக்கவும். சிறந்த அடையாளம் காண உங்கள் இன்பாக்ஸுக்கு தனியானதொரு பெயரை கொடுக்கவும்."
+      },
+      "FINISH": {
+        "TITLE": "சரியாக செய்தீர்கள்!",
+        "DESC": "உங்கள் பேஸ்புக் பக்கத்தை சாட்வூட்டுடன் வெற்றிகரமாக ஒருங்கிணைத்து விட்டீர்கள். அடுத்த முறை ஒரு வாடிக்கையாளர் உங்கள் பக்கத்திற்கு செய்தி அனுப்பும்போது, உரையாடல் தானாகவே உங்கள் இன்பாக்ஸில் தோன்றும். <br> உங்கள் வலைத்தளத்திற்கு நீங்கள் எளிதாகச் சேர்க்கக்கூடிய விட்ஜெட் ஸ்கிரிப்டையும் நாங்கள் உங்களுக்கு வழங்குகிறோம். இது உங்கள் வலைத்தளத்தில் நேரலையில் வந்தவுடன், வாடிக்கையாளர்கள் எந்தவொரு வெளிப்புற கருவியின் உதவியும் இல்லாமல் உங்கள் வலைத்தளத்திலிருந்தே உங்களுக்கு செய்தி அனுப்பலாம், மேலும் உரையாடல் சாட்வூட்டில் இங்கேயே தோன்றும். <br> கூல், இல்லையா? சரி, நாங்கள் நிச்சயமாக இருக்க முயற்சிக்கிறோம் :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "பேஸ்புக் மூலம் உங்களை அங்கீகரிக்கிறது...",
+      "ERROR_FB_AUTH": "ஏதோ தவறு ஏற்பட்டது, தயவுசெய்து பக்கத்தைப் புதுப்பிக்கவும்...",
+      "CREATING_CHANNEL": "உங்கள் இன்பாக்ஸை உருவாக்குகிறது...",
+      "TITLE": "இன்பாக்ஸ் விவரங்களை உள்ளமைக்கவும்",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "ஏஜென்ட்களைச் சேர்க்க",
+      "ADD_AGENTS": "உங்கள் இன்பாக்ஸில் ஏஜெண்டுகளை சேர்க்கிறது..."
+    },
+    "FINISH": {
+      "TITLE": "உங்கள் இன்பாக்ஸ் தயாராக உள்ளது!",
+      "MESSAGE": "உங்கள் புதிய சேனல் மூலம் இப்போது உங்கள் வாடிக்கையாளர்களுடன் ஈடுபடலாம். மகிழ்ச்சியாய் ஆதரவு அளியுங்கள் ",
+      "BUTTON_TEXT": "என்னை அங்கே அழைத்துச் செல்லுங்கள்",
+      "WEBSITE_SUCCESS": "வலைத்தள சேனலை உருவாக்குவதை வெற்றிகரமாக முடித்துவிட்டீர்கள். கீழே காட்டப்பட்டுள்ள உங்கள் இணையதளத்தில் ஒட்டவும். அடுத்த முறை வாடிக்கையாளர் நேரடி சாட்டை பயன்படுத்தும்போது, உரையாடல் தானாகவே உங்கள் இன்பாக்ஸில் தோன்றும்."
+    },
+    "REAUTH": "மறு அங்கீகாரம்",
+    "VIEW": "காண்க",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "இன்பாக்ஸ் அமைப்புகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "தானியங்கு பணி வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
+        "ERROR_MESSAGE": "விட்ஜெட் நிறத்தை புதுப்பிக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "இயக்கப்பட்டது",
+        "DISABLED": "முடக்கப்பட்டது"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+        "YES": "ஆம், நீக்கு ",
+        "NO": "இல்லை, வைத்திரு "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "இன்பாக்ஸ் வெற்றிகரமாக நீக்கப்பட்டது",
+        "ERROR_MESSAGE": "இன்பாக்ஸை நீக்க முடியவில்லை. மீண்டும் முயற்சிக்கவும்."
+      }
+    },
+    "SETTINGS": "அமைப்புகள்",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "மெசஞ்சர் ஸ்கிரிப்ட்",
+      "MESSENGER_SUB_HEAD": "இந்த பொத்தானை உங்கள் பாடி டேகுக்குள் வைக்கவும்",
+      "INBOX_AGENTS": "ஏஜென்ட்கள்",
+      "INBOX_AGENTS_SUB_TEXT": "இந்த இன்பாக்ஸிலிருந்து ஏஜென்ட்களைச் சேர்க்கவும் அல்லது அகற்றவும்",
+      "UPDATE": "புதுப்பிப்பு",
+      "AUTO_ASSIGNMENT": "தானாக ஒதுக்கீட்டை இயக்கு",
+      "INBOX_UPDATE_TITLE": "இன்பாக்ஸ் அமைப்புகள்",
+      "INBOX_UPDATE_SUB_TEXT": "உங்கள் இன்பாக்ஸ் அமைப்புகளைப் புதுப்பிக்கவும்",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "இந்த இன்பாக்ஸில் சேர்க்கப்பட்ட ஏஜென்ட்களுக்கு புதிய உரையாடல்களின் தானியங்கி ஒதுக்கீட்டை இயக்கவும் அல்லது முடக்கவும்."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/index.js b/app/javascript/dashboard/i18n/locale/ta/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/ta/integrations.json b/app/javascript/dashboard/i18n/locale/ta/integrations.json
new file mode 100644
index 000000000..d568d25ef
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "சேர்ப்புகள்",
+    "WEBHOOK": {
+      "TITLE": "வெப்ஹூக்",
+      "CONFIGURE": "உள்ளமைக்கவும்",
+      "HEADER": "வெப்ஹூக் அமைப்புகள்",
+      "HEADER_BTN_TXT": "புதிய வெப்ஹூக் சேர்க்கவும்",
+      "INTEGRATION_TXT": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. ஸ்லாக் அல்லது கிட் ஹப் போன்ற உங்களுக்கு பிடித்த ஆப்புகளுடன் நிகழ்வுகளைத் தொடர்புகொள்வதற்கு நீங்கள் வெப்ஹூக்குகளைப் பயன்படுத்தலாம். உங்கள் வெப்ஹூக்குகளை அமைக்க இங்கே கிளிக் செய்யவும்.",
+      "LOADING": "இணைக்கப்பட்ட வெப்ஹூக்குகளைப் பெறுகிறது",
+      "SEARCH_404": "இந்த கேள்விக்கு பொருந்தக்கூடியவை எதுவும் இல்லை",
+      "SIDEBAR_TXT": "<p> <b> வெப்ஹூக்ஸ் </ b> </p> <p> வெப்ஹூக்குகள் என்பது HTTP கால்பேக்குகள், அவை ஒவ்வொரு கணக்கிற்கும் வரையறுக்கப்படலாம். சாட்வூட்டில் செய்தி உருவாக்கம் போன்ற நிகழ்வுகளால் அவை தூண்டப்படுகின்றன. இந்தக் கணக்கிற்கு ஒன்றுக்கு மேற்பட்ட வெப்ஹூக்கை உருவாக்கலாம். <br /> <br /> ஒரு <b> வெப்ஹூக்கை உருவாக்க </ b>, <b> புதிய வெப்ஹூக்கைச் சேர் </ b> பொத்தானைக் கிளிக் செய்க. நீக்கு பொத்தானைக் கிளிக் செய்வதன் மூலம் நீங்கள் ஏற்கனவே இருக்கும் எந்த வெப்ஹூக்கையும் அகற்றலாம். </ P>",
+      "LIST": {
+        "404": "இந்த கணக்கிற்கு எந்த வெப்ஹூக்கும் அமைக்கப்படவில்லை.",
+        "TITLE": "வெப்ஹூக்குகளை நிர்வகிக்க",
+        "DESC": "வெப்ஹூக்குகள் முன் வரையறுக்கப்பட்ட பதில் மாதிரிகள், அவை டிக்கெட்டுகளுக்கு விரைவாக பதில்களை அனுப்ப பயன்படும்.",
+        "TABLE_HEADER": [
+          "வெப்ஹூக் எண்டு பாயிண்ட்",
+          "செயல்கள்"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "ரத்துசெய்",
+        "TITLE": "புதிய வெப்ஹூக் சேர்க்கவும்",
+        "DESC": "உங்கள் சாட்வூட் கணக்கில் என்ன நடக்கிறது என்பது குறித்த நிகழ்நேர தகவல்களை வெப்ஹூக் நிகழ்வுகள் உங்களுக்கு வழங்குகின்றன. மீட்டமைக்க சரியான URL ஐ உள்ளிடவும்.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "வெப்ஹூக் URL",
+            "PLACEHOLDER": "உதாரணமாக: https://example/api/webhook",
+            "ERROR": "சரியான URL ஐ பதிவிடவும்"
+          },
+          "SUBMIT": "வெப்ஹூக்கை உருவாக்கவும்"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "வெப்ஹூக் வெற்றிகரமாக சேர்க்கப்பட்டது",
+          "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "வெப்ஹூக் வெற்றிகரமாக நீக்கப்பட்டது",
+          "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+        },
+        "CONFIRM": {
+          "TITLE": "நீக்குதலை உறுதிப்படுத்தவும்",
+          "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+          "YES": "ஆம், நீக்கு ",
+          "NO": "இல்லை, அதை வைத்திரு"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
new file mode 100644
index 000000000..c450c0596
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "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": [
+        "பெயர்",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "திருத்து",
+      "CREATE": "Create",
+      "DELETE": "Delete",
+      "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": "நீக்குதலை உறுதிப்படுத்தவும்",
+        "MESSAGE": "நீக்குவதில் உறுதியாக உள்ளீர்களா ",
+        "YES": "ஆம், நீக்கு ",
+        "NO": "இல்லை, வைத்திரு "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/login.json b/app/javascript/dashboard/i18n/locale/ta/login.json
new file mode 100644
index 000000000..532fd0d0c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/login.json
@@ -0,0 +1,21 @@
+{
+  "LOGIN": {
+    "TITLE": "சாட்வூட்டில் உள்நுழையவும்",
+    "EMAIL": {
+      "LABEL": "இமெயில்",
+      "PLACEHOLDER": "இமெயில் எ.கா:someone@example.com"
+    },
+    "PASSWORD": {
+      "LABEL": "பாஸ்வேர்ட்",
+      "PLACEHOLDER": "பாஸ்வேர்ட்"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "வெற்றிகரமான உள்நுழைவு",
+      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்",
+      "UNAUTH": "பயனர்பெயர் / பாஸ்வேர்டு தவறானது. தயவு செய்து மீண்டும் முயற்சிக்கவும்"
+    },
+    "FORGOT_PASSWORD": "உங்கள் பாஸ்வேர்ட்டை மறந்துவிட்டதா?",
+    "CREATE_NEW_ACCOUNT": "புதிய கணக்கை உருவாக்க",
+    "SUBMIT": "உள்நுழையவும்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/report.json b/app/javascript/dashboard/i18n/locale/ta/report.json
new file mode 100644
index 000000000..60295de85
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "அறிக்கைகள்",
+    "LOADING_CHART": "சார்ட்டுக்கான டேட்டாவை பெறுகிறது...",
+    "NO_ENOUGH_DATA": "அறிக்கையை உருவாக்க போதுமான தரவுகளை பெறவில்லை, தயவுசெய்து மீண்டும் முயற்சிக்கவும்.",
+    "METRICS": [
+      {
+        "NAME": "உரையாடல்கள்",
+        "KEY": "conversations_count",
+        "DESC": "( மொத்தம் )"
+      },
+      {
+        "NAME": "உள்வரும் செய்திகள்",
+        "KEY": "incoming_messages_count",
+        "DESC": "( மொத்தம் )"
+      },
+      {
+        "NAME": "வெளிச்செல்லும் செய்திகள்",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( மொத்தம் )"
+      },
+      {
+        "NAME": "முதல் பதில் வழங்க எடுத்துக்கொண்ட நேரம்",
+        "KEY": "avg_first_response_time",
+        "DESC": "(சராசரி)"
+      },
+      {
+        "NAME": "தீர்வு வழங்க எடுத்துக்கொண்ட நேரம்",
+        "KEY": "avg_resolution_time",
+        "DESC": "(சராசரி)"
+      },
+      {
+        "NAME": "தீர்மான எண்ணிக்கை",
+        "KEY": "resolutions_count",
+        "DESC": "( மொத்தம் )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "கடந்த 7 நாட்கள்"
+      },
+      {
+        "id": 1,
+        "name": "கடந்த 30 நாட்கள்"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/resetPassword.json b/app/javascript/dashboard/i18n/locale/ta/resetPassword.json
new file mode 100644
index 000000000..7d3dc9bc6
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/resetPassword.json
@@ -0,0 +1,15 @@
+{
+  "RESET_PASSWORD": {
+    "TITLE": "பாஸ்வேர்ட்டை மீட்டமைக்க",
+    "EMAIL": {
+      "LABEL": "ஈ-மெயில்",
+      "PLACEHOLDER": "உங்கள் இமெயில் முகவரியை பதிவிடவும்",
+      "ERROR": "சரியான இமெயில் முகவரியை பதிவிடவும்"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "பாஸ்வேர்டை மீட்டமைக்கும் இணைப்பு உங்கள் ஈ-மெயிலுக்கு அனுப்பப்பட்டுள்ளது",
+      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+    },
+    "SUBMIT": "சமர்பிக்கவும்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
new file mode 100644
index 000000000..d3be57b80
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "புதிய பாஸ்வேர்ட்டை அமைக்கவும்",
+    "PASSWORD": {
+      "LABEL": "பாஸ்வேர்ட்",
+      "PLACEHOLDER": "பாஸ்வேர்ட்",
+      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+      "PLACEHOLDER": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+      "ERROR": "பாஸ்வேர்டுகள் பொருந்தவில்லை"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "பாஸ்வேர்டு வெற்றிகரமாக மாற்றப்பட்டது",
+      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+    },
+    "SUBMIT": "சமர்பிக்கவும்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/settings.json b/app/javascript/dashboard/i18n/locale/ta/settings.json
new file mode 100644
index 000000000..0f5e99634
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "சுயவிவர அமைப்புகள்",
+    "TITLE": "சுயவிவர அமைப்புகள்",
+    "BTN_TEXT": "சுயவிவரத்தைப் புதுப்பிக்க",
+    "AFTER_EMAIL_CHANGED": "உங்கள் சுயவிவரம் வெற்றிகரமாக புதுப்பிக்கப்பட்டது, உங்கள் உள்நுழைவு சான்றுகள் மாற்றப்பட்டதால் மீண்டும் உள்நுழையவும்",
+    "FORM": {
+      "AVATAR": "சுயவிவர படம்",
+      "ERROR": "படிவ பிழைகளை சரிசெய்யவும்",
+      "REMOVE_IMAGE": "நீக்கு",
+      "UPLOAD_IMAGE": "படத்தை பதிவேற்றம் செய்யவும்",
+      "UPDATE_IMAGE": "படத்தைப் புதுப்பிக்கவும்",
+      "PROFILE_SECTION": {
+        "TITLE": "சுயவிவரம்",
+        "NOTE": "உங்கள் ஈ-மெயில் முகவரியே உங்கள் அடையாளம் மற்றும் உள்நுழையவும் பயன்படுகிறது."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "பாஸ்வேர்ட்",
+        "NOTE": "உங்கள் பாஸ்வேர்டைப் புதுப்பிப்பது உங்கள் உள்நுழைவுகளை பல சாதனங்களில் மீட்டமைக்கும்."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "அணுகுவதற்கான டோக்கன்",
+        "NOTE": "நீங்கள் API அடிப்படையிலான ஒருங்கிணைப்பை உருவாக்கினால் இந்த டோக்கனைப் பயன்படுத்தலாம்"
+      },
+      "EMAIL_NOTIFICATIONS_SECTION": {
+        "TITLE": "ஈமெயில் வழியான அறிவிப்புகள்",
+        "NOTE": "உங்கள் ஈமெயில் வழியான அறிவிப்பு தொடர்பான விருப்பங்களை இங்கே புதுப்பிக்கவும்",
+        "CONVERSATION_ASSIGNMENT": "ஒரு உரையாடல் எனக்கு ஒதுக்கப்பட்டால் ஈமெயிலில் அறிவிப்புகளை அனுப்பவும்",
+        "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது ஈ-மெயிலில் அறிவிப்புகளை அனுப்பவும்"
+      },
+      "API": {
+        "UPDATE_SUCCESS": "உங்களின் அறிவிப்பு விருப்பத்தேர்வுகள் வெற்றிகரமாக புதுப்பிக்கப்பட்டன",
+        "UPDATE_ERROR": "விருப்பங்களை புதுப்பிக்கும்போது பிழை ஏற்பட்டுள்ளது, தயவுசெய்து மீண்டும் முயற்சிக்கவும்"
+      },
+      "PUSH_NOTIFICATIONS_SECTION": {
+        "TITLE": "புஷ் அறிவிப்புகள்",
+        "NOTE": "உங்கள் புஷ் அறிவிப்பு விருப்பங்களை இங்கே புதுப்பிக்கவும்",
+        "CONVERSATION_ASSIGNMENT": "ஒரு உரையாடல் எனக்கு ஒதுக்கப்படும் போது புஷ் அறிவிப்புகளை அனுப்பவும்",
+        "CONVERSATION_CREATION": "புதிய உரையாடல் உருவாக்கப்படும்போது புஷ் அறிவிப்புகளை அனுப்பவும்",
+        "HAS_ENABLED_PUSH": "இந்த பிரௌசருக்கான புஷ் அறிவிப்புகளை இயக்கியுள்ளீர்கள்.",
+        "REQUEST_PUSH": "புஷ் அறிவிப்புகளை இயக்கு"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "சுயவிவர படம்"
+      },
+      "NAME": {
+        "LABEL": "உங்கள் பெயர்",
+        "ERROR": "செல்லுபடியாகும் பெயரை உள்ளிடவும்",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
+      "EMAIL": {
+        "LABEL": "உங்கள் ஈ-மெயில் முகவரி",
+        "ERROR": "சரியான ஈமெயில் முகவரியை பதிவிடவும்",
+        "PLACEHOLDER": "தயவுசெய்து உங்கள் ஈ-மெயில் முகவரியை உள்ளிடவும், இது உரையாடல்களில் காண்பிக்கப்படும்"
+      },
+      "PASSWORD": {
+        "LABEL": "பாஸ்வேர்ட்",
+        "ERROR": "6 அல்லது அதற்கு மேற்பட்ட நீள பாஸ்வேர்டை உள்ளிடவும்",
+        "PLACEHOLDER": "புதிய பாஸ்வேர்டை உள்ளிடவும்"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "புதிய பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+        "ERROR": "பாஸ்வேர்டு ஒன்றோடு ஒன்று ஒத்துபோகும்படி இருக்கிறதா என்பதை உறுதிப்படுத்தவும்",
+        "PLACEHOLDER": "உங்கள் பாஸ் வேர்டை மீண்டும் உள்ளிடவும்"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "கணக்கை மாற்றவும்",
+    "SELECTOR_SUBTITLE": "பின்வரும் பட்டியலிலிருந்து ஒரு கணக்கைத் தேர்ந்தெடுக்கவும்",
+    "PROFILE_SETTINGS": "சுயவிவர அமைப்புகள்",
+    "LOGOUT": "வெளியேறு"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "நாட்கள் சோதனை மீதமுள்ளது.",
+    "TRAIL_BUTTON": "இப்போது வாங்க"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "நகல்",
+      "COPY_SUCCESSFUL": "குறியீடு கிளிப்போர்டில் வெற்றிகரமாக காப்பி செய்யப்பட்டது"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "பதிவிறக்கம்",
+      "UPLOADING": "பதிவேறுகிறது..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "சமர்பிக்கவும்"
+    }
+  },
+  "CONFIRM_EMAIL": "சரிபார்க்கிறது...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "இன்பாக்ஸைச் சேர்க்க"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "உரையாடல்கள்",
+    "REPORTS": "அறிக்கைகள்",
+    "SETTINGS": "அமைப்புகள்",
+    "HOME": "முகப்பு",
+    "AGENTS": "ஏஜென்ட்கள்",
+    "INBOXES": "இன்பாக்ஸ்கள்",
+    "CANNED_RESPONSES": "பதிவு செய்யப்பட்ட பதில்கள்",
+    "INTEGRATIONS": "சேர்ப்புகள்",
+    "ACCOUNT_SETTINGS": "கணக்கின் அமைப்புகள்",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/signup.json b/app/javascript/dashboard/i18n/locale/ta/signup.json
new file mode 100644
index 000000000..ede0ed9b3
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/signup.json
@@ -0,0 +1,32 @@
+{
+  "REGISTER": {
+    "TRY_WOOT": "சமர்ப்பிக்கவும்",
+    "TITLE": "பதியவும்",
+    "TERMS_ACCEPT": "பதிவுபெறுவதன் மூலம், எங்கள் <a href=\"https://www.chatwoot.com/terms\"> விதிமுறைகள் மற்றும் நிபந்தனைகள், மற்றும் <a href=\"https://www.chatwoot.com/privacy-policy\"> தனியுரிமைக் கொள்கையை ஒப்புக்கொள்கிறீர்கள்",
+    "ACCOUNT_NAME": {
+      "LABEL": "கணக்கின் பெயர்",
+      "PLACEHOLDER": "வெய்ன் எண்டர்பிரைசஸ்",
+      "ERROR": "கணக்கின் பெயர் சிறியதாக உள்ளது"
+    },
+    "EMAIL": {
+      "LABEL": "இமெயில்",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "இமெயில் முகவரி தவறானது"
+    },
+    "PASSWORD": {
+      "LABEL": "பாஸ்வேர்ட்",
+      "PLACEHOLDER": "பாஸ்வேர்ட்",
+      "ERROR": "பாஸ்வேர்டு மிகவும் சிறியதாக உள்ளது"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+      "PLACEHOLDER": "பாஸ்வேர்டை உறுதிப்படுத்தவும்",
+      "ERROR": "பாஸ்வேர்டு பொருந்தவில்லை"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "வெற்றிகரமாக பதிவு செய்துவிட்டிர்கள்",
+      "ERROR_MESSAGE": "வூட் சர்வருடன் இணைக்க முடியவில்ல, மீண்டும் முயற்சிக்கவும்"
+    },
+    "SUBMIT": "சமர்பிக்கவும்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/ta/webhooks.json b/app/javascript/dashboard/i18n/locale/ta/webhooks.json
new file mode 100644
index 000000000..1beb87665
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/ta/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "வெப்ஹூக் அமைப்புகள்"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/tr/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/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 shortcode",
+          "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/tr/chatlist.json b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/contact.json b/app/javascript/dashboard/i18n/locale/tr/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/conversation.json b/app/javascript/dashboard/i18n/locale/tr/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/generalSettings.json b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/index.js b/app/javascript/dashboard/i18n/locale/tr/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/tr/integrations.json b/app/javascript/dashboard/i18n/locale/tr/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/tr/login.json b/app/javascript/dashboard/i18n/locale/tr/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/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/tr/report.json b/app/javascript/dashboard/i18n/locale/tr/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/resetPassword.json b/app/javascript/dashboard/i18n/locale/tr/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/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/tr/setNewPassword.json b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/settings.json b/app/javascript/dashboard/i18n/locale/tr/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/signup.json b/app/javascript/dashboard/i18n/locale/tr/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/tr/webhooks.json b/app/javascript/dashboard/i18n/locale/tr/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/tr/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
new file mode 100644
index 000000000..94277682c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "AGENT_MGMT": {
+    "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": [
+      {
+        "name": "адміністратор",
+        "label": "Адміністратор"
+      },
+      {
+        "name": "агент",
+        "label": "Агент"
+      }
+    ],
+    "LIST": {
+      "404": "Немає агентів, пов'язаних з цим обліковим записом",
+      "TITLE": "Керування агентами у вашій команді",
+      "DESC": "Ви можете додавати/видаляти агентів у вашій команді.",
+      "NAME": "Ім'я",
+      "EMAIL": "ПОШТА",
+      "STATUS": "Статус",
+      "ACTIONS": "Дії",
+      "VERIFIED": "Перевірено",
+      "VERIFICATION_PENDING": "Очікування підтвердження"
+    },
+    "ADD": {
+      "TITLE": "Додати агента до вашої команди",
+      "DESC": "Ви можете додавати людей, які будуть займатися запитами.",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Ім'я агента",
+          "PLACEHOLDER": "Будь ласка, введіть ім'я агента"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Тип агента",
+          "PLACEHOLDER": "Будь ласка, оберіть тип",
+          "ERROR": "Потрібен тип агента"
+        },
+        "EMAIL": {
+          "LABEL": "Адреса електронної пошти",
+          "PLACEHOLDER": "Будь ласка, введіть адресу електронної пошти агента"
+        },
+        "SUBMIT": "Додати агента"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Агента успішно додано",
+        "EXIST_MESSAGE": "Електронна пошта агента вже використовується, будь ласка, спробуйте іншу адресу електронної пошти",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "API": {
+        "SUCCESS_MESSAGE": "Агента успішно видалено",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      },
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити ",
+        "YES": "Так, видалити ",
+        "NO": "No, Keep "
+      }
+    },
+    "EDIT": {
+      "TITLE": "Редагувати агента",
+      "FORM": {
+        "NAME": {
+          "LABEL": "Ім'я агента",
+          "PLACEHOLDER": "Будь ласка, введіть ім'я агента"
+        },
+        "AGENT_TYPE": {
+          "LABEL": "Тип агента",
+          "PLACEHOLDER": "Будь ласка, оберіть тип",
+          "ERROR": "Потрібен тип агента"
+        },
+        "EMAIL": {
+          "LABEL": "Адреса електронної пошти",
+          "PLACEHOLDER": "Будь ласка, введіть адресу електронної пошти агента"
+        },
+        "SUBMIT": "Редагувати агента"
+      },
+      "BUTTON_TEXT": "Редагувати",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "API": {
+        "SUCCESS_MESSAGE": "Агента успішно оновлено",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      },
+      "PASSWORD_RESET": {
+        "ADMIN_RESET_BUTTON": "Скинути пароль",
+        "ADMIN_SUCCESS_MESSAGE": "Лист з інструкціями для відновлення паролю було надіслано агенту",
+        "SUCCESS_MESSAGE": "Пароль агента успішно скинуто",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "SEARCH": {
+      "NO_RESULTS": "Агентів не знайдено."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
new file mode 100644
index 000000000..2a077b17b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/cannedMgmt.json
@@ -0,0 +1,76 @@
+{
+  "CANNED_MGMT": {
+    "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": "В цьому обліковому записі немає швидких відповідей.",
+      "TITLE": "Керування швидкими вдіповідями",
+      "DESC": "Швидкі відповіді це шаблони, які можна використовувати при обробці запитів.",
+      "TABLE_HEADER": [
+        "Короткий код",
+        "Вміст",
+        "Дії"
+      ]
+    },
+    "ADD": {
+      "TITLE": "Додати швидку відповідь",
+      "DESC": "Canned Responses are saved reply templates which can be used to quickly send out reply to conversation .",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Короткий код",
+          "PLACEHOLDER": "Будь ласка, введіть короткий код",
+          "ERROR": "Необхідно вказати короткий код"
+        },
+        "CONTENT": {
+          "LABEL": "Вміст",
+          "PLACEHOLDER": "Будь ласка, введіть вміст",
+          "ERROR": "Потрібен вміст"
+        },
+        "SUBMIT": "Додати"
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Швидку відповідь додано",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "EDIT": {
+      "TITLE": "Редагувати швидку відповідь",
+      "CANCEL_BUTTON_TEXT": "Скасувати",
+      "FORM": {
+        "SHORT_CODE": {
+          "LABEL": "Короткий код",
+          "PLACEHOLDER": "Будь ласка, введіть короткий код",
+          "ERROR": "Необхідно вказати короткий код"
+        },
+        "CONTENT": {
+          "LABEL": "Вміст",
+          "PLACEHOLDER": "Будь ласка, введіть вміст",
+          "ERROR": "Потрібен вміст"
+        },
+        "SUBMIT": "Додати"
+      },
+      "BUTTON_TEXT": "Редагувати",
+      "API": {
+        "SUCCESS_MESSAGE": "Швидку відповідь успішно оновлено",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "API": {
+        "SUCCESS_MESSAGE": "Швидку відповідь успішно видалено",
+        "ERROR_MESSAGE": "Не вдалося підключитися до Woot Server, спробуйте ще раз пізніше"
+      },
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити ",
+        "YES": "Так, видалити ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/contact.json b/app/javascript/dashboard/i18n/locale/uk/contact.json
index 366bc548b..f24425e96 100644
--- a/app/javascript/dashboard/i18n/locale/uk/contact.json
+++ b/app/javascript/dashboard/i18n/locale/uk/contact.json
@@ -11,10 +11,19 @@
     },
     "LABELS": {
       "TITLE": "Мітки бесіди",
-      "UPDATE_BUTTON": "Оновити мітки",
-      "UPDATE_ERROR": "Не вдалося оновити мітки, спробуйте ще раз.",
-      "TAG_PLACEHOLDER": "Додати нову мітку",
-      "PLACEHOLDER": "Знайти або додати мітку"
-    }
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Не вдалося оновити мітки, спробуйте ще раз."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Редагувати"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
index 5089f8714..b56bd1c0b 100644
--- a/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/generalSettings.json
@@ -2,6 +2,7 @@
   "GENERAL_SETTINGS": {
     "TITLE": "Налаштування облікового запису",
     "SUBMIT": "Оновити налаштування",
+    "BACK": "Back",
     "UPDATE": {
       "ERROR": "Не вдалося оновити налаштування, спробуйте ще раз!",
       "SUCCESS": "Налаштування облікового запису успішно оновлено"
@@ -21,6 +22,25 @@
         "LABEL": "Мова сайту (бета)",
         "PLACEHOLDER": "Ім'я вашого облікового запису",
         "ERROR": ""
+      },
+      "DOMAIN": {
+        "LABEL": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Увімкнено",
+          "DISABLED": "Вимкнено"
+        }
       }
     }
   }
diff --git a/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
new file mode 100644
index 000000000..54a25618f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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>",
+    "LIST": {
+      "404": "В цього облікового запису немає скриньк."
+    },
+    "CREATE_FLOW": [
+      {
+        "title": "Оберіть канал",
+        "route": "settings_inbox_new",
+        "body": "Choose the provider you want to integrate with Chatwoot."
+      },
+      {
+        "title": "Створити вхідну скриньку",
+        "route": "settings_inboxes_page_channel",
+        "body": "Authenticate your account and create an inbox."
+      },
+      {
+        "title": "Додати агентів",
+        "route": "settings_inboxes_add_agents",
+        "body": "Add agents to the created inbox."
+      },
+      {
+        "title": "Вуаля!",
+        "route": "settings_inbox_finish",
+        "body": "Все готово!"
+      }
+    ],
+    "ADD": {
+      "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' "
+      },
+      "WEBSITE_CHANNEL": {
+        "TITLE": "Канал Веб-сайт",
+        "DESC": "Створіть канал для свого сайту та почніть підтримувати своїх клієнтів за допомогою нашого віджету.",
+        "LOADING_MESSAGE": "Створення каналу підтримки веб-сайту",
+        "CHANNEL_AVATAR": {
+          "LABEL": "Channel Avatar"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Назва сайту",
+          "PLACEHOLDER": "Введіть назву свого сайту (наприклад: Acme Inc)"
+        },
+        "CHANNEL_DOMAIN": {
+          "LABEL": "Домен сайту",
+          "PLACEHOLDER": "Введіть домен вашого сайту (наприклад: 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 user when he starts the conversation.",
+          "ENABLED": "Увімкнено",
+          "DISABLED": "Вимкнено"
+        },
+        "WIDGET_COLOR": {
+          "LABEL": "Колір віджета",
+          "PLACEHOLDER": "Оновити колір віджета"
+        },
+        "SUBMIT_BUTTON": "Створити скриньку \"Вхідні\""
+      },
+      "TWILIO": {
+        "TITLE": "Twilio SMS/Whatsapp Channel",
+        "DESC": "Integrate Twilio and start supporting your customers via SMS or Whatsapp.",
+        "ACCOUNT_SID": {
+          "LABEL": "SID облікового запису",
+          "PLACEHOLDER": "Будь ласка, введіть SID облікового запису Twilio",
+          "ERROR": "Це поле є обов'язковим"
+        },
+        "CHANNEL_TYPE": {
+          "LABEL": "Channel Type",
+          "ERROR": "Please select your Channel Type"
+        },
+        "AUTH_TOKEN": {
+          "LABEL": "Токен автентифікації",
+          "PLACEHOLDER": "Введіть ваш Twilio Auth токен",
+          "ERROR": "Це поле є обов'язковим"
+        },
+        "CHANNEL_NAME": {
+          "LABEL": "Назва каналу",
+          "PLACEHOLDER": "Будь ласка, введіть назву каналу",
+          "ERROR": "Це поле є обов'язковим"
+        },
+        "PHONE_NUMBER": {
+          "LABEL": "Номер телефону",
+          "PLACEHOLDER": "Будь ласка, введіть номер телефону, з якого будуть надсилатися повідомлення.",
+          "ERROR": "Номер телефону повинен починатися з символу `+'."
+        },
+        "API_CALLBACK": {
+          "TITLE": "Callback URL",
+          "SUBTITLE": "You have to configure the message callback URL in Twilio with the URL mentioned here."
+        },
+        "SUBMIT_BUTTON": "Створити Twilio канал",
+        "API": {
+          "ERROR_MESSAGE": "Автентифікація у Twilio не вдалася, будь ласка, спробуйте знову"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Канали",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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."
+      },
+      "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 :)"
+      }
+    },
+    "DETAILS": {
+      "LOADING_FB": "Автентифікація через Facebook...",
+      "ERROR_FB_AUTH": "Something went wrong, Please refresh page...",
+      "CREATING_CHANNEL": "Створення скриньки Вхідні...",
+      "TITLE": "Configure Inbox Details",
+      "DESC": ""
+    },
+    "AGENTS": {
+      "BUTTON_TEXT": "Додати агентів",
+      "ADD_AGENTS": "Додавання агентів до таки Вхідні..."
+    },
+    "FINISH": {
+      "TITLE": "Ваша поштова скринька готова!",
+      "MESSAGE": "You can now engage with your customers through your new Channel. Happy supporting ",
+      "BUTTON_TEXT": "Давай туди",
+      "WEBSITE_SUCCESS": "Ви успішно завершили створення каналу Веб-сайт. Скопіюйте наведений нижче код і вставте його на ваш сайт. Наступного разу коли клієнт скористається онлайн чатом, розмова автоматично з'явиться в вашій скриньці Вхідні."
+    },
+    "REAUTH": "Повторна авторизація",
+    "VIEW": "Вигляд",
+    "EDIT": {
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox settings updated successfully",
+        "AUTO_ASSIGNMENT_SUCCESS_MESSAGE": "Автопризначення успішно оновлено",
+        "ERROR_MESSAGE": "Не вдалося оновити колір віджету. Будь ласка, спробуйте ще раз."
+      },
+      "AUTO_ASSIGNMENT": {
+        "ENABLED": "Увімкнено",
+        "DISABLED": "Вимкнено"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити ",
+        "YES": "Так, видалити ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Скриньку успішно видалено",
+        "ERROR_MESSAGE": "Не вдалося видалити скриньку \"Вхідні\". Будь ласка, спробуйте ще раз."
+      }
+    },
+    "SETTINGS": "Налаштування",
+    "SETTINGS_POPUP": {
+      "MESSENGER_HEADING": "Messenger Script",
+      "MESSENGER_SUB_HEAD": "Добавте кнопку на сторінки вашого сайту",
+      "INBOX_AGENTS": "Агенти",
+      "INBOX_AGENTS_SUB_TEXT": "Додати або вилучити агентів з скриньки Вхідні",
+      "UPDATE": "Оновити",
+      "AUTO_ASSIGNMENT": "Увімкнути автопризначення",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/index.js b/app/javascript/dashboard/i18n/locale/uk/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/uk/integrations.json b/app/javascript/dashboard/i18n/locale/uk/integrations.json
index e2f6a011d..25900ea86 100644
--- a/app/javascript/dashboard/i18n/locale/uk/integrations.json
+++ b/app/javascript/dashboard/i18n/locale/uk/integrations.json
@@ -49,6 +49,15 @@
           "NO": "Ні, залиште"
         }
       }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Видалити",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
     }
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
new file mode 100644
index 000000000..155feab8c
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/uk/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "LABEL_MGMT": {
+    "HEADER": "Labels",
+    "HEADER_BTN_TXT": "Add label",
+    "LOADING": "Fetching labels",
+    "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": [
+        "Ім'я",
+        "Description",
+        "Color"
+      ]
+    },
+    "FORM": {
+      "NAME": {
+        "LABEL": "Label Name",
+        "PLACEHOLDER": "Label name",
+        "ERROR": "Label Name is required"
+      },
+      "DESCRIPTION": {
+        "LABEL": "Description",
+        "PLACEHOLDER": "Label Description"
+      },
+      "COLOR": {
+        "LABEL": "Color"
+      },
+      "SHOW_ON_SIDEBAR": {
+        "LABEL": "Show label on sidebar"
+      },
+      "EDIT": "Редагувати",
+      "CREATE": "Create",
+      "DELETE": "Видалити",
+      "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": "Видалити",
+      "API": {
+        "SUCCESS_MESSAGE": "Label deleted successfully",
+        "ERROR_MESSAGE": "There was an error, please try again"
+      },
+      "CONFIRM": {
+        "TITLE": "Підтвердження видалення",
+        "MESSAGE": "Справді бажаєте видалити ",
+        "YES": "Так, видалити ",
+        "NO": "No, Keep "
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/uk/settings.json b/app/javascript/dashboard/i18n/locale/uk/settings.json
index 1ca5c94d1..926f3fe23 100644
--- a/app/javascript/dashboard/i18n/locale/uk/settings.json
+++ b/app/javascript/dashboard/i18n/locale/uk/settings.json
@@ -26,10 +26,20 @@
         "TITLE": "Сповіщення електронною поштою",
         "NOTE": "Тут оновлюються налаштування повідомлень електронною поштою",
         "CONVERSATION_ASSIGNMENT": "Надсилати сповіщення коли бесіду призначають мені",
-        "CONVERSATION_CREATION": "Надсилати сповіщення при створенні нової бесіди",
-        "UPDATE_SUCCESS": "Налаштування сповіщень успішно оновлені",
+        "CONVERSATION_CREATION": "Надсилати сповіщення при створенні нової бесіди"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
       "PROFILE_IMAGE": {
         "LABEL": "Зображення облікового запису"
       },
@@ -38,6 +48,23 @@
         "ERROR": "Будь ласка, введіть коректне ім'я",
         "PLACEHOLDER": "Будь ласка, введіть ваше ім'я, воно буде відображатися у бесідах"
       },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "Offline"
+          }
+        ]
+      },
       "EMAIL": {
         "LABEL": "Ваша адреса електронної пошти",
         "ERROR": "Будь ласка, введіть коректну адресу електронної пошти",
@@ -56,7 +83,44 @@
     }
   },
   "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
     "PROFILE_SETTINGS": "Налаштування облікового запису",
     "LOGOUT": "Вийти"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Придбати зараз"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Копіювати",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Звантажити",
+      "UPLOADING": "Завантажується..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Додати"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Бесіди",
+    "REPORTS": "Звіти",
+    "SETTINGS": "Налаштування",
+    "HOME": "Головна",
+    "AGENTS": "Агенти",
+    "INBOXES": "Вхідні",
+    "CANNED_RESPONSES": "Швидкі відповіді",
+    "INTEGRATIONS": "Інтеграції",
+    "ACCOUNT_SETTINGS": "Налаштування акаунту",
+    "LABELS": "Labels"
   }
 }
diff --git a/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/vi/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/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 shortcode",
+          "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/vi/chatlist.json b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/contact.json b/app/javascript/dashboard/i18n/locale/vi/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/conversation.json b/app/javascript/dashboard/i18n/locale/vi/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/generalSettings.json b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/index.js b/app/javascript/dashboard/i18n/locale/vi/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/vi/integrations.json b/app/javascript/dashboard/i18n/locale/vi/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/vi/login.json b/app/javascript/dashboard/i18n/locale/vi/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/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/vi/report.json b/app/javascript/dashboard/i18n/locale/vi/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/resetPassword.json b/app/javascript/dashboard/i18n/locale/vi/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/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/vi/setNewPassword.json b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/settings.json b/app/javascript/dashboard/i18n/locale/vi/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/signup.json b/app/javascript/dashboard/i18n/locale/vi/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/vi/webhooks.json b/app/javascript/dashboard/i18n/locale/vi/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/vi/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/agentMgmt.json b/app/javascript/dashboard/i18n/locale/zh/agentMgmt.json
new file mode 100644
index 000000000..633424fed
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/agentMgmt.json
@@ -0,0 +1,102 @@
+{
+  "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": [
+      {
+        "name": "administrator",
+        "label": "Administrator"
+      },
+      {
+        "name": "agent",
+        "label": "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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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": "Agent Type",
+          "PLACEHOLDER": "Please select a type",
+          "ERROR": "Agent type 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 agents found."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/cannedMgmt.json b/app/javascript/dashboard/i18n/locale/zh/cannedMgmt.json
new file mode 100644
index 000000000..bcab1dc6a
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/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 shortcode",
+          "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/zh/chatlist.json b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
new file mode 100644
index 000000000..3867a5df1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/chatlist.json
@@ -0,0 +1,77 @@
+{
+  "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",
+    "SEARCH": {
+      "INPUT": "Search for People, Chats, Saved Replies .."
+    },
+    "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_ITEMS": [
+      {
+        "TEXT": "Open",
+        "VALUE": "open"
+      },
+      {
+        "TEXT": "Resolved",
+        "VALUE": "resolved"
+      }
+    ],
+    "ATTACHMENTS": {
+      "image": {
+        "ICON": "ion-image",
+        "CONTENT": "Picture message"
+      },
+      "audio": {
+        "ICON": "ion-volume-high",
+        "CONTENT": "Audio message"
+      },
+      "video": {
+        "ICON": "ion-ios-videocam",
+        "CONTENT": "Video message"
+      },
+      "file": {
+        "ICON": "ion-document",
+        "CONTENT": "File Attachment"
+      },
+      "location": {
+        "ICON": "ion-ios-location",
+        "CONTENT": "Location"
+      },
+      "fallback": {
+        "ICON": "ion-link",
+        "CONTENT": "has shared a url"
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/contact.json b/app/javascript/dashboard/i18n/locale/zh/contact.json
new file mode 100644
index 000000000..e5c3ec25d
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/contact.json
@@ -0,0 +1,29 @@
+{
+  "CONTACT_PANEL": {
+    "CONVERSATION_TITLE": "Conversation Details",
+    "BROWSER": "Browser",
+    "OS": "Operating System",
+    "INITIATED_FROM": "Initiated from",
+    "INITIATED_AT": "Initiated at",
+    "CONVERSATIONS": {
+      "NO_RECORDS_FOUND": "There are no previous conversations associated to this contact.",
+      "TITLE": "Previous Conversations"
+    },
+    "LABELS": {
+      "TITLE": "Conversation Labels",
+      "MODAL": {
+        "TITLE": "Labels for",
+        "ACTIVE_LABELS": "Labels added to the conversation",
+        "INACTIVE_LABELS": "Labels available in the account",
+        "REMOVE": "Click on X icon to remove the label",
+        "ADD": "Click on + icon to add the label",
+        "UPDATE_BUTTON": "Update labels",
+        "UPDATE_ERROR": "Couldn't update labels, try again."
+      },
+      "NO_LABELS_TO_ADD": "There are no more labels defined in the account.",
+      "NO_AVAILABLE_LABELS": "There are no labels added to this conversation."
+    },
+    "MUTE_CONTACT": "Mute Contact",
+    "EDIT_LABEL": "Edit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/conversation.json b/app/javascript/dashboard/i18n/locale/zh/conversation.json
new file mode 100644
index 000000000..b07e4e1f1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/conversation.json
@@ -0,0 +1,35 @@
+{
+  "CONVERSATION": {
+    "404": "Please select a conversation from left pane",
+    "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",
+    "CLICK_HERE": "Click here",
+    "LOADING_INBOXES": "Loading inboxes",
+    "LOADING_CONVERSATIONS": "Loading Conversations",
+    "DOWNLOAD": "Download",
+    "HEADER": {
+      "RESOLVE_ACTION": "Resolve",
+      "REOPEN_ACTION": "Reopen",
+      "OPEN": "More",
+      "CLOSE": "Close",
+      "DETAILS": "details"
+    },
+    "FOOTER": {
+      "MSG_INPUT": "Shift + enter for new line. Start with '/' to select a Canned Response.",
+      "PRIVATE_MSG_INPUT": "Shift + enter for new line. This will be visible only to Agents"
+    },
+    "REPLYBOX": {
+      "REPLY": "Reply",
+      "PRIVATE_NOTE": "Private Note",
+      "SEND": "Send",
+      "CREATE": "Add Note",
+      "TWEET": "Tweet"
+    },
+    "VISIBLE_TO_AGENTS": "Private Note: Only visible to you and your team",
+    "CHANGE_STATUS": "Conversation status changed",
+    "CHANGE_AGENT": "Conversation Assignee changed"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/generalSettings.json b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
new file mode 100644
index 000000000..31b5f9fe2
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/generalSettings.json
@@ -0,0 +1,47 @@
+{
+  "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": ""
+      },
+      "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": "Domain",
+        "PLACEHOLDER": "Your website domain",
+        "ERROR": ""
+      },
+      "SUPPORT_EMAIL": {
+        "LABEL": "Support Email",
+        "PLACEHOLDER": "Your company's support email",
+        "ERROR": ""
+      },
+      "ENABLE_DOMAIN_EMAIL": {
+        "LABEL": "Enable domain email",
+        "PLACEHOLDER": "Enable the custom domain email",
+        "ERROR": "",
+        "OPTIONS": {
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        }
+      }
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/inboxMgmt.json b/app/javascript/dashboard/i18n/locale/zh/inboxMgmt.json
new file mode 100644
index 000000000..c885c9ab5
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/inboxMgmt.json
@@ -0,0 +1,191 @@
+{
+  "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": {
+      "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' "
+      },
+      "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_NAME": {
+          "LABEL": "Website Name",
+          "PLACEHOLDER": "Enter your website name (eg: Acme Inc)"
+        },
+        "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 user when he starts the conversation.",
+          "ENABLED": "Enabled",
+          "DISABLED": "Disabled"
+        },
+        "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": "Channel Name",
+          "PLACEHOLDER": "Please enter a channel 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"
+        }
+      },
+      "AUTH": {
+        "TITLE": "Channels",
+        "DESC": "Currently we support Website live chat widgets, Facebook Pages and Twitter profiles as platforms. We have more platforms like Whatsapp, Email, Telegram and Line in the works, which will be out soon."
+      },
+      "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."
+      },
+      "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",
+      "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"
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "CONFIRM": {
+        "TITLE": "Confirm Deletion",
+        "MESSAGE": "Are you sure to delete ",
+        "YES": "Yes, Delete ",
+        "NO": "No, Keep "
+      },
+      "API": {
+        "SUCCESS_MESSAGE": "Inbox deleted successfully",
+        "ERROR_MESSAGE": "Could not delete inbox. Please try again later."
+      }
+    },
+    "SETTINGS": "Settings",
+    "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",
+      "AUTO_ASSIGNMENT": "Enable auto assignment",
+      "INBOX_UPDATE_TITLE": "Inbox Settings",
+      "INBOX_UPDATE_SUB_TEXT": "Update your inbox settings",
+      "AUTO_ASSIGNMENT_SUB_TEXT": "Enable or disable the automatic assignment of new conversations to the agents added to this inbox."
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/index.js b/app/javascript/dashboard/i18n/locale/zh/index.js
new file mode 100644
index 000000000..5dfc44e4b
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/index.js
@@ -0,0 +1,33 @@
+import { default as _agentMgmt } from './agentMgmt.json';
+import { default as _labelsMgmt } from './labelsMgmt.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 _conversation } from './conversation.json';
+import { default as _inboxMgmt } from './inboxMgmt.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 _integrations } from './integrations.json';
+import { default as _generalSettings } from './generalSettings.json';
+
+export default {
+  ..._agentMgmt,
+  ..._cannedMgmt,
+  ..._chatlist,
+  ..._contact,
+  ..._conversation,
+  ..._inboxMgmt,
+  ..._login,
+  ..._report,
+  ..._labelsMgmt,
+  ..._resetPassword,
+  ..._setNewPassword,
+  ..._settings,
+  ..._signup,
+  ..._integrations,
+  ..._generalSettings,
+};
diff --git a/app/javascript/dashboard/i18n/locale/zh/integrations.json b/app/javascript/dashboard/i18n/locale/zh/integrations.json
new file mode 100644
index 000000000..17952efd1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/integrations.json
@@ -0,0 +1,63 @@
+{
+  "INTEGRATION_SETTINGS": {
+    "HEADER": "Integrations",
+    "WEBHOOK": {
+      "TITLE": "Webhook",
+      "CONFIGURE": "Configure",
+      "HEADER": "Webhook settings",
+      "HEADER_BTN_TXT": "Add new webhook",
+      "INTEGRATION_TXT": "Webhook events provide you the realtime information about what's happening in your Chatwoot 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.",
+      "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",
+        "DESC": "Webhooks are predefined reply templates which can be used to quickly send out replies to tickets.",
+        "TABLE_HEADER": [
+          "Webhook endpoint",
+          "Actions"
+        ]
+      },
+      "ADD": {
+        "CANCEL": "Cancel",
+        "TITLE": "Add new webhook",
+        "DESC": "Webhook events provide you the realtime information about what's happening in your Chatwoot account. Please enter a valid URL to configure a callback.",
+        "FORM": {
+          "END_POINT": {
+            "LABEL": "Webhook URL",
+            "PLACEHOLDER": "Example: https://example/api/webhook",
+            "ERROR": "Please enter a valid URL"
+          },
+          "SUBMIT": "Create webhook"
+        },
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook added successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        }
+      },
+      "DELETE": {
+        "BUTTON_TEXT": "Delete",
+        "API": {
+          "SUCCESS_MESSAGE": "Webhook deleted successfully",
+          "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+        },
+        "CONFIRM": {
+          "TITLE": "Confirm Deletion",
+          "MESSAGE": "Are you sure to delete ",
+          "YES": "Yes, Delete ",
+          "NO": "No, Keep it"
+        }
+      }
+    },
+    "DELETE": {
+      "BUTTON_TEXT": "Delete",
+      "API": {
+        "SUCCESS_MESSAGE": "Integration deleted successfully"
+      }
+    },
+    "CONNECT": {
+      "BUTTON_TEXT": "Connect"
+    }
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/labelsMgmt.json b/app/javascript/dashboard/i18n/locale/zh/labelsMgmt.json
new file mode 100644
index 000000000..b0dbe439f
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/labelsMgmt.json
@@ -0,0 +1,68 @@
+{
+  "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",
+        "ERROR": "Label Name is required"
+      },
+      "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/zh/login.json b/app/javascript/dashboard/i18n/locale/zh/login.json
new file mode 100644
index 000000000..30f667052
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/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/zh/report.json b/app/javascript/dashboard/i18n/locale/zh/report.json
new file mode 100644
index 000000000..ec38f46cf
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/report.json
@@ -0,0 +1,49 @@
+{
+  "REPORT": {
+    "HEADER": "Reports",
+    "LOADING_CHART": "Loading chart data...",
+    "NO_ENOUGH_DATA": "We've not received enough data points to generate report, Please try again later.",
+    "METRICS": [
+      {
+        "NAME": "Conversations",
+        "KEY": "conversations_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Incoming Messages",
+        "KEY": "incoming_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "Outgoing Messages",
+        "KEY": "outgoing_messages_count",
+        "DESC": "( Total )"
+      },
+      {
+        "NAME": "First response time",
+        "KEY": "avg_first_response_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Time",
+        "KEY": "avg_resolution_time",
+        "DESC": "( Avg )"
+      },
+      {
+        "NAME": "Resolution Count",
+        "KEY": "resolutions_count",
+        "DESC": "( Total )"
+      }
+    ],
+    "DATE_RANGE": [
+      {
+        "id": 0,
+        "name": "Last 7 days"
+      },
+      {
+        "id": 1,
+        "name": "Last 30 days"
+      }
+    ]
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/resetPassword.json b/app/javascript/dashboard/i18n/locale/zh/resetPassword.json
new file mode 100644
index 000000000..bb678e809
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/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/zh/setNewPassword.json b/app/javascript/dashboard/i18n/locale/zh/setNewPassword.json
new file mode 100644
index 000000000..94a3fd2e1
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/setNewPassword.json
@@ -0,0 +1,20 @@
+{
+  "SET_NEW_PASSWORD": {
+    "TITLE": "Set New Password",
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Passwords do not match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Successfully changed the password",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/settings.json b/app/javascript/dashboard/i18n/locale/zh/settings.json
new file mode 100644
index 000000000..6ab397d63
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/settings.json
@@ -0,0 +1,126 @@
+{
+  "PROFILE_SETTINGS": {
+    "LINK": "Profile Settings",
+    "TITLE": "Profile Settings",
+    "BTN_TEXT": "Update Profile",
+    "AFTER_EMAIL_CHANGED": "Your profile has been updated successfully, please login again as your login credentials are changed",
+    "FORM": {
+      "AVATAR": "Profile Image",
+      "ERROR": "Please fix form errors",
+      "REMOVE_IMAGE": "Remove",
+      "UPLOAD_IMAGE": "Upload image",
+      "UPDATE_IMAGE": "Update image",
+      "PROFILE_SECTION": {
+        "TITLE": "Profile",
+        "NOTE": "Your email address is your identity and is used to log in."
+      },
+      "PASSWORD_SECTION": {
+        "TITLE": "Password",
+        "NOTE": "Updating your password would reset your logins in multiple devices."
+      },
+      "ACCESS_TOKEN": {
+        "TITLE": "Access Token",
+        "NOTE": "This token can be used if you are building an API based integration"
+      },
+      "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"
+      },
+      "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",
+        "HAS_ENABLED_PUSH": "You have enabled push for this browser.",
+        "REQUEST_PUSH": "Enable push notifications"
+      },
+      "PROFILE_IMAGE": {
+        "LABEL": "Profile Image"
+      },
+      "NAME": {
+        "LABEL": "Your name",
+        "ERROR": "Please enter a valid name",
+        "PLACEHOLDER": "Please enter your name, this would be displayed in conversations"
+      },
+      "AVAILABILITY": {
+        "LABEL": "Availability",
+        "STATUSES_LIST": [
+          {
+            "value": "online",
+            "label": "Online"
+          },
+          {
+            "value": "busy",
+            "label": "Busy"
+          },
+          {
+            "value": "offline",
+            "label": "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"
+      },
+      "PASSWORD": {
+        "LABEL": "Password",
+        "ERROR": "Please enter a password of length 6 or more",
+        "PLACEHOLDER": "Please enter a new password"
+      },
+      "PASSWORD_CONFIRMATION": {
+        "LABEL": "Confirm new password",
+        "ERROR": "Confirm password should match the password",
+        "PLACEHOLDER": "Please re-enter your password"
+      }
+    }
+  },
+  "SIDEBAR_ITEMS": {
+    "CHANGE_ACCOUNTS": "Switch Account",
+    "SELECTOR_SUBTITLE": "Select an account from the following list",
+    "PROFILE_SETTINGS": "Profile Settings",
+    "LOGOUT": "Logout"
+  },
+  "APP_GLOBAL": {
+    "TRIAL_MESSAGE": "days trial remaining.",
+    "TRAIL_BUTTON": "Buy Now"
+  },
+  "COMPONENTS": {
+    "CODE": {
+      "BUTTON_TEXT": "Copy",
+      "COPY_SUCCESSFUL": "Code copied to clipboard successfully"
+    },
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "CONFIRM_EMAIL": "Verifying...",
+  "SETTINGS": {
+    "INBOXES": {
+      "NEW_INBOX": "Add Inbox"
+    }
+  },
+  "SIDEBAR": {
+    "CONVERSATIONS": "Conversations",
+    "REPORTS": "Reports",
+    "SETTINGS": "Settings",
+    "HOME": "Home",
+    "AGENTS": "Agents",
+    "INBOXES": "Inboxes",
+    "CANNED_RESPONSES": "Canned Responses",
+    "INTEGRATIONS": "Integrations",
+    "ACCOUNT_SETTINGS": "Account Settings",
+    "LABELS": "Labels"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/signup.json b/app/javascript/dashboard/i18n/locale/zh/signup.json
new file mode 100644
index 000000000..e52705224
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/signup.json
@@ -0,0 +1,32 @@
+{
+  "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": "Wayne Enterprises",
+      "ERROR": "Account Name is too short"
+    },
+    "EMAIL": {
+      "LABEL": "Email",
+      "PLACEHOLDER": "bruce@wayne.enterprises",
+      "ERROR": "Email is invalid"
+    },
+    "PASSWORD": {
+      "LABEL": "Password",
+      "PLACEHOLDER": "Password",
+      "ERROR": "Password is too short"
+    },
+    "CONFIRM_PASSWORD": {
+      "LABEL": "Confirm Password",
+      "PLACEHOLDER": "Confirm Password",
+      "ERROR": "Password doesnot match"
+    },
+    "API": {
+      "SUCCESS_MESSAGE": "Registration Successfull",
+      "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later"
+    },
+    "SUBMIT": "Submit"
+  }
+}
diff --git a/app/javascript/dashboard/i18n/locale/zh/webhooks.json b/app/javascript/dashboard/i18n/locale/zh/webhooks.json
new file mode 100644
index 000000000..347c96893
--- /dev/null
+++ b/app/javascript/dashboard/i18n/locale/zh/webhooks.json
@@ -0,0 +1,5 @@
+{
+  "WEBHOOKS_SETTINGS": {
+    "HEADER": "Webhook Settings"
+  }
+}
diff --git a/app/javascript/widget/i18n/locale/ar.json b/app/javascript/widget/i18n/locale/ar.json
index a306e109f..a743c525a 100644
--- a/app/javascript/widget/i18n/locale/ar.json
+++ b/app/javascript/widget/i18n/locale/ar.json
@@ -9,10 +9,10 @@
     }
   },
   "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is available",
-    "ARE_AVAILABLE": "are available",
+    "IS_AVAILABLE": "متاح",
+    "ARE_AVAILABLE": "متاح",
     "OTHERS_ARE_AVAILABLE": "others are available",
-    "AND": "and"
+    "AND": "و"
   },
   "POWERED_BY": "مدعوم بواسطة Chatwoot",
   "EMAIL_PLACEHOLDER": "الرجاء إدخال بريدك الإلكتروني",
diff --git a/app/javascript/widget/i18n/locale/ca.json b/app/javascript/widget/i18n/locale/ca.json
index ae36614bb..44d6d52ef 100644
--- a/app/javascript/widget/i18n/locale/ca.json
+++ b/app/javascript/widget/i18n/locale/ca.json
@@ -2,19 +2,19 @@
   "COMPONENTS": {
     "FILE_BUBBLE": {
       "DOWNLOAD": "Descarrega",
-      "UPLOADING": "S'està pujant..."
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "sotmetre's"
+      "SUBMIT": "Envia"
     }
   },
   "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "està disponible",
-    "ARE_AVAILABLE": "estan disponibles",
-    "OTHERS_ARE_AVAILABLE": "altres estan disponibles",
-    "AND": "i"
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
   },
-  "POWERED_BY": "Desenvolupat per Chatwoot",
-  "EMAIL_PLACEHOLDER": "Introduïu el vostre correu electrònic",
-  "CHAT_PLACEHOLDER": "Escriu el teu missatge"
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Introduïu el correu electrònic",
+  "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/app/javascript/widget/i18n/locale/cs.json b/app/javascript/widget/i18n/locale/cs.json
new file mode 100644
index 000000000..7bd8b35b5
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/cs.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Stáhnout",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Odeslat"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Prosím, zadejte svůj e-mail",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/da.json b/app/javascript/widget/i18n/locale/da.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/da.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/de.json b/app/javascript/widget/i18n/locale/de.json
index 17b2df51b..380c33ede 100644
--- a/app/javascript/widget/i18n/locale/de.json
+++ b/app/javascript/widget/i18n/locale/de.json
@@ -2,19 +2,19 @@
   "COMPONENTS": {
     "FILE_BUBBLE": {
       "DOWNLOAD": "Herunterladen",
-      "UPLOADING": "Hochladen..."
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Submit"
+      "SUBMIT": "Einreichen"
     }
   },
   "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "ist verfügbar",
-    "ARE_AVAILABLE": "sind verfügbar",
-    "OTHERS_ARE_AVAILABLE": "andere sind verfügbar",
-    "AND": "und"
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
   },
-  "POWERED_BY": "Unterstützt von Chatwoot",
+  "POWERED_BY": "Powered by Chatwoot",
   "EMAIL_PLACEHOLDER": "Bitte geben Sie ihre E-Mail-Adresse ein",
-  "CHAT_PLACEHOLDER": "Geben Sie Ihre Nachricht ein"
+  "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/app/javascript/widget/i18n/locale/fi.json b/app/javascript/widget/i18n/locale/fi.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/fi.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/hi.json b/app/javascript/widget/i18n/locale/hi.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/hi.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/hu.json b/app/javascript/widget/i18n/locale/hu.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/hu.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/it.json b/app/javascript/widget/i18n/locale/it.json
new file mode 100644
index 000000000..0a39f7667
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/it.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Scaricare",
+      "UPLOADING": "Caricamento..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Invia"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "è disponibile",
+    "ARE_AVAILABLE": "sono disponibili",
+    "OTHERS_ARE_AVAILABLE": "altri sono disponibili",
+    "AND": "e"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Inserisci la tua email",
+  "CHAT_PLACEHOLDER": "Scrivi il tuo messaggio"
+}
diff --git a/app/javascript/widget/i18n/locale/ja.json b/app/javascript/widget/i18n/locale/ja.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ja.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/ko.json b/app/javascript/widget/i18n/locale/ko.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ko.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/ml.json b/app/javascript/widget/i18n/locale/ml.json
index 025bbdc7e..7b6950e7d 100644
--- a/app/javascript/widget/i18n/locale/ml.json
+++ b/app/javascript/widget/i18n/locale/ml.json
@@ -1,14 +1,20 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "ഡൗൺലോഡ്",
-      "UPLOADING": "അപ്‌ലോഡുചെയ്യുന്നു..."
+      "DOWNLOAD": "ഡൗൺലോഡ്",
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
       "SUBMIT": "സമർപ്പിക്കുക"
     }
   },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
   "POWERED_BY": "Powered by Chatwoot",
-  "EMAIL_PLACEHOLDER": "നിങ്ങളുടെ ഇമെയിൽ നൽകുക",
-  "CHAT_PLACEHOLDER": "നിങ്ങളുടെ സന്ദേശം ടൈപ്പുചെയ്യുക"
+  "EMAIL_PLACEHOLDER": "ദയവായി നിങ്ങളുടെ ഇമെയിൽ നൽകുക",
+  "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/app/javascript/widget/i18n/locale/nl.json b/app/javascript/widget/i18n/locale/nl.json
index a91c09a16..92bd550b0 100644
--- a/app/javascript/widget/i18n/locale/nl.json
+++ b/app/javascript/widget/i18n/locale/nl.json
@@ -9,10 +9,10 @@
     }
   },
   "AGENT_AVAILABILITY": {
-    "IS_AVAILABLE": "is beschikbaar",
-    "ARE_AVAILABLE": "zijn beschikbaar",
-    "OTHERS_ARE_AVAILABLE": "anderen zijn beschikbaar",
-    "AND": "en"
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
   },
   "POWERED_BY": "Mogelijk gemaakt door Chatwoot",
   "EMAIL_PLACEHOLDER": "Voer uw e-mailadres in",
diff --git a/app/javascript/widget/i18n/locale/pl.json b/app/javascript/widget/i18n/locale/pl.json
new file mode 100644
index 000000000..835b286ae
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/pl.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Pobierz",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Prześlij"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Wprowadź swój adres e-mail",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/pt.json b/app/javascript/widget/i18n/locale/pt.json
index dcc2b0a0b..092330711 100644
--- a/app/javascript/widget/i18n/locale/pt.json
+++ b/app/javascript/widget/i18n/locale/pt.json
@@ -1,14 +1,20 @@
 {
   "COMPONENTS": {
     "FILE_BUBBLE": {
-      "DOWNLOAD": "Baixar",
-      "UPLOADING": "Enviando..."
+      "DOWNLOAD": "BAIXAR",
+      "UPLOADING": "Uploading..."
     },
     "FORM_BUBBLE": {
-      "SUBMIT": "Enviar"
+      "SUBMIT": "submeter"
     }
   },
-  "POWERED_BY": "Desenvolvido por Chatwoot",
-  "EMAIL_PLACEHOLDER": "Por favor introduza o seu e-mail",
-  "CHAT_PLACEHOLDER": "Digite sua mensagem"
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Por favor, digite seu e-mail",
+  "CHAT_PLACEHOLDER": "Type your message"
 }
diff --git a/app/javascript/widget/i18n/locale/ru.json b/app/javascript/widget/i18n/locale/ru.json
new file mode 100644
index 000000000..769c835aa
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ru.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Пожалуйста, введите ваш email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/sk.json b/app/javascript/widget/i18n/locale/sk.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/sk.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/sv.json b/app/javascript/widget/i18n/locale/sv.json
new file mode 100644
index 000000000..b0254cc4b
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/sv.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Hämta",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Skicka"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Ange din e-postadress",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/ta.json b/app/javascript/widget/i18n/locale/ta.json
new file mode 100644
index 000000000..79aea27a5
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/ta.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "பதிவிறக்கவும்",
+      "UPLOADING": "பதிவேறுகிறது..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "சமர்பிக்கவும்"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "இருக்கிறார்",
+    "ARE_AVAILABLE": "இருக்கிறார்கள்",
+    "OTHERS_ARE_AVAILABLE": "மற்றவர்களும் இருக்கிறார்கள்",
+    "AND": "மற்றும்"
+  },
+  "POWERED_BY": "சாட்வுட் மூலம் இயக்கபடுகிறது",
+  "EMAIL_PLACEHOLDER": "உங்கள் ஈ-மெயில் முகவரியை பதிவிடவும்",
+  "CHAT_PLACEHOLDER": "உங்கள் செய்தியை உள்ளிடவும்"
+}
diff --git a/app/javascript/widget/i18n/locale/tr.json b/app/javascript/widget/i18n/locale/tr.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/tr.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/uk.json b/app/javascript/widget/i18n/locale/uk.json
new file mode 100644
index 000000000..cd8da950a
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/uk.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Звантажити",
+      "UPLOADING": "Завантажується..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Додати"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Введіть адресу електронної пошти",
+  "CHAT_PLACEHOLDER": "Введіть Ваше повідомлення"
+}
diff --git a/app/javascript/widget/i18n/locale/vi.json b/app/javascript/widget/i18n/locale/vi.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/vi.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/i18n/locale/zh.json b/app/javascript/widget/i18n/locale/zh.json
new file mode 100644
index 000000000..eeebff666
--- /dev/null
+++ b/app/javascript/widget/i18n/locale/zh.json
@@ -0,0 +1,20 @@
+{
+  "COMPONENTS": {
+    "FILE_BUBBLE": {
+      "DOWNLOAD": "Download",
+      "UPLOADING": "Uploading..."
+    },
+    "FORM_BUBBLE": {
+      "SUBMIT": "Submit"
+    }
+  },
+  "AGENT_AVAILABILITY": {
+    "IS_AVAILABLE": "is available",
+    "ARE_AVAILABLE": "are available",
+    "OTHERS_ARE_AVAILABLE": "others are available",
+    "AND": "and"
+  },
+  "POWERED_BY": "Powered by Chatwoot",
+  "EMAIL_PLACEHOLDER": "Please enter your email",
+  "CHAT_PLACEHOLDER": "Type your message"
+}
diff --git a/app/javascript/widget/store/modules/conversation.js b/app/javascript/widget/store/modules/conversation.js
index 14e3abbf1..63d34cef4 100755
--- a/app/javascript/widget/store/modules/conversation.js
+++ b/app/javascript/widget/store/modules/conversation.js
@@ -108,7 +108,6 @@ export const getters = {
   getIsFetchingList: _state => _state.uiFlags.isFetchingList,
   getUnreadMessageCount: _state => {
     const { userLastSeenAt } = _state.meta;
-    console.log(userLastSeenAt);
     const count = Object.values(_state.conversations).filter(chat => {
       const { created_at: createdAt, message_type: messageType } = chat;
       const isOutGoing = messageType === MESSAGE_TYPE.OUTGOING;
@@ -122,7 +121,6 @@ export const getters = {
   getUnreadTextMessages: (_state, _getters) => {
     const unreadCount = _getters.getUnreadMessageCount;
     const allMessages = [...Object.values(_state.conversations)];
-    console.log(unreadCount);
     const unreadAgentMessages = allMessages.filter(message => {
       const { message_type: messageType } = message;
       return messageType === MESSAGE_TYPE.OUTGOING;
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 d8c300727..fa413f086 100644
--- a/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
+++ b/app/javascript/widget/store/modules/specs/conversation/actions.spec.js
@@ -1,11 +1,13 @@
 import { playNotificationAudio } from 'shared/helpers/AudioNotificationHelper';
 import { actions } from '../../conversation';
 import getUuid from '../../../../helpers/uuid';
+import { API } from 'widget/helpers/axios';
 
 jest.mock('../../../../helpers/uuid');
 jest.mock('shared/helpers/AudioNotificationHelper', () => ({
   playNotificationAudio: jest.fn(),
 }));
+jest.mock('widget/helpers/axios');
 
 const commit = jest.fn();
 
@@ -88,10 +90,21 @@ describe('#actions', () => {
   });
 
   describe('#setUserLastSeen', () => {
-    it('sends correct mutations', () => {
-      const lastSeen = Math.abs(Date.now() / 1000);
-      actions.setUserLastSeen({ commit }, { lastSeen });
-      expect(commit).toBeCalledWith('setMetaUserLastSeenAt', lastSeen);
+    it('sends correct mutations', async () => {
+      API.post.mockResolvedValue({ data: { success: true } });
+      await actions.setUserLastSeen({
+        commit,
+        getters: { getConversationSize: 2 },
+      });
+      expect(commit.mock.calls[0][0]).toEqual('setMetaUserLastSeenAt');
+    });
+    it('sends correct mutations', async () => {
+      API.post.mockResolvedValue({ data: { success: true } });
+      await actions.setUserLastSeen({
+        commit,
+        getters: { getConversationSize: 0 },
+      });
+      expect(commit.mock.calls).toEqual([]);
     });
   });
 });
diff --git a/config/initializers/languages.rb b/config/initializers/languages.rb
index c052cc474..f24571ca7 100644
--- a/config/initializers/languages.rb
+++ b/config/initializers/languages.rb
@@ -8,7 +8,7 @@ LANGUAGES_CONFIG = {
   3 => { name: 'French', iso_639_3_code: 'fra', iso_639_1_code: 'fr', enabled: true },
   4 => { name: 'German', iso_639_3_code: 'deu', iso_639_1_code: 'de', enabled: true },
   5 => { name: 'Hindi', iso_639_3_code: 'hin', iso_639_1_code: 'hi', enabled: false },
-  6 => { name: 'Italian', iso_639_3_code: 'ita', iso_639_1_code: 'it', enabled: false },
+  6 => { name: 'Italian', iso_639_3_code: 'ita', iso_639_1_code: 'it', enabled: true },
   7 => { name: 'Japanese', iso_639_3_code: 'jpn', iso_639_1_code: 'ja', enabled: false },
   8 => { name: 'Korean', iso_639_3_code: 'kor', iso_639_1_code: 'ko', enabled: false },
   9 => { name: 'Portuguese', iso_639_3_code: 'por', iso_639_1_code: 'pt', enabled: true },
@@ -19,7 +19,8 @@ LANGUAGES_CONFIG = {
   14 => { name: 'Catalan', iso_639_3_code: 'cat', iso_639_1_code: 'ca', enabled: true },
   15 => { name: 'Greek', iso_639_3_code: 'ell', iso_639_1_code: 'el', enabled: true },
   16 => { name: 'Portuguese, Brazilian', iso_639_3_code: '', iso_639_1_code: 'pt_BR', enabled: true },
-  17 => { name: 'Romanian', iso_639_3_code: 'ron', iso_639_1_code: 'ro', enabled: true }
+  17 => { name: 'Romanian', iso_639_3_code: 'ron', iso_639_1_code: 'ro', enabled: true },
+  18 => { name: 'Tamil', iso_639_3_code: 'tam', iso_639_1_code: 'ta', 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 }
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
new file mode 100644
index 000000000..5e03eeabf
--- /dev/null
+++ b/config/locales/ar.yml
@@ -0,0 +1,43 @@
+#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.
+ar:
+  hello: "مرحباً بالعالم"
+  messages:
+    reset_password_success: تم إرسال طلب إعادة تعيين كلمة المرور. يرجى مراجعة بريدك الإلكتروني للحصول على التعليمات.
+    reset_password_failure: أوه! لم نتمكن من العثور على أي مستخدم بعنوان البريد الإلكتروني المحدد.
+  errors:
+    signup:
+      disposable_email: نحن لا نسمح باسخدام عناوين البريد الإلكتروني المؤقتة
+      invalid_email: لقد قمت بإدخال عنوان بريد إلكتروني غير صالح
+      email_already_exists: "لقد قمت بالفعل بتسجيل حساب سابقاً بالعنوان %{email}"
+      failed: فشلت عملية التسجيل
+  conversations:
+    activity:
+      status:
+        resolved: "تم تحديث حالة المحادثة لـ\"مغلقة\" بواسطة %{user_name}"
+        open: "تم إعادة فتح المحادثة بواسطة %{user_name}"
+      assignee:
+        assigned: "تم إسنادها إلى %{assignee_name} بواسطة %{user_name}"
+        removed: "المحادثة غير مسندة بواسطة %{user_name}"
+    templates:
+      greeting_message_body: "%{account_name} يرد عادة خلال بضع ساعات."
+      ways_to_reach_you_message_body: "زودنا بوسيلة للتواصل معك."
+      email_input_box_message_body: "احصل على الإشعارات في البريد الإلكتروني"
+    reply:
+      email_subject: "رسائل جديدة في هذه المحادثة"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ea5d46706..44aa567a6 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -39,3 +39,5 @@ ca:
       greeting_message_body: "%{account_name} normalment respon a les poques hores."
       ways_to_reach_you_message_body: "Fes saber a l'equip la forma de posar-nos en contacte amb tu."
       email_input_box_message_body: "Rep les notificacions per correu electrònic"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e03370860..59e4327c8 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -36,6 +36,8 @@ cs:
         assigned: "Přiřazeno k %{assignee_name} uživatelem %{user_name}"
         removed: "Konverzace zrušena uživatelem %{user_name}"
     templates:
-      greeting_message_body: "%{account_name} obvykle odpovídá za několik hodin."
+      greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Dejte týmu způsob, jak se k vám dostat."
       email_input_box_message_body: "Dostat upozornění e-mailem"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/da.yml b/config/locales/da.yml
new file mode 100644
index 000000000..2d5d6235a
--- /dev/null
+++ b/config/locales/da.yml
@@ -0,0 +1,43 @@
+#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.
+da:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6c007a159..a84cedb6d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,47 +1,32 @@
-# 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.
-
+#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.
 de:
   hello: "Hello world"
   messages:
     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:
     signup:
       disposable_email: Wir erlauben keine Einweg-E-Mails
       invalid_email: Sie haben eine ungültige E-Mail-Adresse eingegeben
       email_already_exists: "Sie haben sich bereits für ein Konto bei %{email} angemeldet."
       failed: Anmeldung gescheitert
-
   conversations:
     activity:
       status:
@@ -54,3 +39,5 @@ de:
       greeting_message_body: "%{account_name} Antworten in der Regel in wenigen Stunden."
       ways_to_reach_you_message_body: "Geben Sie dem Team einen Weg, Sie zu erreichen."
       email_input_box_message_body: "Lassen Sie sich per E-Mail benachrichtigen"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml
new file mode 100644
index 000000000..03cd3353f
--- /dev/null
+++ b/config/locales/devise.ar.yml
@@ -0,0 +1,65 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ar:
+  devise:
+    confirmations:
+      confirmed: "تم تأكيد عنوان بريدك الإلكتروني بنجاح."
+      send_instructions: "سوف تتلقى رسالة بريد إلكتروني تحتوي على تعليمات لكيفية تأكيد عنوان البريد الإلكتروني الخاص بك خلال بضع دقائق."
+      send_paranoid_instructions: "إذا كان عنوان بريدك الإلكتروني موجود في قاعدة بياناتنا، سوف تتلقى رسالة بريد إلكتروني مع إرشادات لكيفية تأكيد عنوان البريد الإلكتروني الخاص بك خلال بضع دقائق."
+    failure:
+      already_authenticated: "لقد قمت بتسجيل الدخول."
+      inactive: "لم يتم تفعيل حسابك بعد."
+      invalid: "لم يتم التحقق من %{authentication_keys}/كلمة المرور أو أن الحساب غير مُفعّل بعد."
+      locked: "حسابك مقفل."
+      last_attempt: "لديك محاولة أخرى قبل أن يتم غلق حسابك."
+      not_found_in_database: "%{authentication_keys} أو كلمة المرور غير صحيحة."
+      timeout: "انتهت صلاحية جلستك. الرجاء تسجيل الدخول مرة أخرى للمتابعة."
+      unauthenticated: "يجب عليك تسجيل الدخول أو التسجيل قبل المتابعة."
+      unconfirmed: "يجب عليك تأكيد عنوان بريدك الإلكتروني قبل المتابعة."
+    mailer:
+      confirmation_instructions:
+        subject: "تعليمات التأكيد"
+      reset_password_instructions:
+        subject: "تعليمات إعادة تعيين كلمة المرور"
+      unlock_instructions:
+        subject: "إرشادات إلغاء القفل"
+      password_change:
+        subject: "تم تغيير كلمة المرور"
+    omniauth_callbacks:
+      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: "سوف تتلقى رسالة بريد إلكتروني تحتوي على تعليمات إعادة ضبط كلمة المرور خلال بضع دقائق."
+      send_paranoid_instructions: "إذا كان عنوان بريدك الإلكتروني موجود في قاعدة بياناتنا، سوف تتلقى رسالة بريد إلكتروني مع إرشادات إعادة ضبط كلمة المرور خلال بضع دقائق."
+      updated: "تم تغيير كلمة المرور الخاصة بك بنجاح وتم تسجيل دخولك الآن."
+      updated_not_active: "تم تغيير كلمة المرور بنجاح."
+    registrations:
+      destroyed: "وداعاً! لقد تم إلغاء حسابك بنجاح. نأمل أن نراك مرة أخرى قريباً."
+      signed_up: "مرحبًا! لقد قمت بالتسجيل بنجاح."
+      signed_up_but_inactive: "لقد قمت بالتسجيل بنجاح. ومع ذلك، لم نستطع تسجيل دخولك لأن حسابك لم يتم تفعيله بعد."
+      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_out: "تم تسجيل الخروج بنجاح."
+      already_signed_out: "تم تسجيل الخروج بنجاح."
+    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_locked: "was not locked"
+      not_saved:
+        zero: "%{count} errors prohibited this %{resource} from being saved:"
+        one: "1 error prohibited this %{resource} from being saved:"
+        two: "%{count} errors 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:"
diff --git a/config/locales/devise.da.yml b/config/locales/devise.da.yml
new file mode 100644
index 000000000..fe5fb7196
--- /dev/null
+++ b/config/locales/devise.da.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+da:
+  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/devise.de.yml b/config/locales/devise.de.yml
new file mode 100644
index 000000000..ce5815a49
--- /dev/null
+++ b/config/locales/devise.de.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+de:
+  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/devise.fi.yml b/config/locales/devise.fi.yml
new file mode 100644
index 000000000..e2aa34829
--- /dev/null
+++ b/config/locales/devise.fi.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+fi:
+  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/devise.hi.yml b/config/locales/devise.hi.yml
new file mode 100644
index 000000000..0804597b9
--- /dev/null
+++ b/config/locales/devise.hi.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+hi:
+  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/devise.hu.yml b/config/locales/devise.hu.yml
new file mode 100644
index 000000000..bc4277617
--- /dev/null
+++ b/config/locales/devise.hu.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+hu:
+  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/devise.ja.yml b/config/locales/devise.ja.yml
new file mode 100644
index 000000000..f3f9b27e1
--- /dev/null
+++ b/config/locales/devise.ja.yml
@@ -0,0 +1,60 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ja:
+  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:
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.ko.yml b/config/locales/devise.ko.yml
new file mode 100644
index 000000000..5e55c7c06
--- /dev/null
+++ b/config/locales/devise.ko.yml
@@ -0,0 +1,60 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ko:
+  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:
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.ml.yml b/config/locales/devise.ml.yml
new file mode 100644
index 000000000..f70d9d9ef
--- /dev/null
+++ b/config/locales/devise.ml.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ml:
+  devise:
+    confirmations:
+      confirmed: "നിങ്ങളുടെ ഇമെയിൽ വിലാസം വിജയകരമായി സ്ഥിരീകരിച്ചു."
+      send_instructions: "കുറച്ച് മിനിറ്റിനുള്ളിൽ നിങ്ങളുടെ ഇമെയിൽ വിലാസം എങ്ങനെ സ്ഥിരീകരിക്കാമെന്നതിനുള്ള നിർദ്ദേശങ്ങളുള്ള ഒരു ഇമെയിൽ നിങ്ങൾക്ക് ലഭിക്കും.\n"
+      send_paranoid_instructions: "നിങ്ങളുടെ ഇമെയിൽ വിലാസം ഞങ്ങളുടെ ഡാറ്റാബേസിൽ ഉണ്ടെങ്കിൽ, കുറച്ച് മിനിറ്റിനുള്ളിൽ നിങ്ങളുടെ ഇമെയിൽ വിലാസം എങ്ങനെ സ്ഥിരീകരിക്കാമെന്നതിനുള്ള നിർദ്ദേശങ്ങളുള്ള ഒരു ഇമെയിൽ നിങ്ങൾക്ക് ലഭിക്കും."
+    failure:
+      already_authenticated: "You are already signed in."
+      inactive: "നിങ്ങളുടെ അക്കൗണ്ട് ഇതുവരെയും സജീവമാക്കിയിട്ടില്ല."
+      invalid: "%{authentication_keys} പാസ്‌വേഡോ അക്കൗണ്ടോ ഇതുവരെ പരിശോധിച്ചിട്ടില്ല.\n"
+      locked: "നിങ്ങളുടെ അക്കൗണ്ട് ലോക്കുചെയ്‌തു.\n"
+      last_attempt: "നിങ്ങളുടെ അക്കൗണ്ട് ലോക്കുചെയ്യുന്നതിന് മുമ്പ് നിങ്ങൾക്ക് ഒരു ശ്രമം കൂടി."
+      not_found_in_database: "Invalid %{authentication_keys} or password."
+      timeout: "Your session expired. Please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your email address before continuing."
+    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/devise.pt_BR.yml b/config/locales/devise.pt_BR.yml
index 82e8287ca..bca956f73 100644
--- a/config/locales/devise.pt_BR.yml
+++ b/config/locales/devise.pt_BR.yml
@@ -1,5 +1,5 @@
 #Additional translations at https://github.com/plataformatec/devise/wiki/I18n
-pt-BR:
+pt:
   devise:
     confirmations:
       confirmed: "Seu e-mail foi confirmado com sucesso."
diff --git a/config/locales/devise.ro.yml b/config/locales/devise.ro.yml
new file mode 100644
index 000000000..516082ff1
--- /dev/null
+++ b/config/locales/devise.ro.yml
@@ -0,0 +1,62 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ro:
+  devise:
+    confirmations:
+      confirmed: "Adresa ta de e-mail a fost confirmată cu succes."
+      send_instructions: "Veţi primi un e-mail cu instrucţiuni despre cum să confirmaţi adresa de e-mail în câteva minute."
+      send_paranoid_instructions: "Dacă adresa ta de e-mail există în baza noastră de date, în câteva minute veți primi un e-mail cu instrucțiuni pentru confirmarea adresei dvs. de e-mail."
+    failure:
+      already_authenticated: "Sunteți deja conectat."
+      inactive: "Contul tău nu este încă activat."
+      invalid: "Invalid %{authentication_keys}/parola sau contul nu este verificat inca."
+      locked: "Contul dvs. este blocat."
+      last_attempt: "Mai ai încă o încercare înainte de a bloca contul."
+      not_found_in_database: "Invalid %{authentication_keys} sau parola."
+      timeout: "Sesiunea ta a expirat. Te rugăm să te autentifici din nou pentru a continua."
+      unauthenticated: "Trebuie să te autentifici sau să te înregistrezi înainte de a continua."
+      unconfirmed: "Trebuie să confirmați adresa dvs. de e-mail înainte de a continua."
+    mailer:
+      confirmation_instructions:
+        subject: "Instrucțiuni pentru confirmare"
+      reset_password_instructions:
+        subject: "Instrucțiuni pentru resetare parolă"
+      unlock_instructions:
+        subject: "Instrucțiuni pentru deblocare"
+      password_change:
+        subject: "Parolă schimbată"
+    omniauth_callbacks:
+      failure: "Nu te-am putut autentifica de la %{kind} deoarece \"%{reason}\"."
+      success: "Autentificat cu succes din contul %{kind}."
+    passwords:
+      no_token: "Nu puteți accesa această pagină fără să o accesati dintr-un e-mail de resetare a parolei. Dacă vii dintr-un e-mail de resetare a parolei, te rugăm să te asiguri că ai folosit URL-ul complet furnizat."
+      send_instructions: "Veţi primi un e-mail cu instrucţiuni despre cum să resetaţi parola în câteva minute."
+      send_paranoid_instructions: "Dacă adresa ta de e-mail există în baza noastră de date, vei primi în câteva minute un link de recuperare a parolei la adresa ta de e-mail."
+      updated: "Parola ta a fost schimbată cu succes. Acum ești conectat."
+      updated_not_active: "Parola ta a fost schimbată cu succes."
+    registrations:
+      destroyed: "La revedere! Contul tău a fost anulat cu succes. Sperăm să te vedem din nou în curând."
+      signed_up: "Bine ați venit! V-ați înregistrat cu succes."
+      signed_up_but_inactive: "V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. nu este încă activat."
+      signed_up_but_locked: "V-ați înregistrat cu succes. Cu toate acestea, nu vă putem conecta deoarece contul dvs. este blocat."
+      signed_up_but_unconfirmed: "Un mesaj cu un link de confirmare a fost trimis la adresa ta de e-mail. Te rugăm să urmezi link-ul pentru a-ți activa contul."
+      update_needs_confirmation: "Ți-ai actualizat contul cu succes, dar trebuie să verificăm noua ta adresă de e-mail. Vă rugăm să verificați adresa de e-mail și să urmați link-ul de confirmare pentru a confirma noua dvs. adresă de e-mail."
+      updated: "Contul dvs. a fost actualizat cu succes."
+    sessions:
+      signed_in: "Conectat cu succes."
+      signed_out: "Deconectat cu succes."
+      already_signed_out: "Deconectat cu succes."
+    unlocks:
+      send_instructions: "Veţi primi un e-mail cu instrucţiuni despre cum să vă deblocaţi contul în câteva minute."
+      send_paranoid_instructions: "Dacă contul tău există, vei primi un e-mail cu instrucțiuni pentru cum să-l deblochezi în câteva minute."
+      unlocked: "Contul tău a fost deblocat cu succes. Te rugăm să te autentifici pentru a continua."
+  errors:
+    messages:
+      already_confirmed: "a fost deja confirmat, încercați să vă conectați"
+      confirmation_period_expired: "trebuie să fie confirmat în %{period}, vă rugăm să solicitați unul nou"
+      expired: "a expirat, vă rugăm să solicitaţi unul nou"
+      not_found: "nu a fost găsit"
+      not_locked: "nu a fost blocat"
+      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:"
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
new file mode 100644
index 000000000..64554e0b1
--- /dev/null
+++ b/config/locales/devise.ru.yml
@@ -0,0 +1,63 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ru:
+  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:"
+        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:"
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
new file mode 100644
index 000000000..430e8d935
--- /dev/null
+++ b/config/locales/devise.sk.yml
@@ -0,0 +1,63 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+sk:
+  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:"
+        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:"
diff --git a/config/locales/devise.ta.yml b/config/locales/devise.ta.yml
new file mode 100644
index 000000000..b740b40e0
--- /dev/null
+++ b/config/locales/devise.ta.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+ta:
+  devise:
+    confirmations:
+      confirmed: "உங்கள் இமெயில் முகவரி வெற்றிகரமாக உறுதிப்படுத்தப்பட்டுள்ளது."
+      send_instructions: "உங்கள் ஈ-மெயில் முகவரியை எவ்வாறு உறுதிப்படுத்துவது என்பதற்கான வழிமுறைகளுடன் ஒரு ஈ-மெயிலை சில நிமிடங்களில் பெறுவீர்கள்."
+      send_paranoid_instructions: "உங்கள் ஈ-மெயில் முகவரி எங்கள் டேட்டாபேசில் இருந்தால், உங்கள் ஈ-மெயில் முகவரியை எவ்வாறு உறுதிப்படுத்துவது என்பதற்கான வழிமுறைகளைக் கொண்ட ஈ-மெயிலை சில நிமிடங்களில் பெறுவீர்கள்."
+    failure:
+      already_authenticated: "நீங்கள் ஏற்கனவே சைன் இன் செய்து விட்டீர்கள்."
+      inactive: "உங்கள் கணக்கு இன்னும் ஆக்டிவேட் செய்யபடவில்லை."
+      invalid: "தவறான %{authentication_keys}/ பாஸ்வேர்ட் அல்லது கணக்கு இன்னும் சரிபார்க்கபடவில்லை."
+      locked: "உங்கள் கணக்கு முடக்கபட்டுள்ளது."
+      last_attempt: "உங்கள் கணக்கு முடக்கபடுவதற்கு முன்பு உங்களுக்கு இன்னும் ஒரு முயற்சி உள்ளது."
+      not_found_in_database: "தவறான %{authentication_keys}/ பாஸ்வேர்ட்."
+      timeout: "உங்கள் அமர்வு காலாவதியாகிவிட்டது. தொடர மீண்டும் சைன் இன் செய்யவும்."
+      unauthenticated: "தொடர்வதற்கு முன் நீங்கள் சைன் இன் செய்ய வேண்டும் அல்லது பதிவுபெற வேண்டும்."
+      unconfirmed: "தொடர்வதற்கு முன் உங்கள் இமெயில் முகவரியை உறுதிப்படுத்த வேண்டும்."
+    mailer:
+      confirmation_instructions:
+        subject: "உறுதிப்படுத்தும் வழிமுறைகள்"
+      reset_password_instructions:
+        subject: "பாஸ்வேர்ட் மீட்டமைக்கும் வழிமுறைகள்"
+      unlock_instructions:
+        subject: "முடக்கத்தை நீக்குவதற்கான வழிமுறைகள்"
+      password_change:
+        subject: "பாஸ்வேர்ட் மாற்றப்பட்டது"
+    omniauth_callbacks:
+      failure: "உங்களை %{kind} வில் இருந்து அங்கீகரிக்க முடியவில்லை, ஏனெனில் %{reason}."
+      success: "%{kind} கணக்கிலிருந்து வெற்றிகரமாக அங்கீகரிக்கப்பட்டது."
+    passwords:
+      no_token: "பாஸ்வேர்டை மீட்டமைக்கும் ஈ-மெயிலில் இருந்து வராமல் இந்த பக்கத்தை அணுக முடியாது. நீங்கள் பாஸ்வேர்டை மீட்டமைக்கும் ஈ-மெயிலில் இருந்து வந்தால், வழங்கப்பட்ட முழு URL ஐ பயன்படுத்தினீர்களா என்பதை உறுதிப்படுத்தவும்."
+      send_instructions: "உங்கள் ஈ-மெயில்மெயில் முகவரியை எவ்வாறு உறுதிப்படுத்துவது என்பதற்கான வழிமுறைகளுடன் ஒரு இமெயிலை சில நிமிடங்களில் பெறுவீர்கள்."
+      send_paranoid_instructions: "உங்கள் ஈ-மெயில் முகவரி எங்கள் டேட்டாபேசில் இருந்தால், உங்கள் ஈ-மெயில் முகவரியை எவ்வாறு உறுதிப்படுத்துவது என்பதற்கான வழிமுறைகளைக் கொண்ட ஈ-மெயிலை சில நிமிடங்களில் பெறுவீர்கள்."
+      updated: "உங்கள் பாஸ்வேர்ட் வெற்றிகரமாக மாற்றப்பட்டுள்ளது. நீங்கள் இப்போது உள்நுழைந்துள்ளீர்கள்."
+      updated_not_active: "உங்கள் பாஸ்வேர்ட் வெற்றிகரமாக மாற்றப்பட்டுள்ளது."
+    registrations:
+      destroyed: "உங்கள் கணக்கு வெற்றிகரமாக ரத்து செய்யப்பட்டது. விரைவில் உங்களை மீண்டும் சந்திப்போம் என்று நம்புகிறோம்."
+      signed_up: "வரவேற்கிறோம்! நீங்கள் வெற்றிகரமாக பதிவு செய்துள்ளீர்கள்."
+      signed_up_but_inactive: "நீங்கள் வெற்றிகரமாக பதிவு செய்துள்ளீர்கள். இருப்பினும், உங்கள் கணக்கு இன்னும் ஆக்ட்டிவேட் செய்யபடாததால் உங்களால் உள்நுழைய முடியவில்லை."
+      signed_up_but_locked: "நீங்கள் வெற்றிகரமாக பதிவு செய்துள்ளீர்கள். இருப்பினும், முடக்கப்பட்டுள்ளதால் உங்கள் கணக்கிற்குள் உள்நுழைய முடியவில்லை."
+      signed_up_but_unconfirmed: "உறுதிப்படுத்தல் இணைப்புடன் ஒரு செய்தி உங்கள் ஈ-மெயில் முகவரிக்கு அனுப்பப்பட்டுள்ளது. உங்கள் கணக்கை செயல்படுத்த இணைப்பைப் பின்தொடரவும்."
+      update_needs_confirmation: "உங்கள் கணக்கை வெற்றிகரமாக புதுப்பித்தீர்கள், ஆனால் உங்கள் புதிய ஈ-மெயில் முகவரியை நாங்கள் சரிபார்க்க வேண்டும். \nஉங்கள் புதிய ஈ-மெயில் முகவரியை உறுதிப்படுத்த உங்கள் ஈ-மெயிலை சரிபார்த்து உறுதிப்படுத்தல் இணைப்பைப் பின்தொடரவும்."
+      updated: "உங்கள் கணக்கு வெற்றிகரமாக புதுப்பிக்கப்பட்டது."
+    sessions:
+      signed_in: "வெற்றிகரமாக உள்நுழைந்தீர்கள்."
+      signed_out: "வெற்றிகரமாக வெளியேறி விட்டீர்கள்."
+      already_signed_out: "வெற்றிகரமாக வெளியேறி விட்டீர்கள்."
+    unlocks:
+      send_instructions: "உங்கள் கணக்கை எவ்வாறு திறப்பது என்பதற்கான வழிமுறைகளுடன் ஒரு ஈ-மெயிலை சில நிமிடங்களில் பெறுவீர்கள்."
+      send_paranoid_instructions: "உங்களுக்கு கணக்கு இருந்தால், சில நிமிடங்களில் அதை எவ்வாறு திறப்பது என்பதற்கான வழிமுறைகளைக் கொண்ட இமெயிலைப் பெறுவீர்கள்."
+      unlocked: "உங்கள் கணக்கு வெற்றிகரமாக திறக்கப்பட்டுள்ளது. தொடர உள்நுழைக."
+  errors:
+    messages:
+      already_confirmed: "ஏற்கனவே உறுதிப்படுத்தப்பட்டது, தயவுசெய்து உள்நுழைய முயற்சிக்கவும்"
+      confirmation_period_expired: "%{period} குள் உறுதிப்படுத்தப்பட வேண்டும், தயவுசெய்து புதியதைக் கோருங்கள்"
+      expired: "காலாவதியானது, புதியதைக் கோருங்கள்"
+      not_found: "கிடைக்கவில்லை"
+      not_locked: "முடக்கபடவில்லை"
+      not_saved:
+        one: "1 பிழை இந்த %{resource} ஐ சேமிப்பதை தடைசெய்தது:"
+        other: "%{count} பிழைகள் இந்த %{resource} ஐ சேமிப்பதை தடைசெய்தது:"
diff --git a/config/locales/devise.tr.yml b/config/locales/devise.tr.yml
new file mode 100644
index 000000000..fae21f441
--- /dev/null
+++ b/config/locales/devise.tr.yml
@@ -0,0 +1,61 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+tr:
+  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/devise.uk.yml b/config/locales/devise.uk.yml
new file mode 100644
index 000000000..c34779784
--- /dev/null
+++ b/config/locales/devise.uk.yml
@@ -0,0 +1,63 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+uk:
+  devise:
+    confirmations:
+      confirmed: "Вашу адресу електронної пошти було успішно підтверджено."
+      send_instructions: "Ви отримаєте листа з вказівками щодо підтвердження вашого облікового запису протягом декількох хвилин."
+      send_paranoid_instructions: "Якщо ваша адреса електронної пошти існує в нашій базі даних, протягом декількох хвилин ви отримаєте лист з вказівками щодо підтвердження вашої електронної пошти."
+    failure:
+      already_authenticated: "Ви вже увійшли."
+      inactive: "Ваш обліковий запис ще не активовано."
+      invalid: "Неправильний %{authentication_keys}/пароль або обліковий запис ще не підтверджено."
+      locked: "Ваш обліковий запис заблоковано."
+      last_attempt: "У вас залишилась ще одна спроба, після якої ваш обліковий запис буде заблоковано."
+      not_found_in_database: "Недійсний %{authentication_keys} або пароль."
+      timeout: "Термін дійсності вашого сеансу завершився. Будь ласка, увійдіть знову для продовження."
+      unauthenticated: "Ви повинні увійти або зареєструватися, перш ніж продовжити."
+      unconfirmed: "Вам потрібно підтвердити вашу електронну пошту, перш ніж продовжити."
+    mailer:
+      confirmation_instructions:
+        subject: "Інструкції з підтвердження"
+      reset_password_instructions:
+        subject: "Інструкції по скиданню пароля"
+      unlock_instructions:
+        subject: "Інструкції щодо розблокування"
+      password_change:
+        subject: "Пароль змінено"
+    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: "Ласкаво просимо! Ви успішно зареєструвалися."
+      signed_up_but_inactive: "Ви успішно зареєструвалися, але не можете увійти в систему, тому що ваш обліковий запис ще не активовано."
+      signed_up_but_locked: "Ви успішно зареєструвались. Але ми не можемо надати вам доступ до системи через те, що ваш обліковий запис заблоковано."
+      signed_up_but_unconfirmed: "Повідомлення з посиланням для підтвердження було надіслано на вашу електронну адресу. Будь ласка, перейдіть за посиланням для активації вашого облікового запису."
+      update_needs_confirmation: "Ви успішно оновили обліковий запис, але нам потрібно перевірити вашу нову адресу електронної пошти. Будь ласка, перевірте свою електронну пошту і перейдіть за посиланням для підтвердження нової адреси."
+      updated: "Ваш обліковий запис було успішно оновлено."
+    sessions:
+      signed_in: "Ви успішно увійшли в систему."
+      signed_out: "Ви успішно вийшли з системи."
+      already_signed_out: "Ви успішно вийшли з системи."
+    unlocks:
+      send_instructions: "За декілька хвилин ви отримаєте лист із вказівками щодо розблокування облікового запису."
+      send_paranoid_instructions: "Якщо ваш обліковий запис існує, за декілька хвилин ви отримаєте лист з вказівками щодо його розблокування."
+      unlocked: "Ваш обліковий запис було успішно розблоковано. Будь ласка, увійдіть в систему для продовження."
+  errors:
+    messages:
+      already_confirmed: "вже було підтверджено, будь ласка спробуйте увійти в систему"
+      confirmation_period_expired: "потребує підтвердження протягом %{period}, будь ласка, подайте новий запит"
+      expired: "has expired, please request a new one"
+      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:"
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
new file mode 100644
index 000000000..9fdffdbc0
--- /dev/null
+++ b/config/locales/devise.vi.yml
@@ -0,0 +1,60 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+vi:
+  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:
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/devise.zh.yml b/config/locales/devise.zh.yml
new file mode 100644
index 000000000..c0e50fc34
--- /dev/null
+++ b/config/locales/devise.zh.yml
@@ -0,0 +1,60 @@
+#Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+zh-TW:
+  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:
+        other: "%{count} errors prohibited this %{resource} from being saved:"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 5f7a74dfc..9f0a8231b 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -36,7 +36,7 @@ el:
         assigned: "Ανατέθηκε στον %{assignee_name} από τον %{user_name}"
         removed: "Η συνομιλία σημάνθηκε ως μη ανατεθειμένη από τον %{user_name}"
     templates:
-      greeting_message_body: "Ο/Η %{account_name} συνήθως απαντάει σε μερικές ώρες."
+      greeting_message_body: "Στον λογαριασμό %{account_name} τυπικά έχετε απάντηση σε μερικές ώρες."
       ways_to_reach_you_message_body: "Δώστε στην ομάδα ένα τρόπο να φτάσει σε σας."
       email_input_box_message_body: "Ειδοποιηθείτε με email"
     reply:
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
new file mode 100644
index 000000000..a154b9380
--- /dev/null
+++ b/config/locales/fi.yml
@@ -0,0 +1,43 @@
+#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.
+fi:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/hi.yml b/config/locales/hi.yml
new file mode 100644
index 000000000..8f38ce459
--- /dev/null
+++ b/config/locales/hi.yml
@@ -0,0 +1,43 @@
+#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.
+hi:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
new file mode 100644
index 000000000..06bf64d98
--- /dev/null
+++ b/config/locales/hu.yml
@@ -0,0 +1,43 @@
+#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.
+hu:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index a7ef603b4..4d8bdbe10 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -36,6 +36,8 @@ it:
         assigned: "Assegnato a %{assignee_name} da %{user_name}"
         removed: "Conversazione non assegnata da %{user_name}"
     templates:
-      greeting_message_body: "%{account_name} risponde tipicamente tra qualche ora."
+      greeting_message_body: "%{account_name}, in genere, risponde in poche ore."
       ways_to_reach_you_message_body: "Offri alla squadra un modo per raggiungerti."
       email_input_box_message_body: "Ricevi una notifica via email"
+    reply:
+      email_subject: "Nuovi messaggi in questa conversazione"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
new file mode 100644
index 000000000..4040f5b4c
--- /dev/null
+++ b/config/locales/ja.yml
@@ -0,0 +1,43 @@
+#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.
+ja:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
new file mode 100644
index 000000000..c6c8ae905
--- /dev/null
+++ b/config/locales/ko.yml
@@ -0,0 +1,43 @@
+#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.
+ko:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/ml.yml b/config/locales/ml.yml
index 2dd97a3ff..070569897 100644
--- a/config/locales/ml.yml
+++ b/config/locales/ml.yml
@@ -39,3 +39,5 @@ ml:
       greeting_message_body: "%{account_name} സാധാരണ കുറച്ച് മണിക്കൂറിനുള്ളിൽ മറുപടി നൽകുന്നു."
       ways_to_reach_you_message_body: "നിങ്ങളിലേക്ക് എത്താൻ ടീമിന് ഒരു വഴി നൽകുക."
       email_input_box_message_body: "ഇമെയിൽ വഴി അറിയിപ്പ് നേടുക"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index e6091f25b..77729ffee 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -39,3 +39,5 @@ nl:
       greeting_message_body: "%{account_name} reageert meestal binnen een paar uur."
       ways_to_reach_you_message_body: "Geef het team een manier om je te bereiken."
       email_input_box_message_body: "Ontvang een melding via e-mail"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index fa159567a..fa1de7ccc 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -36,6 +36,8 @@ pl:
         assigned: "Przypisane do %{assignee_name} przez %{user_name}"
         removed: "Rozmowa nieprzypisana przez %{user_name}"
     templates:
-      greeting_message_body: "%{account_name} zazwyczaj odpowiada w kilka godzin."
+      greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Daj drużynie możliwość dotarcia do Ciebie."
       email_input_box_message_body: "Otrzymuj powiadomienia przez e-mail"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index a1c20837f..37cb8a9f1 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -36,6 +36,8 @@ pt:
         assigned: "Atribuído a %{assignee_name} por %{user_name}"
         removed: "Conversa não atribuída por %{user_name}"
     templates:
-      greeting_message_body: "%{account_name} normalmente responde em algumas horas."
+      greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Dê à equipe um jeito de contatá-lo."
       email_input_box_message_body: "Seja notificado por e-mail"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/pt_BR.yml b/config/locales/pt_BR.yml
index 8ce6be097..733a170e1 100644
--- a/config/locales/pt_BR.yml
+++ b/config/locales/pt_BR.yml
@@ -16,7 +16,7 @@
 #'true': 'foo'
 #To learn more, please read the Rails Internationalization guide
 #available at https://guides.rubyonrails.org/i18n.html.
-pt-BR:
+pt:
   hello: "Olá, mundo"
   messages:
     reset_password_success: Legal! A solicitação de alteração de senha foi bem sucedida. Verifique seu e-mail para obter instruções.
@@ -39,3 +39,5 @@ pt-BR:
       greeting_message_body: "%{account_name} normalmente responde em algumas horas."
       ways_to_reach_you_message_body: "Informe uma forma para entrarmos em contato com você."
       email_input_box_message_body: "Seja notificado por e-mail"
+    reply:
+      email_subject: "Novas mensagens nesta conversa"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
new file mode 100644
index 000000000..21cb41668
--- /dev/null
+++ b/config/locales/ru.yml
@@ -0,0 +1,43 @@
+#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.
+ru:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
new file mode 100644
index 000000000..99eca03a4
--- /dev/null
+++ b/config/locales/sk.yml
@@ -0,0 +1,43 @@
+#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.
+sk:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 9a8029a91..6c3cf8e1e 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -36,6 +36,8 @@ sv:
         assigned: "Tilldelad till %{assignee_name} av %{user_name}"
         removed: "Konversation otilldelad av %{user_name}"
     templates:
-      greeting_message_body: "%{account_name} svarar vanligtvis om några timmar."
+      greeting_message_body: "%{account_name} typically replies in a few hours."
       ways_to_reach_you_message_body: "Ge laget ett sätt att nå dig."
       email_input_box_message_body: "Få meddelande via e-post"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/ta.yml b/config/locales/ta.yml
new file mode 100644
index 000000000..3f3d4d548
--- /dev/null
+++ b/config/locales/ta.yml
@@ -0,0 +1,43 @@
+#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.
+ta:
+  hello: "உலக மக்களுக்கு வணக்கம்"
+  messages:
+    reset_password_success: வூட்! பாஸ்வேர்டை மீட்டமைப்பிற்கான கோரிக்கை வெற்றிகரமாக அனுப்பப்பட்டுள்ளது. வழிமுறைகளுக்கு உங்கள் ஈ-மெயிலைப் பார்க்கவும்.
+    reset_password_failure: மன்னிக்கவும்! குறிப்பிட்ட ஈ-மெயிலுடன் எந்த பயனரையும் எங்களால் கண்டுபிடிக்க முடியவில்லை.
+  errors:
+    signup:
+      disposable_email: களைந்துவிடும் இமெயில்களை நாங்கள் அனுமதிக்க மாட்டோம்
+      invalid_email: நீங்கள் தவறான ஈ-மெயிலை உள்ளிட்டுள்ளீர்கள்
+      email_already_exists: "நீங்கள் ஏற்கனவே %{email} கொண்டு கணக்கிற்கு பதிவு செய்துள்ளீர்கள்"
+      failed: உள்நுழையும் முயறிசி தோல்வி அடைந்துள்ளது
+  conversations:
+    activity:
+      status:
+        resolved: "உரையாடலுக்கு %{user_name} தீர்வு வழங்கியுள்ளார்"
+        open: "உரையாடலை %{user_name} மீண்டும் திறந்துள்ளார்"
+      assignee:
+        assigned: "%{user_name} இதை %{assignee_name}க்கு ஒதுக்கியுள்ளார்"
+        removed: "%{user_name} இதை ஒதுக்க படாத உரையாடளாக்கியுள்ளார்"
+    templates:
+      greeting_message_body: "%{account_name} பொதுவாக சில மணிநேரங்களில் பதிலளிப்பார்."
+      ways_to_reach_you_message_body: "உங்களை அடைய அணிக்கு ஒரு வழியைக் கொடுங்கள்."
+      email_input_box_message_body: "இமெயில் மூலம் அறிய"
+    reply:
+      email_subject: "இந்த உரையாடலில் புதிய செய்திகள்"
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
new file mode 100644
index 000000000..1473c7771
--- /dev/null
+++ b/config/locales/tr.yml
@@ -0,0 +1,43 @@
+#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.
+tr:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
new file mode 100644
index 000000000..c5a2e54fd
--- /dev/null
+++ b/config/locales/uk.yml
@@ -0,0 +1,43 @@
+#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.
+uk:
+  hello: "Привіт, світе"
+  messages:
+    reset_password_success: Круто! Запит на скидання пароля виконано успішно. Перевірте вашу пошту за подальшими інструкціями.
+    reset_password_failure: Ой-ой! Ми не змогли знайти жодного користувача з цією адресою електронної пошти.
+  errors:
+    signup:
+      disposable_email: Ми не дозволяємо використувати одноразові адреси електронної пошти
+      invalid_email: Ви ввели неправильну адресу електронної пошти
+      email_already_exists: "Ви вже зареєстровані з адресою %{email}"
+      failed: Помилка реєстрації
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    templates:
+      greeting_message_body: "%{account_name} typically replies in a few hours."
+      ways_to_reach_you_message_body: "Дайте команді можливість з вами зв'язатися."
+      email_input_box_message_body: "Отримувати сповіщення електронною поштою"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
new file mode 100644
index 000000000..19d4d0d7f
--- /dev/null
+++ b/config/locales/vi.yml
@@ -0,0 +1,43 @@
+#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.
+vi:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
new file mode 100644
index 000000000..08e0c55b5
--- /dev/null
+++ b/config/locales/zh.yml
@@ -0,0 +1,43 @@
+#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.
+zh-TW:
+  hello: "Hello world"
+  messages:
+    reset_password_success: Woot! Request for password reset is successful. Check your mail for instructions.
+    reset_password_failure: Uh ho! We could not find any user with the specified email.
+  errors:
+    signup:
+      disposable_email: We do not allow disposable emails
+      invalid_email: You have entered an invalid email
+      email_already_exists: "You have already signed up for an account with %{email}"
+      failed: Signup failed
+  conversations:
+    activity:
+      status:
+        resolved: "Conversation was marked resolved by %{user_name}"
+        open: "Conversation was reopened by %{user_name}"
+      assignee:
+        assigned: "Assigned to %{assignee_name} by %{user_name}"
+        removed: "Conversation unassigned by %{user_name}"
+    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"
+    reply:
+      email_subject: "New messages on this conversation"